Changeset 854151c in mainline

Timestamp:

2011-01-07T12:32:23Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b404a98

Parents:

3d5e190

Message:

store addresses as uint8_t values (char can be both signed or unsigned depending on platform)
improve MAC address printouts

Location:

uspace

Files:

• lib/net/generic/generic.c (modified) (2 diffs)
• lib/net/include/generic.h (modified) (1 diff)
• lib/net/include/netif_local.h (modified) (1 diff)
• lib/net/include/netif_remote.h (modified) (1 diff)
• lib/net/netif/netif_local.c (modified) (2 diffs)
• lib/net/netif/netif_remote.c (modified) (1 diff)
• srv/hw/netif/dp8390/dp8390.c (modified) (1 diff)
• srv/net/il/arp/arp.c (modified) (2 diffs)
• srv/net/il/arp/arp.h (modified) (3 diffs)
• srv/net/nil/eth/eth.c (modified) (1 diff)
• srv/net/nil/eth/eth.h (modified) (1 diff)
• srv/net/nil/nildummy/nildummy.h (modified) (1 diff)

uspace/lib/net/generic/generic.c

@@ -100 +100 @@
 int
 generic_get_addr_req(int phone, int message, device_id_t device_id,
-    measured_string_t **address, char ** data)
+    measured_string_t **address, uint8_t **data)
 {
         aid_t message_id;
@@ -112 +112 @@
         message_id = async_send_1(phone, (sysarg_t) message,
             (sysarg_t) device_id, NULL);
-        string = measured_strings_return(phone, address, data, 1);
+        string = measured_strings_return(phone, address, (char **) data, 1);
         async_wait_for(message_id, &result);
 

uspace/lib/net/include/generic.h

@@ -50 +50 @@
 extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
 extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int generic_packet_size_req_remote(int, int, device_id_t,
     packet_dimension_t *);

uspace/lib/net/include/netif_local.h

@@ -196 +196 @@
 
 extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int netif_probe_req_local(int, device_id_t, int, int);
 extern int netif_send_msg_local(int, device_id_t, packet_t *, services_t);

uspace/lib/net/include/netif_remote.h

@@ -42 +42 @@
 
 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int netif_probe_req_remote(int, device_id_t, int, int);
 extern int netif_send_msg_remote(int, device_id_t, packet_t *, services_t);

uspace/lib/net/netif/netif_local.c

@@ -203 +203 @@
  */
 int netif_get_addr_req_local(int netif_phone, device_id_t device_id,
-    measured_string_t **address, char **data)
+    measured_string_t **address, uint8_t **data)
 {
         int rc;
@@ -221 +221 @@
         fibril_rwlock_read_unlock(&netif_globals.lock);
         
-        *data = (**address).value;
+        *data = (uint8_t *) (**address).value;
         
         return rc;

uspace/lib/net/netif/netif_remote.c

@@ -60 +60 @@
  */
 int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
-    measured_string_t **address, char **data)
+    measured_string_t **address, uint8_t **data)
 {
         return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id,

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -263 +263 @@
         printf("Ethernet address ");
         for (i = 0; i < 6; i++)
-                printf("%x%c", dep->de_address.ea_addr[i], i < 5 ? ':' : '\n');
+                printf("%02x%c", dep->de_address.ea_addr[i], i < 5 ? ':' : '\n');
         
         /*

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

@@ -215 +215 @@
         (*proto)->service = service;
         (*proto)->addr = address;
-        (*proto)->addr_data = address->value;
+        (*proto)->addr_data = (uint8_t *) address->value;
         
         rc = arp_addr_initialize(&(*proto)->addresses);
@@ -267 +267 @@
                         free(proto->addr_data);
                         proto->addr = address;
-                        proto->addr_data = address->value;
+                        proto->addr_data = (uint8_t *) address->value;
                 } else {
                         rc = arp_proto_create(&proto, protocol, address);

uspace/srv/net/il/arp/arp.h

@@ -96 +96 @@
         measured_string_t *addr;
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
         /** Broadcast device hardware address. */
         measured_string_t *broadcast_addr;
         /** Broadcast device hardware address data. */
-        char *broadcast_data;
+        uint8_t *broadcast_data;
         /** Device identifier. */
         device_id_t device_id;
@@ -142 +142 @@
         measured_string_t *addr;
         /** Actual device protocol address data. */
-        char *addr_data;
+        uint8_t *addr_data;
         /** Address map. */
         arp_addr_t addresses;
@@ -154 +154 @@
          * Hardware address for the translation. NULL denotes an incomplete
          * record with possible waiters.
-         */ 
+         */
         measured_string_t *hw_addr;
         /** Condition variable used for waiting for completion of the record. */

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

@@ -407 +407 @@
         
         printf("%s: Device registered (id: %d, service: %d: mtu: %zu, "
-            "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
+            "mac: %02x:%02x:%02x:%02x:%02x:%02x, flags: 0x%x)\n",
             NAME, device->device_id, device->service, device->mtu,
             device->addr_data[0], device->addr_data[1],

uspace/srv/net/nil/eth/eth.h

@@ -91 +91 @@
         /** Actual device hardware address. */
         measured_string_t *addr;
+        
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
 };
 

uspace/srv/net/nil/nildummy/nildummy.h

@@ -78 +78 @@
         measured_string_t *addr;
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
 };