Changeset d8b47eca in mainline for uspace/srv/net/ethip

Timestamp:

2013-07-03T17:16:44Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

66366470, 882bc4b

Parents:

1d24ad3

Message:

support arbitrary addresses in INET_SEND and INET_GET_SRCADDR
use addr32_t instead of uint32_t

Location:

uspace/srv/net/ethip

Files:

• atrans.c (modified) (4 diffs)
• atrans.h (modified) (1 diff)
• ethip.h (modified) (2 diffs)
• std.h (modified) (1 diff)

uspace/srv/net/ethip/atrans.c

@@ -49 +49 @@
 static FIBRIL_CONDVAR_INITIALIZE(atrans_cv);
 
-static ethip_atrans_t *atrans_find(uint32_t ip_addr)
+static ethip_atrans_t *atrans_find(addr32_t ip_addr)
 {
         list_foreach(atrans_list, link) {
@@ -62 +62 @@
 }
 
-int atrans_add(uint32_t ip_addr, addr48_t mac_addr)
+int atrans_add(addr32_t ip_addr, addr48_t mac_addr)
 {
         ethip_atrans_t *atrans;
@@ -88 +88 @@
 }
 
-int atrans_remove(uint32_t ip_addr)
+int atrans_remove(addr32_t ip_addr)
 {
         ethip_atrans_t *atrans;
@@ -106 +106 @@
 }
 
-int atrans_lookup(uint32_t ip_addr, addr48_t mac_addr)
+int atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
 {
         fibril_mutex_lock(&atrans_list_lock);

uspace/srv/net/ethip/atrans.h

@@ -42 +42 @@
 #include "ethip.h"
 
-extern int atrans_add(uint32_t, addr48_t);
-extern int atrans_remove(uint32_t);
-extern int atrans_lookup(uint32_t, addr48_t);
+extern int atrans_add(addr32_t, addr48_t);
+extern int atrans_remove(addr32_t);
+extern int atrans_lookup(addr32_t, addr48_t);
 extern int atrans_wait_timeout(suseconds_t);
 

uspace/srv/net/ethip/ethip.h

@@ -97 +97 @@
         addr48_t sender_hw_addr;
         /** Sender protocol address */
-        uint32_t sender_proto_addr;
+        addr32_t sender_proto_addr;
         /** Target hardware address */
         addr48_t target_hw_addr;
         /** Target protocol address */
-        uint32_t target_proto_addr;
+        addr32_t target_proto_addr;
 } arp_eth_packet_t;
 
@@ -107 +107 @@
 typedef struct {
         link_t atrans_list;
-        uint32_t ip_addr;
+        addr32_t ip_addr;
         addr48_t mac_addr;
 } ethip_atrans_t;

uspace/srv/net/ethip/std.h

@@ -70 +70 @@
         addr48_t sender_hw_addr;
         /** Sender protocol address */
-        uint32_t sender_proto_addr;
+        addr32_t sender_proto_addr;
         /** Target hardware address */
         addr48_t target_hw_addr;
         /** Target protocol address */
-        uint32_t target_proto_addr;
+        addr32_t target_proto_addr;
 } __attribute__((packed)) arp_eth_packet_fmt_t;