Changeset 1cc8b42 in mainline for uspace/srv/ethip/pdu.c

Timestamp:

2012-02-27T20:34:58Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f9d3dd4

Parents:

56792a2

Message:

Correct IP checksum and identification.

File:

• uspace/srv/ethip/pdu.c (modified) (4 diffs)

uspace/srv/ethip/pdu.c

@@ -49 +49 @@
 
 /** Encode Ethernet PDU. */
+#include <stdio.h>
 int eth_pdu_encode(eth_frame_t *frame, void **rdata, size_t *rsize)
 {
@@ -69 +70 @@
             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, "Encoded Ethernet frame (%zu bytes)", size);
+        size_t i;
+        for (i = 0; i < size; i++) {
+                printf("%02x ", ((uint8_t *)(data))[sizeof(eth_header_t) + i]);
+        }
+        printf("\n");
+
+
         *rdata = data;
         *rsize = size;
@@ -101 +112 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Ethernet frame src=%llx dest=%llx etype=%x",
+        log_msg(LVL_DEBUG, "Decoding 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);
+        log_msg(LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
         size_t i;
         for (i = 0; i < frame->size; i++) {
@@ -200 +211 @@
         }
 
-        if (uint16_t_be2host(pfmt->proto_addr_space) != ETYPE_IP) {
+        if (uint16_t_be2host(pfmt->proto_addr_space) != 0x0800) {
                 log_msg(LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")",
                     ETYPE_IP, uint16_t_be2host(pfmt->proto_addr_space));