Changeset 61bfc370 in mainline for uspace/srv/net/il/arp/arp.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/il/arp/arp.c (modified) (8 diffs)

uspace/srv/net/il/arp/arp.c

@@ -215 +215 @@
         (*proto)->service = service;
         (*proto)->addr = address;
-        (*proto)->addr_data = (uint8_t *) address->value;
+        (*proto)->addr_data = address->value;
         
         rc = arp_addr_initialize(&(*proto)->addresses);
@@ -267 +267 @@
                         free(proto->addr_data);
                         proto->addr = address;
-                        proto->addr_data = (uint8_t *) address->value;
+                        proto->addr_data = address->value;
                 } else {
                         rc = arp_proto_create(&proto, protocol, address);
@@ -482 +482 @@
         des_hw = src_proto + header->protocol_length;
         des_proto = des_hw + header->hardware_length;
-        trans = arp_addr_find(&proto->addresses, (char *) src_proto,
+        trans = arp_addr_find(&proto->addresses, src_proto,
             header->protocol_length);
         /* Exists? */
@@ -493 +493 @@
         if (proto->addr->length != header->protocol_length)
                 return EINVAL;
-        if (!str_lcmp(proto->addr->value, (char *) des_proto,
-            proto->addr->length)) {
+        
+        if (!bcmp(proto->addr->value, des_proto, proto->addr->length)) {
                 /* Not already updated? */
                 if (!trans) {
@@ -502 +502 @@
                         trans->hw_addr = NULL;
                         fibril_condvar_initialize(&trans->cv);
-                        rc = arp_addr_add(&proto->addresses, (char *) src_proto,
+                        rc = arp_addr_add(&proto->addresses, src_proto,
                             header->protocol_length, trans);
                         if (rc != EOK) {
@@ -510 +510 @@
                 }
                 if (!trans->hw_addr) {
-                        trans->hw_addr = measured_string_create_bulk(
-                            (char *) src_hw, header->hardware_length);
+                        trans->hw_addr = measured_string_create_bulk(src_hw,
+                            header->hardware_length);
                         if (!trans->hw_addr)
                                 return ENOMEM;
-
+                        
                         /* Notify the fibrils that wait for the translation. */
                         fibril_condvar_broadcast(&trans->cv);
@@ -681 +681 @@
         measured_string_t *address;
         measured_string_t *translation;
-        char *data;
+        uint8_t *data;
         packet_t *packet;
         packet_t *next;
@@ -748 +748 @@
         
         case NET_IL_RECEIVED:
+                
                 rc = packet_translate_remote(arp_globals.net_phone, &packet,
                     IPC_GET_PACKET(call));