Changeset 61bfc370 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2011-01-07T18:57:55Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e08a733

Parents:

7c34b28f

Message:

• make measured_string and other network-related data types binary-safe
• fix several network-related routines binary-safe (replace clearly suspicious use of str_lcmp() with bcmp())
• rename spawn() to net_spawn()

File:

• uspace/srv/net/nil/eth/eth.c (modified) (4 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -201 +201 @@
 
         eth_globals.broadcast_addr =
-            measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
+            measured_string_create_bulk((uint8_t *) "\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
         if (!eth_globals.broadcast_addr) {
                 rc = ENOMEM;
@@ -284 +284 @@
         measured_string_t names[2] = {
                 {
-                        (char *) "ETH_MODE",
+                        (uint8_t *) "ETH_MODE",
                         8
                 },
                 {
-                        (char *) "ETH_DUMMY",
+                        (uint8_t *) "ETH_DUMMY",
                         9
                 }
@@ -294 +294 @@
         measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
-        char *data;
+        uint8_t *data;
         eth_proto_t *proto;
         int rc;
@@ -358 +358 @@
 
         if (configuration) {
-                if (!str_lcmp(configuration[0].value, "DIX",
+                if (!str_lcmp((char *) configuration[0].value, "DIX",
                     configuration[0].length)) {
                         device->flags |= ETH_DIX;
-                } else if(!str_lcmp(configuration[0].value, "8023_2_LSAP",
+                } else if(!str_lcmp((char *) configuration[0].value, "8023_2_LSAP",
                     configuration[0].length)) {
                         device->flags |= ETH_8023_2_LSAP;