Changeset df15e5f in mainline

Timestamp:

2012-02-12T20:09:36Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd8bfc5a

Parents:

4f64a523

Message:

Fix bug in MAC address decoding.

Location:

uspace/srv

Files:

• ethip/ethip_nic.c (modified) (2 diffs)
• ethip/pdu.c (modified) (4 diffs)
• tcp/tcp.c (modified) (1 diff)

uspace/srv/ethip/ethip_nic.c

@@ -198 +198 @@
 }
 
+#include <stdio.h>
 static void ethip_nic_received(ethip_nic_t *nic, ipc_callid_t callid,
     ipc_call_t *call)
@@ -212 +213 @@
                 return;
         }
+
+        log_msg(LVL_DEBUG, "Ethernet PDU contents (%zu bytes)",
+            size);
+        size_t i;
+        for (i = 0; i < size; i++)
+                printf("%02x ", ((uint8_t *)data)[i]);
+        printf("\n");
 
         log_msg(LVL_DEBUG, "call ethip_received");

uspace/srv/ethip/pdu.c

@@ -76 +76 @@
 }
 
+#include <stdio.h>
 /** Decode Ethernet PDU. */
 int eth_pdu_decode(void *data, size_t size, eth_frame_t *frame)
@@ -102 +103 @@
             frame->size);
 
+        log_msg(LVL_DEBUG, "Ethernet frame src=%llx dest=%llx etype=%x",
+            frame->src, frame->dest, frame->etype_len);
+        log_msg(LVL_DEBUG, "Ethernet frame payload (%zu bytes)", frame->size);
+        size_t i;
+        for (i = 0; i < frame->size; i++) {
+                printf("%02x ", ((uint8_t *)(frame->data))[i]);
+        }
+        printf("\n");
+
         return EOK;
 }
@@ -113 +123 @@
         val = addr->addr;
         for (i = 0; i < MAC48_BYTES; i++) {
-                bbuf[i] = (val >> 8*(MAC48_BYTES - i - 1)) & 0xff;
+                bbuf[i] = (val >> (8 * (MAC48_BYTES - i - 1))) & 0xff;
                 val = val >> 8;
         }
@@ -126 +136 @@
         val = 0;
         for (i = 0; i < MAC48_BYTES; i++)
-                val |= ((uint64_t)bdata[i]) << (MAC48_BYTES - i - 1);
+                val |= (uint64_t)bdata[i] << (8 * (MAC48_BYTES - i - 1));
 
         addr->addr = val;

uspace/srv/tcp/tcp.c

@@ -208 +208 @@
         printf(NAME ": TCP (Transmission Control Protocol) network module\n");
 
-        rc = log_init(NAME, LVL_ERROR);
+        rc = log_init(NAME, LVL_DEBUG);
         if (rc != EOK) {
                 printf(NAME ": Failed to initialize log.\n");