Changeset 081971b in mainline

Timestamp:

2012-02-13T23:10:29Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

87e5658c

Parents:

2ff150e

Message:

Need to pad short Ethernet frames. Add some more debugging code.

Location:

uspace

Files:

• drv/nic/ne2k/dp8390.c (modified) (2 diffs)
• srv/ethip/ethip.c (modified) (1 diff)
• srv/ethip/pdu.c (modified) (3 diffs)
• srv/ethip/std.h (modified) (1 diff)
• srv/inet/inet_link.c (modified) (1 diff)

uspace/drv/nic/ne2k/dp8390.c

@@ -410 +410 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
+        printf("ne2k_send()\n");
         assert(ne2k->probed);
         assert(ne2k->up);
@@ -421 +422 @@
         if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) {
                 fibril_mutex_unlock(&ne2k->sq_mutex);
+                printf("ne2k_send() - checks failed size=%zu (min %zu, max %zu)\n",
+                    size, ETH_MIN_PACK_SIZE, ETH_MAX_PACK_SIZE_TAGGED);
                 return;
         }
+
+        printf("ne2k_send() - uploading\n");
+        size_t i;
+        for (i = 0; i < size; i++)
+                printf("%02x ", ((uint8_t *)data)[i]);
+        printf("\n");
 
         /* Upload the frame to the ethernet card */

uspace/srv/ethip/ethip.c

@@ -172 +172 @@
 
         frame.dest.addr = 0xdeeedeeedeee;
-        frame.src.addr =  0xaafeedfaceee;
+        frame.src.addr =  0xaadeadbeeffe;
         frame.etype_len = ETYPE_IP;
         frame.data = sdu->data;

uspace/srv/ethip/pdu.c

@@ -38 +38 @@
 #include <errno.h>
 #include <io/log.h>
+#include <macros.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -57 +58 @@
         eth_header_t *hdr;
 
-        size = sizeof(eth_header_t) + frame->size;
+        size = max(sizeof(eth_header_t) + frame->size, ETH_FRAME_MIN_SIZE);
 
         data = calloc(size, 1);
@@ -122 +123 @@
 
         val = addr->addr;
-        for (i = 0; i < MAC48_BYTES; i++) {
+        for (i = 0; i < MAC48_BYTES; i++)
                 bbuf[i] = (val >> (8 * (MAC48_BYTES - i - 1))) & 0xff;
-                val = val >> 8;
-        }
 }
 

uspace/srv/ethip/std.h

@@ -53 +53 @@
 #define ETYPE_IP        0x0800
 
+#define ETH_FRAME_MIN_SIZE 60
+
 #endif
 

uspace/srv/inet/inet_link.c

@@ -182 +182 @@
         inet_addrobj_t *addr;
 
+        static int first = 1;
         /* XXX For testing: set static IP address 192.168.0.4/24 */
         addr = inet_addrobj_new();
-        addr->naddr.ipv4 = (192 << 24) + (168 << 16) + (0 << 8) + 4;
+        if (first) {
+                addr->naddr.ipv4 = (127 << 24) + (0 << 16) + (0 << 8) + 1;
+                first = 0;
+        } else {
+                addr->naddr.ipv4 = (192 << 24) + (168 << 16) + (0 << 8) + 4;
+        }
         addr->naddr.bits = 24;
         addr->ilink = ilink;