Index: uspace/srv/net/tcp/conn.c =================================================================== --- uspace/srv/net/tcp/conn.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/conn.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -164,5 +164,5 @@ static void tcp_conn_free(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_conn_free(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_free(%p)", conn->name, conn); tcp_tqueue_fini(&conn->retransmit); @@ -184,5 +184,5 @@ void tcp_conn_addref(tcp_conn_t *conn) { - log_msg(LVL_DEBUG2, "%s: tcp_conn_addref(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_addref(%p)", conn->name, conn); atomic_inc(&conn->refcnt); } @@ -196,5 +196,5 @@ void tcp_conn_delref(tcp_conn_t *conn) { - log_msg(LVL_DEBUG2, "%s: tcp_conn_delref(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_delref(%p)", conn->name, conn); if (atomic_predec(&conn->refcnt) == 0) @@ -211,5 +211,5 @@ void tcp_conn_delete(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_conn_delete(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_delete(%p)", conn->name, conn); assert(conn->deleted == false); @@ -245,5 +245,5 @@ tcp_cstate_t old_state; - log_msg(LVL_DEBUG, "tcp_conn_state_set(%p)", conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set(%p)", conn); old_state = conn->cstate; @@ -253,8 +253,8 @@ /* Run user callback function */ if (conn->cstate_cb != NULL) { - log_msg(LVL_DEBUG, "tcp_conn_state_set() - run user CB"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - run user CB"); conn->cstate_cb(conn, conn->cstate_cb_arg); } else { - log_msg(LVL_DEBUG, "tcp_conn_state_set() - no user CB"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - no user CB"); } @@ -293,13 +293,13 @@ case st_syn_received: case st_established: - log_msg(LVL_DEBUG, "%s: FIN sent -> Fin-Wait-1", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN sent -> Fin-Wait-1", conn->name); tcp_conn_state_set(conn, st_fin_wait_1); break; case st_close_wait: - log_msg(LVL_DEBUG, "%s: FIN sent -> Last-Ack", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN sent -> Last-Ack", conn->name); tcp_conn_state_set(conn, st_last_ack); break; default: - log_msg(LVL_ERROR, "%s: Connection state %d", conn->name, + log_msg(LOG_DEFAULT, LVL_ERROR, "%s: Connection state %d", conn->name, conn->cstate); assert(false); @@ -312,5 +312,5 @@ static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt) { - log_msg(LVL_DEBUG2, "tcp_socket_match(sock=(%x,%u), pat=(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_socket_match(sock=(%x,%u), pat=(%x,%u))", sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port); @@ -323,5 +323,5 @@ return false; - log_msg(LVL_DEBUG2, " -> match"); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " -> match"); return true; @@ -331,5 +331,5 @@ static bool tcp_sockpair_match(tcp_sockpair_t *sp, tcp_sockpair_t *pattern) { - log_msg(LVL_DEBUG2, "tcp_sockpair_match(%p, %p)", sp, pattern); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_sockpair_match(%p, %p)", sp, pattern); if (!tcp_socket_match(&sp->local, &pattern->local)) @@ -353,5 +353,5 @@ tcp_conn_t *tcp_conn_find_ref(tcp_sockpair_t *sp) { - log_msg(LVL_DEBUG, "tcp_conn_find_ref(%p)", sp); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", sp); fibril_mutex_lock(&conn_list_lock); @@ -360,5 +360,5 @@ tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link); tcp_sockpair_t *csp = &conn->ident; - log_msg(LVL_DEBUG2, "compare with conn (f:(%x,%u), l:(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare with conn (f:(%x,%u), l:(%x,%u))", csp->foreign.addr.ipv4, csp->foreign.port, csp->local.addr.ipv4, csp->local.port); @@ -380,5 +380,5 @@ static void tcp_conn_reset(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_conn_reset()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name); tcp_conn_state_set(conn, st_closed); conn->reset = true; @@ -398,5 +398,5 @@ { /* TODO */ - log_msg(LVL_DEBUG, "%s: tcp_reset_signal()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_reset_signal()", conn->name); } @@ -422,5 +422,5 @@ return true; case st_closed: - log_msg(LVL_WARN, "state=%d", (int) conn->cstate); + log_msg(LOG_DEFAULT, LVL_WARN, "state=%d", (int) conn->cstate); assert(false); } @@ -436,13 +436,13 @@ static void tcp_conn_sa_listen(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_sa_listen(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_sa_listen(%p, %p)", conn, seg); if ((seg->ctrl & CTL_RST) != 0) { - log_msg(LVL_DEBUG, "Ignoring incoming RST."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Ignoring incoming RST."); return; } if ((seg->ctrl & CTL_ACK) != 0) { - log_msg(LVL_DEBUG, "Incoming ACK, send acceptable RST."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Incoming ACK, send acceptable RST."); tcp_reply_rst(&conn->ident, seg); return; @@ -450,9 +450,9 @@ if ((seg->ctrl & CTL_SYN) == 0) { - log_msg(LVL_DEBUG, "SYN not present. Ignoring segment."); - return; - } - - log_msg(LVL_DEBUG, "Got SYN, sending SYN, ACK."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "SYN not present. Ignoring segment."); + return; + } + + log_msg(LOG_DEFAULT, LVL_DEBUG, "Got SYN, sending SYN, ACK."); conn->rcv_nxt = seg->seq + 1; @@ -460,8 +460,8 @@ - log_msg(LVL_DEBUG, "rcv_nxt=%u", conn->rcv_nxt); + log_msg(LOG_DEFAULT, LVL_DEBUG, "rcv_nxt=%u", conn->rcv_nxt); if (seg->len > 1) - log_msg(LVL_WARN, "SYN combined with data, ignoring data."); + log_msg(LOG_DEFAULT, LVL_WARN, "SYN combined with data, ignoring data."); /* XXX select ISS */ @@ -493,15 +493,15 @@ static void tcp_conn_sa_syn_sent(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_sa_syn_sent(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_sa_syn_sent(%p, %p)", conn, seg); if ((seg->ctrl & CTL_ACK) != 0) { - log_msg(LVL_DEBUG, "snd_una=%u, seg.ack=%u, snd_nxt=%u", + log_msg(LOG_DEFAULT, LVL_DEBUG, "snd_una=%u, seg.ack=%u, snd_nxt=%u", conn->snd_una, seg->ack, conn->snd_nxt); if (!seq_no_ack_acceptable(conn, seg->ack)) { if ((seg->ctrl & CTL_RST) == 0) { - log_msg(LVL_WARN, "ACK not acceptable, send RST"); + log_msg(LOG_DEFAULT, LVL_WARN, "ACK not acceptable, send RST"); tcp_reply_rst(&conn->ident, seg); } else { - log_msg(LVL_WARN, "RST,ACK not acceptable, drop"); + log_msg(LOG_DEFAULT, LVL_WARN, "RST,ACK not acceptable, drop"); } return; @@ -512,5 +512,5 @@ /* If we get here, we have either an acceptable ACK or no ACK */ if ((seg->ctrl & CTL_ACK) != 0) { - log_msg(LVL_DEBUG, "%s: Connection reset. -> Closed", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Connection reset. -> Closed", conn->name); /* Reset connection */ @@ -518,5 +518,5 @@ return; } else { - log_msg(LVL_DEBUG, "%s: RST without ACK, drop", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: RST without ACK, drop", conn->name); return; @@ -527,5 +527,5 @@ if ((seg->ctrl & CTL_SYN) == 0) { - log_msg(LVL_DEBUG, "No SYN bit, ignoring segment."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "No SYN bit, ignoring segment."); return; } @@ -544,5 +544,5 @@ } - log_msg(LVL_DEBUG, "Sent SYN, got SYN."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Sent SYN, got SYN."); /* @@ -551,5 +551,5 @@ * will always be accepted as new window setting. */ - log_msg(LVL_DEBUG, "SND.WND := %" PRIu32 ", SND.WL1 := %" PRIu32 ", " + log_msg(LOG_DEFAULT, LVL_DEBUG, "SND.WND := %" PRIu32 ", SND.WL1 := %" PRIu32 ", " "SND.WL2 = %" PRIu32, seg->wnd, seg->seq, seg->seq); conn->snd_wnd = seg->wnd; @@ -558,9 +558,9 @@ if (seq_no_syn_acked(conn)) { - log_msg(LVL_DEBUG, "%s: syn acked -> Established", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: syn acked -> Established", conn->name); tcp_conn_state_set(conn, st_established); tcp_tqueue_ctrl_seg(conn, CTL_ACK /* XXX */); } else { - log_msg(LVL_DEBUG, "%s: syn not acked -> Syn-Received", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: syn not acked -> Syn-Received", conn->name); tcp_conn_state_set(conn, st_syn_received); @@ -582,9 +582,9 @@ tcp_segment_t *pseg; - log_msg(LVL_DEBUG, "tcp_conn_sa_seq(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_sa_seq(%p, %p)", conn, seg); /* Discard unacceptable segments ("old duplicates") */ if (!seq_no_segment_acceptable(conn, seg)) { - log_msg(LVL_DEBUG, "Replying ACK to unacceptable segment."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Replying ACK to unacceptable segment."); tcp_tqueue_ctrl_seg(conn, CTL_ACK); tcp_segment_delete(seg); @@ -682,5 +682,5 @@ assert(seq_no_in_rcv_wnd(conn, seg->seq)); - log_msg(LVL_WARN, "SYN is in receive window, should send reset. XXX"); + log_msg(LOG_DEFAULT, LVL_WARN, "SYN is in receive window, should send reset. XXX"); /* @@ -705,5 +705,5 @@ if (!seq_no_ack_acceptable(conn, seg->ack)) { /* ACK is not acceptable, send RST. */ - log_msg(LVL_WARN, "Segment ACK not acceptable, sending RST."); + log_msg(LOG_DEFAULT, LVL_WARN, "Segment ACK not acceptable, sending RST."); tcp_reply_rst(&conn->ident, seg); tcp_segment_delete(seg); @@ -711,5 +711,5 @@ } - log_msg(LVL_DEBUG, "%s: SYN ACKed -> Established", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: SYN ACKed -> Established", conn->name); tcp_conn_state_set(conn, st_established); @@ -730,14 +730,14 @@ static cproc_t tcp_conn_seg_proc_ack_est(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_seg_proc_ack_est(%p, %p)", conn, seg); - - log_msg(LVL_DEBUG, "SEG.ACK=%u, SND.UNA=%u, SND.NXT=%u", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_seg_proc_ack_est(%p, %p)", conn, seg); + + log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.ACK=%u, SND.UNA=%u, SND.NXT=%u", (unsigned)seg->ack, (unsigned)conn->snd_una, (unsigned)conn->snd_nxt); if (!seq_no_ack_acceptable(conn, seg->ack)) { - log_msg(LVL_DEBUG, "ACK not acceptable."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "ACK not acceptable."); if (!seq_no_ack_duplicate(conn, seg->ack)) { - log_msg(LVL_WARN, "Not acceptable, not duplicate. " + log_msg(LOG_DEFAULT, LVL_WARN, "Not acceptable, not duplicate. " "Send ACK and drop."); /* Not acceptable, not duplicate. Send ACK and drop. */ @@ -746,5 +746,5 @@ return cp_done; } else { - log_msg(LVL_DEBUG, "Ignoring duplicate ACK."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Ignoring duplicate ACK."); } } else { @@ -758,5 +758,5 @@ conn->snd_wl2 = seg->ack; - log_msg(LVL_DEBUG, "Updating send window, SND.WND=%" PRIu32 + log_msg(LOG_DEFAULT, LVL_DEBUG, "Updating send window, SND.WND=%" PRIu32 ", SND.WL1=%" PRIu32 ", SND.WL2=%" PRIu32, conn->snd_wnd, conn->snd_wl1, conn->snd_wl2); @@ -785,5 +785,5 @@ if (conn->fin_is_acked) { - log_msg(LVL_DEBUG, "%s: FIN acked -> Fin-Wait-2", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN acked -> Fin-Wait-2", conn->name); tcp_conn_state_set(conn, st_fin_wait_2); } @@ -850,5 +850,5 @@ if (conn->fin_is_acked) { - log_msg(LVL_DEBUG, "%s: FIN acked -> Closed", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN acked -> Closed", conn->name); tcp_conn_remove(conn); tcp_conn_state_set(conn, st_closed); @@ -881,9 +881,9 @@ static cproc_t tcp_conn_seg_proc_ack(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%s: tcp_conn_seg_proc_ack(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_seg_proc_ack(%p, %p)", conn->name, conn, seg); if ((seg->ctrl & CTL_ACK) == 0) { - log_msg(LVL_WARN, "Segment has no ACK. Dropping."); + log_msg(LOG_DEFAULT, LVL_WARN, "Segment has no ACK. Dropping."); tcp_segment_delete(seg); return cp_done; @@ -940,5 +940,5 @@ size_t xfer_size; - log_msg(LVL_DEBUG, "%s: tcp_conn_seg_proc_text(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_seg_proc_text(%p, %p)", conn->name, conn, seg); @@ -982,5 +982,5 @@ fibril_condvar_broadcast(&conn->rcv_buf_cv); - log_msg(LVL_DEBUG, "Received %zu bytes of data.", xfer_size); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Received %zu bytes of data.", xfer_size); /* Advance RCV.NXT */ @@ -998,5 +998,5 @@ tcp_conn_trim_seg_to_wnd(conn, seg); } else { - log_msg(LVL_DEBUG, "%s: Nothing left in segment, dropping " + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Nothing left in segment, dropping " "(xfer_size=%zu, SEG.LEN=%" PRIu32 ", seg->ctrl=%u)", conn->name, xfer_size, seg->len, (unsigned int) seg->ctrl); @@ -1018,12 +1018,12 @@ static cproc_t tcp_conn_seg_proc_fin(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%s: tcp_conn_seg_proc_fin(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_seg_proc_fin(%p, %p)", conn->name, conn, seg); - log_msg(LVL_DEBUG, " seg->len=%zu, seg->ctl=%u", (size_t) seg->len, + log_msg(LOG_DEFAULT, LVL_DEBUG, " seg->len=%zu, seg->ctl=%u", (size_t) seg->len, (unsigned) seg->ctrl); /* Only process FIN if no text is left in segment. */ if (tcp_segment_text_size(seg) == 0 && (seg->ctrl & CTL_FIN) != 0) { - log_msg(LVL_DEBUG, " - FIN found in segment."); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - FIN found in segment."); /* Send ACK */ @@ -1042,15 +1042,15 @@ case st_syn_received: case st_established: - log_msg(LVL_DEBUG, "%s: FIN received -> Close-Wait", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN received -> Close-Wait", conn->name); tcp_conn_state_set(conn, st_close_wait); break; case st_fin_wait_1: - log_msg(LVL_DEBUG, "%s: FIN received -> Closing", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN received -> Closing", conn->name); tcp_conn_state_set(conn, st_closing); break; case st_fin_wait_2: - log_msg(LVL_DEBUG, "%s: FIN received -> Time-Wait", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN received -> Time-Wait", conn->name); tcp_conn_state_set(conn, st_time_wait); @@ -1091,5 +1091,5 @@ static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_conn_seg_process(%p, %p)", conn, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_seg_process(%p, %p)", conn, seg); tcp_segment_dump(seg); @@ -1097,5 +1097,5 @@ /* XXX Permit valid ACKs, URGs and RSTs */ /* if (!seq_no_segment_acceptable(conn, seg)) { - log_msg(LVL_WARN, "Segment not acceptable, dropping."); + log_msg(LOG_DEFAULT, LVL_WARN, "Segment not acceptable, dropping."); if ((seg->ctrl & CTL_RST) == 0) { tcp_tqueue_ctrl_seg(conn, CTL_ACK); @@ -1131,5 +1131,5 @@ */ if (seg->len > 0) { - log_msg(LVL_DEBUG, "Re-insert segment %p. seg->len=%zu", + log_msg(LOG_DEFAULT, LVL_DEBUG, "Re-insert segment %p. seg->len=%zu", seg, (size_t) seg->len); tcp_iqueue_insert_seg(&conn->incoming, seg); @@ -1146,5 +1146,5 @@ void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%s: tcp_conn_segment_arrived(%p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_segment_arrived(%p)", conn->name, seg); @@ -1165,5 +1165,5 @@ tcp_conn_sa_queue(conn, seg); break; case st_closed: - log_msg(LVL_DEBUG, "state=%d", (int) conn->cstate); + log_msg(LOG_DEFAULT, LVL_DEBUG, "state=%d", (int) conn->cstate); assert(false); } @@ -1178,10 +1178,10 @@ tcp_conn_t *conn = (tcp_conn_t *) arg; - log_msg(LVL_DEBUG, "tw_timeout_func(%p)", conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tw_timeout_func(%p)", conn); fibril_mutex_lock(&conn->lock); if (conn->cstate == st_closed) { - log_msg(LVL_DEBUG, "Connection already closed."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Connection already closed."); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); @@ -1189,5 +1189,5 @@ } - log_msg(LVL_DEBUG, "%s: TW Timeout -> Closed", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: TW Timeout -> Closed", conn->name); tcp_conn_remove(conn); tcp_conn_state_set(conn, st_closed); @@ -1240,5 +1240,5 @@ void tcp_unexpected_segment(tcp_sockpair_t *sp, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_unexpected_segment(%p, %p)", sp, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_unexpected_segment(%p, %p)", sp, seg); if ((seg->ctrl & CTL_RST) == 0) @@ -1268,5 +1268,5 @@ tcp_segment_t *rseg; - log_msg(LVL_DEBUG, "tcp_reply_rst(%p, %p)", sp, seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_reply_rst(%p, %p)", sp, seg); rseg = tcp_segment_make_rst(seg); Index: uspace/srv/net/tcp/iqueue.c =================================================================== --- uspace/srv/net/tcp/iqueue.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/iqueue.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -67,9 +67,9 @@ tcp_iqueue_entry_t *qe; link_t *link; - log_msg(LVL_DEBUG, "tcp_iqueue_insert_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_iqueue_insert_seg()"); iqe = calloc(1, sizeof(tcp_iqueue_entry_t)); if (iqe == NULL) { - log_msg(LVL_ERROR, "Failed allocating IQE."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating IQE."); return; } @@ -108,9 +108,9 @@ link_t *link; - log_msg(LVL_DEBUG, "tcp_get_ready_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_get_ready_seg()"); link = list_first(&iqueue->list); if (link == NULL) { - log_msg(LVL_DEBUG, "iqueue is empty"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "iqueue is empty"); return ENOENT; } @@ -119,5 +119,5 @@ while (!seq_no_segment_acceptable(iqueue->conn, iqe->seg)) { - log_msg(LVL_DEBUG, "Skipping unacceptable segment (RCV.NXT=%" + log_msg(LOG_DEFAULT, LVL_DEBUG, "Skipping unacceptable segment (RCV.NXT=%" PRIu32 ", RCV.NXT+RCV.WND=%" PRIu32 ", SEG.SEQ=%" PRIu32 ", SEG.LEN=%" PRIu32 ")", iqueue->conn->rcv_nxt, @@ -130,5 +130,5 @@ link = list_first(&iqueue->list); if (link == NULL) { - log_msg(LVL_DEBUG, "iqueue is empty"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "iqueue is empty"); return ENOENT; } @@ -139,5 +139,5 @@ /* Do not return segments that are not ready for processing */ if (!seq_no_segment_ready(iqueue->conn, iqe->seg)) { - log_msg(LVL_DEBUG, "Next segment not ready: SEG.SEQ=%u, " + log_msg(LOG_DEFAULT, LVL_DEBUG, "Next segment not ready: SEG.SEQ=%u, " "RCV.NXT=%u, SEG.LEN=%u", iqe->seg->seq, iqueue->conn->rcv_nxt, iqe->seg->len); @@ -145,5 +145,5 @@ } - log_msg(LVL_DEBUG, "Returning ready segment %p", iqe->seg); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Returning ready segment %p", iqe->seg); list_remove(&iqe->link); *seg = iqe->seg; Index: uspace/srv/net/tcp/ncsim.c =================================================================== --- uspace/srv/net/tcp/ncsim.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/ncsim.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -74,5 +74,5 @@ link_t *link; - log_msg(LVL_DEBUG, "tcp_ncsim_bounce_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_bounce_seg()"); tcp_rqueue_bounce_seg(sp, seg); return; @@ -80,5 +80,5 @@ if (0 /*random() % 4 == 3*/) { /* Drop segment */ - log_msg(LVL_ERROR, "NCSim dropping segment"); + log_msg(LOG_DEFAULT, LVL_ERROR, "NCSim dropping segment"); tcp_segment_delete(seg); return; @@ -87,5 +87,5 @@ sqe = calloc(1, sizeof(tcp_squeue_entry_t)); if (sqe == NULL) { - log_msg(LVL_ERROR, "Failed allocating SQE."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating SQE."); return; } @@ -126,5 +126,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_ncsim_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_fibril()"); @@ -139,5 +139,5 @@ sqe = list_get_instance(link, tcp_squeue_entry_t, link); - log_msg(LVL_DEBUG, "NCSim - Sleep"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "NCSim - Sleep"); rc = fibril_condvar_wait_timeout(&sim_queue_cv, &sim_queue_lock, sqe->delay); @@ -147,5 +147,5 @@ fibril_mutex_unlock(&sim_queue_lock); - log_msg(LVL_DEBUG, "NCSim - End Sleep"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "NCSim - End Sleep"); tcp_rqueue_bounce_seg(&sqe->sp, sqe->seg); free(sqe); @@ -161,9 +161,9 @@ fid_t fid; - log_msg(LVL_DEBUG, "tcp_ncsim_fibril_start()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_fibril_start()"); fid = fibril_create(tcp_ncsim_fibril, NULL); if (fid == 0) { - log_msg(LVL_ERROR, "Failed creating ncsim fibril."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating ncsim fibril."); return; } Index: uspace/srv/net/tcp/rqueue.c =================================================================== --- uspace/srv/net/tcp/rqueue.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/rqueue.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -74,5 +74,5 @@ tcp_sockpair_t rident; - log_msg(LVL_DEBUG, "tcp_rqueue_bounce_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_bounce_seg()"); #ifdef BOUNCE_TRANSCODE @@ -81,10 +81,10 @@ if (tcp_pdu_encode(sp, seg, &pdu) != EOK) { - log_msg(LVL_WARN, "Not enough memory. Segment dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped."); return; } if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) { - log_msg(LVL_WARN, "Not enough memory. Segment dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped."); return; } @@ -112,5 +112,5 @@ { tcp_rqueue_entry_t *rqe; - log_msg(LVL_DEBUG, "tcp_rqueue_insert_seg()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_insert_seg()"); tcp_segment_dump(seg); @@ -118,5 +118,5 @@ rqe = calloc(1, sizeof(tcp_rqueue_entry_t)); if (rqe == NULL) { - log_msg(LVL_ERROR, "Failed allocating RQE."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating RQE."); return; } @@ -134,5 +134,5 @@ tcp_rqueue_entry_t *rqe; - log_msg(LVL_DEBUG, "tcp_rqueue_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril()"); while (true) { @@ -152,9 +152,9 @@ fid_t fid; - log_msg(LVL_DEBUG, "tcp_rqueue_fibril_start()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril_start()"); fid = fibril_create(tcp_rqueue_fibril, NULL); if (fid == 0) { - log_msg(LVL_ERROR, "Failed creating rqueue fibril."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating rqueue fibril."); return; } Index: uspace/srv/net/tcp/segment.c =================================================================== --- uspace/srv/net/tcp/segment.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/segment.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -248,11 +248,11 @@ void tcp_segment_dump(tcp_segment_t *seg) { - log_msg(LVL_DEBUG2, "Segment dump:"); - log_msg(LVL_DEBUG2, " - ctrl = %u", (unsigned)seg->ctrl); - log_msg(LVL_DEBUG2, " - seq = %" PRIu32, seg->seq); - log_msg(LVL_DEBUG2, " - ack = %" PRIu32, seg->ack); - log_msg(LVL_DEBUG2, " - len = %" PRIu32, seg->len); - log_msg(LVL_DEBUG2, " - wnd = %" PRIu32, seg->wnd); - log_msg(LVL_DEBUG2, " - up = %" PRIu32, seg->up); + log_msg(LOG_DEFAULT, LVL_DEBUG2, "Segment dump:"); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - ctrl = %u", (unsigned)seg->ctrl); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - seq = %" PRIu32, seg->seq); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - ack = %" PRIu32, seg->ack); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - len = %" PRIu32, seg->len); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - wnd = %" PRIu32, seg->wnd); + log_msg(LOG_DEFAULT, LVL_DEBUG2, " - up = %" PRIu32, seg->up); } Index: uspace/srv/net/tcp/sock.c =================================================================== --- uspace/srv/net/tcp/sock.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/sock.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -91,5 +91,5 @@ static void tcp_sock_notify_data(socket_core_t *sock_core) { - log_msg(LVL_DEBUG, "tcp_sock_notify_data(%d)", sock_core->socket_id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_notify_data(%d)", sock_core->socket_id); async_exch_t *exch = async_exchange_begin(sock_core->sess); async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t)sock_core->socket_id, @@ -100,5 +100,5 @@ static void tcp_sock_notify_aconn(socket_core_t *lsock_core) { - log_msg(LVL_DEBUG, "tcp_sock_notify_aconn(%d)", lsock_core->socket_id); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_notify_aconn(%d)", lsock_core->socket_id); async_exch_t *exch = async_exchange_begin(lsock_core->sess); async_msg_5(exch, NET_SOCKET_ACCEPTED, (sysarg_t)lsock_core->socket_id, @@ -111,5 +111,5 @@ tcp_sockdata_t *sock; - log_msg(LVL_DEBUG, "tcp_sock_create()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_create()"); *rsock = NULL; @@ -133,5 +133,5 @@ static void tcp_sock_uncreate(tcp_sockdata_t *sock) { - log_msg(LVL_DEBUG, "tcp_sock_uncreate()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_uncreate()"); free(sock); } @@ -142,5 +142,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_sock_finish_setup()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_finish_setup()"); sock->recv_fibril = fibril_create(tcp_sock_recv_fibril, sock); @@ -171,5 +171,5 @@ ipc_call_t answer; - log_msg(LVL_DEBUG, "tcp_sock_socket()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_socket()"); rc = tcp_sock_create(client, &sock); @@ -208,6 +208,6 @@ tcp_sockdata_t *socket; - log_msg(LVL_DEBUG, "tcp_sock_bind()"); - log_msg(LVL_DEBUG, " - async_data_write_accept"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_bind()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - async_data_write_accept"); rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_len); if (rc != EOK) { @@ -216,5 +216,5 @@ } - log_msg(LVL_DEBUG, " - call socket_bind"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_bind"); rc = socket_bind(&client->sockets, &gsock, SOCKET_GET_SOCKET_ID(call), addr, addr_len, TCP_FREE_PORTS_START, TCP_FREE_PORTS_END, @@ -225,5 +225,5 @@ } - log_msg(LVL_DEBUG, " - call socket_cores_find"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - call socket_cores_find"); sock_core = socket_cores_find(&client->sockets, SOCKET_GET_SOCKET_ID(call)); if (sock_core != NULL) { @@ -233,5 +233,5 @@ } - log_msg(LVL_DEBUG, " - success"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - success"); async_answer_0(callid, EOK); } @@ -250,5 +250,5 @@ int i; - log_msg(LVL_DEBUG, "tcp_sock_listen()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_listen()"); socket_id = SOCKET_GET_SOCKET_ID(call); @@ -284,5 +284,5 @@ } - log_msg(LVL_DEBUG, " - open connections"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - open connections"); lsocket.addr.ipv4 = TCP_IPV4_ANY; @@ -337,5 +337,5 @@ tcp_sock_t fsocket; - log_msg(LVL_DEBUG, "tcp_sock_connect()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connect()"); rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &addr_len); @@ -377,5 +377,5 @@ fibril_mutex_unlock(&socket->lock); async_answer_0(callid, rc); - log_msg(LVL_DEBUG, "tcp_sock_connect: Failed to " + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connect: Failed to " "determine local address."); return; @@ -383,5 +383,5 @@ socket->laddr.ipv4 = loc_addr.ipv4; - log_msg(LVL_DEBUG, "Local IP address is %x", socket->laddr.ipv4); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Local IP address is %x", socket->laddr.ipv4); } @@ -431,5 +431,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_sock_accept()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept()"); socket_id = SOCKET_GET_SOCKET_ID(call); @@ -445,5 +445,5 @@ fibril_mutex_lock(&socket->lock); - log_msg(LVL_DEBUG, " - verify socket->conn"); + log_msg(LOG_DEFAULT, LVL_DEBUG, " - verify socket->conn"); if (socket->conn != NULL) { fibril_mutex_unlock(&socket->lock); @@ -498,5 +498,5 @@ asocket->conn = conn; - log_msg(LVL_DEBUG, "tcp_sock_accept():create asocket\n"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept():create asocket\n"); rc = tcp_sock_finish_setup(asocket, &asock_id); @@ -510,5 +510,5 @@ fibril_add_ready(asocket->recv_fibril); - log_msg(LVL_DEBUG, "tcp_sock_accept(): find acore\n"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept(): find acore\n"); SOCKET_SET_DATA_FRAGMENT_SIZE(answer, TCP_SOCK_FRAGMENT_SIZE); @@ -521,5 +521,5 @@ /* Push one fragment notification to client's queue */ - log_msg(LVL_DEBUG, "tcp_sock_accept(): notify data\n"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_accept(): notify data\n"); fibril_mutex_unlock(&socket->lock); } @@ -539,5 +539,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_sock_send()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_send()"); socket_id = SOCKET_GET_SOCKET_ID(call); fragments = SOCKET_GET_DATA_FRAGMENTS(call); @@ -611,5 +611,5 @@ static void tcp_sock_sendto(tcp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "tcp_sock_sendto()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_sendto()"); async_answer_0(callid, ENOTSUP); } @@ -629,5 +629,5 @@ int rc; - log_msg(LVL_DEBUG, "%p: tcp_sock_recv[from]()", client); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%p: tcp_sock_recv[from]()", client); socket_id = SOCKET_GET_SOCKET_ID(call); @@ -651,13 +651,13 @@ (void)flags; - log_msg(LVL_DEBUG, "tcp_sock_recvfrom(): lock recv_buffer_lock"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recvfrom(): lock recv_buffer_lock"); fibril_mutex_lock(&socket->recv_buffer_lock); while (socket->recv_buffer_used == 0 && socket->recv_error == TCP_EOK) { - log_msg(LVL_DEBUG, "wait for recv_buffer_cv + recv_buffer_used != 0"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "wait for recv_buffer_cv + recv_buffer_used != 0"); fibril_condvar_wait(&socket->recv_buffer_cv, &socket->recv_buffer_lock); } - log_msg(LVL_DEBUG, "Got data in sock recv_buffer"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Got data in sock recv_buffer"); data_len = socket->recv_buffer_used; @@ -679,5 +679,5 @@ } - log_msg(LVL_DEBUG, "**** recv result -> %d", rc); + log_msg(LOG_DEFAULT, LVL_DEBUG, "**** recv result -> %d", rc); if (rc != EOK) { fibril_mutex_unlock(&socket->recv_buffer_lock); @@ -694,5 +694,5 @@ addr.sin_port = host2uint16_t_be(rsock->port); - log_msg(LVL_DEBUG, "addr read receive"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "addr read receive"); if (!async_data_read_receive(&rcallid, &addr_length)) { fibril_mutex_unlock(&socket->recv_buffer_lock); @@ -705,5 +705,5 @@ addr_length = sizeof(addr); - log_msg(LVL_DEBUG, "addr read finalize"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "addr read finalize"); rc = async_data_read_finalize(rcallid, &addr, addr_length); if (rc != EOK) { @@ -715,5 +715,5 @@ } - log_msg(LVL_DEBUG, "data read receive"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "data read receive"); if (!async_data_read_receive(&rcallid, &length)) { fibril_mutex_unlock(&socket->recv_buffer_lock); @@ -726,9 +726,9 @@ length = data_len; - log_msg(LVL_DEBUG, "data read finalize"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "data read finalize"); rc = async_data_read_finalize(rcallid, socket->recv_buffer, length); socket->recv_buffer_used -= length; - log_msg(LVL_DEBUG, "tcp_sock_recvfrom: %zu left in buffer", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recvfrom: %zu left in buffer", socket->recv_buffer_used); if (socket->recv_buffer_used > 0) { @@ -758,5 +758,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_sock_close()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_close()"); socket_id = SOCKET_GET_SOCKET_ID(call); @@ -798,5 +798,5 @@ static void tcp_sock_getsockopt(tcp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "tcp_sock_getsockopt()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_getsockopt()"); async_answer_0(callid, ENOTSUP); } @@ -804,5 +804,5 @@ static void tcp_sock_setsockopt(tcp_client_t *client, ipc_callid_t callid, ipc_call_t call) { - log_msg(LVL_DEBUG, "tcp_sock_setsockopt()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_setsockopt()"); async_answer_0(callid, ENOTSUP); } @@ -815,5 +815,5 @@ tcp_sockdata_t *socket = lconn->socket; - log_msg(LVL_DEBUG, "tcp_sock_cstate_cb()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_cstate_cb()"); fibril_mutex_lock(&socket->lock); assert(conn == lconn->conn); @@ -828,5 +828,5 @@ list_append(&lconn->ready_list, &socket->ready); - log_msg(LVL_DEBUG, "tcp_sock_cstate_cb(): notify accept"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_cstate_cb(): notify accept"); /* Push one accept notification to client's queue */ @@ -842,10 +842,10 @@ tcp_error_t trc; - log_msg(LVL_DEBUG, "tcp_sock_recv_fibril()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recv_fibril()"); fibril_mutex_lock(&sock->recv_buffer_lock); while (true) { - log_msg(LVL_DEBUG, "call tcp_uc_receive()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "call tcp_uc_receive()"); while (sock->recv_buffer_used != 0 && sock->sock_core != NULL) fibril_condvar_wait(&sock->recv_buffer_cv, @@ -863,5 +863,5 @@ } - log_msg(LVL_DEBUG, "got data - broadcast recv_buffer_cv"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "got data - broadcast recv_buffer_cv"); sock->recv_buffer_used = data_len; @@ -895,5 +895,5 @@ break; - log_msg(LVL_DEBUG, "tcp_sock_connection: METHOD=%d\n", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connection: METHOD=%d\n", (int)IPC_GET_IMETHOD(call)); @@ -940,5 +940,5 @@ /* Clean up */ - log_msg(LVL_DEBUG, "tcp_sock_connection: Clean up"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_connection: Clean up"); async_hangup(client.sess); socket_cores_release(NULL, &client.sockets, &gsock, tcp_free_sock_data); Index: uspace/srv/net/tcp/tcp.c =================================================================== --- uspace/srv/net/tcp/tcp.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/tcp.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -69,5 +69,5 @@ size_t pdu_raw_size; - log_msg(LVL_DEBUG, "tcp_inet_ev_recv()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_inet_ev_recv()"); pdu_raw = dgram->data; @@ -76,5 +76,5 @@ /* Split into header and payload. */ - log_msg(LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload"); tcp_pdu_t *pdu; @@ -84,5 +84,5 @@ if (pdu_raw_size < sizeof(tcp_header_t)) { - log_msg(LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu", + log_msg(LOG_DEFAULT, LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu", pdu_raw_size, sizeof(tcp_header_t)); return EINVAL; @@ -96,5 +96,5 @@ if (pdu_raw_size < hdr_size) { - log_msg(LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu", + log_msg(LOG_DEFAULT, LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu", pdu_raw_size, hdr_size); return EINVAL; @@ -102,14 +102,14 @@ if (hdr_size < sizeof(tcp_header_t)) { - log_msg(LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu", + log_msg(LOG_DEFAULT, LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu", hdr_size, sizeof(tcp_header_t)); return EINVAL; } - log_msg(LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu", + log_msg(LOG_DEFAULT, LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu", pdu_raw_size, hdr_size); pdu = tcp_pdu_create(pdu_raw, hdr_size, pdu_raw + hdr_size, pdu_raw_size - hdr_size); if (pdu == NULL) { - log_msg(LVL_WARN, "Failed creating PDU. Dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Failed creating PDU. Dropped."); return ENOMEM; } @@ -117,5 +117,5 @@ pdu->src_addr.ipv4 = dgram->src.ipv4; pdu->dest_addr.ipv4 = dgram->dest.ipv4; - log_msg(LVL_DEBUG, "src: 0x%08x, dest: 0x%08x", + log_msg(LOG_DEFAULT, LVL_DEBUG, "src: 0x%08x, dest: 0x%08x", pdu->src_addr.ipv4, pdu->dest_addr.ipv4); @@ -137,5 +137,5 @@ pdu_raw = malloc(pdu_raw_size); if (pdu_raw == NULL) { - log_msg(LVL_ERROR, "Failed to transmit PDU. Out of memory."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU. Out of memory."); return; } @@ -153,5 +153,5 @@ rc = inet_send(&dgram, INET_TTL_MAX, 0); if (rc != EOK) - log_msg(LVL_ERROR, "Failed to transmit PDU."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU."); } @@ -162,8 +162,8 @@ tcp_sockpair_t rident; - log_msg(LVL_DEBUG, "tcp_received_pdu()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_received_pdu()"); if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) { - log_msg(LVL_WARN, "Not enough memory. PDU dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. PDU dropped."); return; } @@ -177,5 +177,5 @@ int rc; - log_msg(LVL_DEBUG, "tcp_init()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_init()"); tcp_rqueue_init(); @@ -189,5 +189,5 @@ rc = inet_init(IP_PROTO_TCP, &tcp_inet_ev_ops); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed connecting to internet service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting to internet service."); return ENOENT; } @@ -195,5 +195,5 @@ rc = tcp_sock_init(); if (rc != EOK) { - log_msg(LVL_ERROR, "Failed initializing socket service."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service."); return ENOENT; } @@ -208,5 +208,5 @@ printf(NAME ": TCP (Transmission Control Protocol) network module\n"); - rc = log_init(NAME, LVL_WARN); + rc = log_init(NAME); if (rc != EOK) { printf(NAME ": Failed to initialize log.\n"); Index: uspace/srv/net/tcp/tqueue.c =================================================================== --- uspace/srv/net/tcp/tqueue.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/tqueue.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -88,5 +88,5 @@ tcp_segment_t *seg; - log_msg(LVL_DEBUG, "tcp_tqueue_ctrl_seg(%p, %u)", conn, ctrl); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_tqueue_ctrl_seg(%p, %u)", conn, ctrl); seg = tcp_segment_make_ctrl(ctrl); @@ -99,5 +99,5 @@ tcp_tqueue_entry_t *tqe; - log_msg(LVL_DEBUG, "%s: tcp_tqueue_seg(%p, %p)", conn->name, conn, + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_seg(%p, %p)", conn->name, conn, seg); @@ -109,5 +109,5 @@ rt_seg = tcp_segment_dup(seg); if (rt_seg == NULL) { - log_msg(LVL_ERROR, "Memory allocation failed."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed."); /* XXX Handle properly */ return; @@ -116,5 +116,5 @@ tqe = calloc(1, sizeof(tcp_tqueue_entry_t)); if (tqe == NULL) { - log_msg(LVL_ERROR, "Memory allocation failed."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed."); /* XXX Handle properly */ return; @@ -165,5 +165,5 @@ tcp_segment_t *seg; - log_msg(LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name); /* Number of free sequence numbers in send window */ @@ -172,5 +172,5 @@ xfer_seqlen = min(snd_buf_seqlen, avail_wnd); - log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %" PRIu32 ", " + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %" PRIu32 ", " "xfer_seqlen = %zu", conn->name, snd_buf_seqlen, conn->snd_wnd, xfer_seqlen); @@ -185,5 +185,5 @@ if (send_fin) { - log_msg(LVL_DEBUG, "%s: Sending out FIN.", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Sending out FIN.", conn->name); /* We are sending out FIN */ ctrl = CTL_FIN; @@ -194,5 +194,5 @@ seg = tcp_segment_make_data(ctrl, conn->snd_buf, data_size); if (seg == NULL) { - log_msg(LVL_ERROR, "Memory allocation failure."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failure."); return; } @@ -223,5 +223,5 @@ link_t *cur, *next; - log_msg(LVL_DEBUG, "%s: tcp_tqueue_ack_received(%p)", conn->name, + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_ack_received(%p)", conn->name, conn); @@ -239,6 +239,6 @@ if ((tqe->seg->ctrl & CTL_FIN) != 0) { - log_msg(LVL_DEBUG, "Fin has been acked"); - log_msg(LVL_DEBUG, "SND.UNA=%" PRIu32 + log_msg(LOG_DEFAULT, LVL_DEBUG, "Fin has been acked"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "SND.UNA=%" PRIu32 " SEG.SEQ=%" PRIu32 " SEG.LEN=%" PRIu32, conn->snd_una, tqe->seg->seq, tqe->seg->len); @@ -267,5 +267,5 @@ void tcp_conn_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "%s: tcp_conn_transmit_segment(%p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_transmit_segment(%p, %p)", conn->name, conn, seg); @@ -282,9 +282,9 @@ void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg) { - log_msg(LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)", sp->foreign.addr.ipv4, sp->foreign.port, sp->local.addr.ipv4, sp->local.port, seg); - log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32, + log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32, seg->seq, seg->wnd); @@ -300,5 +300,5 @@ if (tcp_pdu_encode(sp, seg, &pdu) != EOK) { - log_msg(LVL_WARN, "Not enough memory. Segment dropped."); + log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped."); return; } @@ -315,10 +315,10 @@ link_t *link; - log_msg(LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn); fibril_mutex_lock(&conn->lock); if (conn->cstate == st_closed) { - log_msg(LVL_DEBUG, "Connection already closed."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Connection already closed."); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); @@ -328,5 +328,5 @@ link = list_first(&conn->retransmit.list); if (link == NULL) { - log_msg(LVL_DEBUG, "Nothing to retransmit"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "Nothing to retransmit"); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); @@ -338,5 +338,5 @@ rt_seg = tcp_segment_dup(tqe->seg); if (rt_seg == NULL) { - log_msg(LVL_ERROR, "Memory allocation failed."); + log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed."); fibril_mutex_unlock(&conn->lock); tcp_conn_delref(conn); @@ -345,5 +345,5 @@ } - log_msg(LVL_DEBUG, "### %s: retransmitting segment", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmitting segment", conn->name); tcp_conn_transmit_segment(tqe->conn, rt_seg); @@ -358,5 +358,5 @@ static void tcp_tqueue_timer_set(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name); /* Clear first to make sure we update refcnt correctly */ @@ -371,5 +371,5 @@ static void tcp_tqueue_timer_clear(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name); if (fibril_timer_clear(conn->retransmit.timer) == fts_active) Index: uspace/srv/net/tcp/ucall.c =================================================================== --- uspace/srv/net/tcp/ucall.c (revision db81577a2edad8340ee140d0f23af2b17579e167) +++ uspace/srv/net/tcp/ucall.c (revision 42bde6a9f722bcf89bd14dbdcbbf3f2052c35254) @@ -70,5 +70,5 @@ tcp_conn_t *nconn; - log_msg(LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)", lsock, fsock, acpass == ap_active ? "active" : "passive", oflags == tcp_open_nonblock ? "nonblock" : "none", conn); @@ -88,5 +88,5 @@ /* Wait for connection to be established or reset */ - log_msg(LVL_DEBUG, "tcp_uc_open: Wait for connection."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Wait for connection."); fibril_mutex_lock(&nconn->lock); while (nconn->cstate == st_listen || @@ -97,5 +97,5 @@ if (nconn->cstate != st_established) { - log_msg(LVL_DEBUG, "tcp_uc_open: Connection was reset."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Connection was reset."); assert(nconn->cstate == st_closed); fibril_mutex_unlock(&nconn->lock); @@ -104,8 +104,8 @@ fibril_mutex_unlock(&nconn->lock); - log_msg(LVL_DEBUG, "tcp_uc_open: Connection was established."); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Connection was established."); *conn = nconn; - log_msg(LVL_DEBUG, "tcp_uc_open -> %p", nconn); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open -> %p", nconn); return TCP_EOK; } @@ -118,5 +118,5 @@ size_t xfer_size; - log_msg(LVL_DEBUG, "%s: tcp_uc_send()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_send()", conn->name); fibril_mutex_lock(&conn->lock); @@ -141,5 +141,5 @@ buf_free = conn->snd_buf_size - conn->snd_buf_used; while (buf_free == 0 && !conn->reset) { - log_msg(LVL_DEBUG, "%s: buf_free == 0, waiting.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: buf_free == 0, waiting.", conn->name); fibril_condvar_wait(&conn->snd_buf_cv, &conn->lock); @@ -175,5 +175,5 @@ size_t xfer_size; - log_msg(LVL_DEBUG, "%s: tcp_uc_receive()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_receive()", conn->name); fibril_mutex_lock(&conn->lock); @@ -186,5 +186,5 @@ /* Wait for data to become available */ while (conn->rcv_buf_used == 0 && !conn->rcv_buf_fin && !conn->reset) { - log_msg(LVL_DEBUG, "tcp_uc_receive() - wait for data"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_receive() - wait for data"); fibril_condvar_wait(&conn->rcv_buf_cv, &conn->lock); } @@ -223,5 +223,5 @@ tcp_tqueue_ctrl_seg(conn, CTL_ACK); - log_msg(LVL_DEBUG, "%s: tcp_uc_receive() - returning %zu bytes", + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_receive() - returning %zu bytes", conn->name, xfer_size); @@ -234,5 +234,5 @@ tcp_error_t tcp_uc_close(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "%s: tcp_uc_close()", conn->name); + log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_close()", conn->name); fibril_mutex_lock(&conn->lock); @@ -258,5 +258,5 @@ void tcp_uc_abort(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "tcp_uc_abort()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_abort()"); } @@ -264,5 +264,5 @@ void tcp_uc_status(tcp_conn_t *conn, tcp_conn_status_t *cstatus) { - log_msg(LVL_DEBUG, "tcp_uc_status()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_status()"); cstatus->cstate = conn->cstate; } @@ -276,5 +276,5 @@ void tcp_uc_delete(tcp_conn_t *conn) { - log_msg(LVL_DEBUG, "tcp_uc_delete()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_delete()"); tcp_conn_delete(conn); } @@ -282,5 +282,5 @@ void tcp_uc_set_cstate_cb(tcp_conn_t *conn, tcp_cstate_cb_t cb, void *arg) { - log_msg(LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)", conn, cb, arg); @@ -298,5 +298,5 @@ tcp_conn_t *conn; - log_msg(LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))", + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))", sp->foreign.addr.ipv4, sp->foreign.port, sp->local.addr.ipv4, sp->local.port); @@ -304,5 +304,5 @@ conn = tcp_conn_find_ref(sp); if (conn == NULL) { - log_msg(LVL_WARN, "No connection found."); + log_msg(LOG_DEFAULT, LVL_WARN, "No connection found."); tcp_unexpected_segment(sp, seg); return; @@ -312,5 +312,5 @@ if (conn->cstate == st_closed) { - log_msg(LVL_WARN, "Connection is closed."); + log_msg(LOG_DEFAULT, LVL_WARN, "Connection is closed."); tcp_unexpected_segment(sp, seg); fibril_mutex_unlock(&conn->lock); @@ -339,5 +339,5 @@ void tcp_to_user(void) { - log_msg(LVL_DEBUG, "tcp_to_user()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_to_user()"); }