Changeset 5572ad1 in mainline for uspace/srv

Timestamp:

2012-08-23T21:50:46Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

276e44a

Parents:

ae827d0 (diff), db81577 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

Location:

uspace/srv/net

Files:

• ethip/pdu.c (modified) (2 diffs)
• tcp/conn.c (modified) (2 diffs)
• tcp/segment.c (modified) (1 diff)
• tcp/sock.c (modified) (3 diffs)
• tcp/tqueue.c (modified) (1 diff)
• udp/sock.c (modified) (1 diff)

uspace/srv/net/ethip/pdu.c

@@ -69 +69 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x",
-            frame->src, frame->dest, frame->etype_len);
+        log_msg(LVL_DEBUG, "Encoding Ethernet frame "
+            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
+            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
 
@@ -104 +105 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x",
-            frame->src, frame->dest, frame->etype_len);
+        log_msg(LVL_DEBUG, "Decoding Ethernet frame "
+            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
+            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
 

uspace/srv/net/tcp/conn.c

@@ -999 +999 @@
         } else {
                 log_msg(LVL_DEBUG, "%s: Nothing left in segment, dropping "
-                    "(xfer_size=%zu, SEG.LEN=%zu, seg->ctrl=%u)",
-                    conn->name, xfer_size, seg->len, (unsigned)seg->ctrl);
+                    "(xfer_size=%zu, SEG.LEN=%" PRIu32 ", seg->ctrl=%u)",
+                    conn->name, xfer_size, seg->len, (unsigned int) seg->ctrl);
                 /* Nothing left in segment */
                 tcp_segment_delete(seg);
@@ -1146 +1146 @@
 void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg)
 {
-        log_msg(LVL_DEBUG, "%c: tcp_conn_segment_arrived(%p)",
+        log_msg(LVL_DEBUG, "%s: tcp_conn_segment_arrived(%p)",
             conn->name, seg);
 

uspace/srv/net/tcp/segment.c

@@ -250 +250 @@
         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(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);
 }
 

uspace/srv/net/tcp/sock.c

@@ -114 +114 @@
         *rsock = NULL;
 
-        sock = calloc(sizeof(tcp_sockdata_t), 1);
+        sock = calloc(1, sizeof(tcp_sockdata_t));
         if (sock == NULL)
                 return ENOMEM;
@@ -277 +277 @@
 
         socket->backlog = backlog;
-        socket->lconn = calloc(sizeof(tcp_conn_t *), backlog);
+        socket->lconn = calloc(backlog, sizeof(tcp_conn_t *));
         if (socket->lconn == NULL) {
                 fibril_mutex_unlock(&socket->lock);
@@ -293 +293 @@
         for (i = 0; i < backlog; i++) {
 
-                lconn = calloc(sizeof(tcp_sock_lconn_t), 1);
+                lconn = calloc(1, sizeof(tcp_sock_lconn_t));
                 if (lconn == NULL) {
                         /* XXX Clean up */

uspace/srv/net/tcp/tqueue.c

@@ -172 +172 @@
 
         xfer_seqlen = min(snd_buf_seqlen, avail_wnd);
-        log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %zu, "
+        log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %" PRIu32 ", "
             "xfer_seqlen = %zu", conn->name, snd_buf_seqlen, conn->snd_wnd,
             xfer_seqlen);

uspace/srv/net/udp/sock.c

@@ -104 +104 @@
 
         log_msg(LVL_DEBUG, "udp_sock_socket()");
-        sock = calloc(sizeof(udp_sockdata_t), 1);
+        sock = calloc(1, sizeof(udp_sockdata_t));
         if (sock == NULL) {
                 async_answer_0(callid, ENOMEM);