Changeset 962f03b in mainline for uspace/srv

Timestamp:

2012-02-27T19:32:15Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

56792a2

Parents:

87e5658c

Message:

IP links need to be made aware of configured IP addresses.

Location:

uspace/srv

Files:

• ethip/arp.c (modified) (3 diffs)
• ethip/ethip.c (modified) (3 diffs)
• ethip/ethip.h (modified) (1 diff)
• ethip/ethip_nic.c (modified) (3 diffs)
• ethip/ethip_nic.h (modified) (1 diff)
• inet/inet_link.c (modified) (2 diffs)

uspace/srv/ethip/arp.c

@@ -46 +46 @@
 #include "std.h"
 
-#define MY_IPV4_ADDR ( (192 << 24) | (168 << 16) | (0 << 8) | 4U )
 #define MY_ETH_ADDR 0xaafeedfaceee
 
@@ -56 +55 @@
         arp_eth_packet_t packet;
         arp_eth_packet_t reply;
+        ethip_link_addr_t *laddr;
 
         log_msg(LVL_DEBUG, "arp_received()");
@@ -65 +65 @@
         log_msg(LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
             packet.opcode, packet.target_proto_addr.ipv4);
-        if (packet.opcode == aop_request &&
-            packet.target_proto_addr.ipv4 == MY_IPV4_ADDR) {
-                log_msg(LVL_DEBUG, "Request on my address");
+        if (packet.opcode == aop_request) {
+                log_msg(LVL_DEBUG, "ARP request");
 
-                reply.opcode = aop_reply;
-                reply.sender_hw_addr.addr = MY_ETH_ADDR;
-                reply.sender_proto_addr.ipv4 = MY_IPV4_ADDR;
-                reply.target_hw_addr = packet.sender_hw_addr;
-                reply.target_proto_addr = packet.sender_proto_addr;
+                laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr);
+                if (laddr != NULL) {
+                        log_msg(LVL_DEBUG, "Request on my address");
 
-                arp_send_packet(nic, &reply);
+                        reply.opcode = aop_reply;
+                        reply.sender_hw_addr.addr = MY_ETH_ADDR;
+                        reply.sender_proto_addr = laddr->addr;
+                        reply.target_hw_addr = packet.sender_hw_addr;
+                        reply.target_proto_addr = packet.sender_proto_addr;
+
+                        arp_send_packet(nic, &reply);
+                }
         }
 }

uspace/srv/ethip/ethip.c

@@ -57 +57 @@
 static int ethip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu);
 static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
+static int ethip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr);
+static int ethip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr);
 
 static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -64 +66 @@
         .close = ethip_close,
         .send = ethip_send,
-        .get_mtu = ethip_get_mtu
+        .get_mtu = ethip_get_mtu,
+        .addr_add = ethip_addr_add,
+        .addr_remove = ethip_addr_remove
 };
 
@@ -234 +238 @@
 }
 
+static int ethip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr)
+{
+        ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
+
+        log_msg(LVL_DEBUG, "ethip_addr_add(0x%" PRIx32 ")", addr->ipv4);
+        return ethip_nic_addr_add(nic, addr);
+}
+
+static int ethip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr)
+{
+        ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
+
+        log_msg(LVL_DEBUG, "ethip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
+        return ethip_nic_addr_add(nic, addr);
+}
+
 int main(int argc, char *argv[])
 {

uspace/srv/ethip/ethip.h

@@ -52 +52 @@
         iplink_srv_t iplink;
         service_id_t iplink_sid;
+
+        /** List of IP addresses configured on this link */
+        list_t addr_list; /* of ethip_link_addr_t */
 } ethip_nic_t;
+
+typedef struct {
+        link_t addr_list;
+        iplink_srv_addr_t addr;
+} ethip_link_addr_t;
 
 /** IEEE MAC-48 identifier */

uspace/srv/ethip/ethip_nic.c

@@ -115 +115 @@
 
         link_initialize(&nic->nic_list);
+        list_initialize(&nic->addr_list);
 
         return nic;
+}
+
+static ethip_link_addr_t *ethip_nic_addr_new(iplink_srv_addr_t *addr)
+{
+        ethip_link_addr_t *laddr = calloc(1, sizeof(ethip_link_addr_t));
+
+        if (laddr == NULL) {
+                log_msg(LVL_ERROR, "Failed allocating NIC address structure. "
+                    "Out of memory.");
+                return NULL;
+        }
+
+        link_initialize(&laddr->addr_list);
+        laddr->addr.ipv4 = addr->ipv4;
+        return laddr;
 }
 
@@ -124 +140 @@
                 free(nic->svc_name);
         free(nic);
+}
+
+static void ethip_link_addr_delete(ethip_link_addr_t *laddr)
+{
+        free(laddr);
 }
 
@@ -308 +329 @@
         rc = nic_send_frame(nic->sess, data, size);
         log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
-        log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
-        log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
-        log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
-        log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
-        log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
-        log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
-        log_msg(LVL_DEBUG, "nic_send_frame -> %d", rc);
         return rc;
+}
+
+int ethip_nic_addr_add(ethip_nic_t *nic, iplink_srv_addr_t *addr)
+{
+        ethip_link_addr_t *laddr;
+
+        log_msg(LVL_DEBUG, "ethip_nic_addr_add()");
+        laddr = ethip_nic_addr_new(addr);
+        if (laddr == NULL)
+                return ENOMEM;
+
+        list_append(&laddr->addr_list, &nic->addr_list);
+        return EOK;
+}
+
+int ethip_nic_addr_remove(ethip_nic_t *nic, iplink_srv_addr_t *addr)
+{
+        ethip_link_addr_t *laddr;
+
+        log_msg(LVL_DEBUG, "ethip_nic_addr_remove()");
+
+        laddr = ethip_nic_addr_find(nic, addr);
+        if (laddr == NULL)
+                return ENOENT;
+
+        list_remove(&laddr->addr_list);
+        ethip_link_addr_delete(laddr);
+        return EOK;
+}
+
+ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *nic,
+    iplink_srv_addr_t *addr)
+{
+        log_msg(LVL_DEBUG, "ethip_nic_addr_find()");
+
+        list_foreach(nic->addr_list, link) {
+                ethip_link_addr_t *laddr = list_get_instance(link,
+                    ethip_link_addr_t, addr_list);
+
+                if (addr->ipv4 == laddr->addr.ipv4)
+                        return laddr;
+        }
+
+        return NULL;
 }
 

uspace/srv/ethip/ethip_nic.h

@@ -39 +39 @@
 
 #include <ipc/loc.h>
+#include "ethip.h"
 
 extern int ethip_nic_discovery_start(void);
 extern ethip_nic_t *ethip_nic_find_by_iplink_sid(service_id_t);
 extern int ethip_nic_send(ethip_nic_t *, void *, size_t);
-
+extern int ethip_nic_addr_add(ethip_nic_t *, iplink_srv_addr_t *);
+extern int ethip_nic_addr_remove(ethip_nic_t *, iplink_srv_addr_t *);
+extern ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *,
+    iplink_srv_addr_t *);
 
 #endif

uspace/srv/inet/inet_link.c

@@ -151 +151 @@
 {
         inet_link_t *ilink;
+        iplink_addr_t iaddr;
         int rc;
 
@@ -194 +195 @@
         addr->ilink = ilink;
         inet_addrobj_add(addr);
+
+        iaddr.ipv4 = addr->naddr.ipv4;
+        rc = iplink_addr_add(ilink->iplink, &iaddr);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Failed setting IP address on internet link.");
+                /* XXX Roll back */
+                return rc;
+        }
 
         return EOK;