Changes in uspace/srv/net/inetsrv/inet_link.c [1d24ad3:4a5a18be] in mainline

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (8 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
-#include <net/socket_codes.h>
+
 #include "addrobj.h"
 #include "inetsrv.h"
@@ -49 +49 @@
 #include "pdu.h"
 
-static int inet_link_open(service_id_t);
-static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
+static int inet_link_open(service_id_t sid);
+static int inet_iplink_recv(iplink_t *ilink, iplink_sdu_t *sdu);
 
 static iplink_ev_ops_t inet_iplink_ev_ops = {
@@ -59 +59 @@
 static FIBRIL_MUTEX_INITIALIZE(inet_discovery_lock);
 
-static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, uint16_t af)
-{
+static int inet_iplink_recv(iplink_t *iplink, iplink_sdu_t *sdu)
+{
+        inet_packet_t packet;
+        int rc;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
-        
-        int rc;
-        inet_packet_t packet;
-        
-        switch (af) {
-        case AF_INET:
-                rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
-                break;
-        case AF_INET6:
-                rc = inet_pdu_decode6(sdu->data, sdu->size, &packet);
-                break;
-        default:
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid address family");
-                return EINVAL;
-        }
-        
+        rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "failed decoding PDU");
                 return rc;
         }
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet()");
         rc = inet_recv_packet(&packet);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet -> %d", rc);
         free(packet.data);
-        
+
         return rc;
 }
@@ -165 +153 @@
 {
         inet_link_t *ilink;
-        inet_addr_t iaddr;
+        iplink_addr_t iaddr;
         int rc;
 
@@ -206 +194 @@
 
         inet_addrobj_t *addr;
-        inet_addrobj_t *addr6;
 
         static int first = 1;
-        
+        /* XXX For testing: set static IP address 10.0.2.15/24 */
         addr = inet_addrobj_new();
-        addr6 = inet_addrobj_new();
-        
         if (first) {
-                inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
-                inet_naddr6(&addr6->naddr, 0, 0, 0, 0, 0, 0, 0, 1, 128);
+                addr->naddr.ipv4 = (127 << 24) + (0 << 16) + (0 << 8) + 1;
                 first = 0;
         } else {
-                /*
-                 * FIXME
-                 * Setting static IP addresses for testing purposes
-                 * 10.0.2.15/24
-                 * fd19:1680::4/120
-                 */
-                inet_naddr(&addr->naddr, 10, 0, 2, 15, 24);
-                inet_naddr6(&addr6->naddr, 0xfd19, 0x1680, 0, 0, 0, 0, 0, 4, 120);
-        }
-        
+                addr->naddr.ipv4 = (10 << 24) + (0 << 16) + (2 << 8) + 15;
+        }
+        addr->naddr.bits = 24;
         addr->ilink = ilink;
-        addr6->ilink = ilink;
         addr->name = str_dup("v4a");
-        addr6->name = str_dup("v6a");
-        
         rc = inet_addrobj_add(addr);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding IPv4 address.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IP address on internet link.");
                 inet_addrobj_delete(addr);
                 /* XXX Roll back */
                 return rc;
         }
-        
-        rc = inet_addrobj_add(addr6);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding IPv6 address.");
-                inet_addrobj_delete(addr6);
-                /* XXX Roll back */
-                return rc;
-        }
-        
-        inet_naddr_addr(&addr->naddr, &iaddr);
+
+        iaddr.ipv4 = addr->naddr.ipv4;
         rc = iplink_addr_add(ilink->iplink, &iaddr);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IPv4 address on internet link.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IP address on internet link.");
                 inet_addrobj_remove(addr);
                 inet_addrobj_delete(addr);
@@ -258 +224 @@
                 return rc;
         }
-        
-        inet_naddr_addr(&addr6->naddr, &iaddr);
-        rc = iplink_addr_add(ilink->iplink, &iaddr);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IPv6 address on internet link.");
-                inet_addrobj_remove(addr6);
-                inet_addrobj_delete(addr6);
-                /* XXX Roll back */
-                return rc;
-        }
-        
+
         return EOK;
-        
+
 error:
         if (ilink->iplink != NULL)
                 iplink_close(ilink->iplink);
-        
         inet_link_delete(ilink);
         return rc;
@@ -302 +257 @@
     inet_addr_t *ldest, inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
 {
+        iplink_sdu_t sdu;
+        inet_packet_t packet;
+        int rc;
+        size_t offs, roffs;
+
         /*
          * Fill packet structure. Fragmentation is performed by
          * inet_pdu_encode().
          */
-        
-        inet_packet_t packet;
-        
         packet.src = dgram->src;
         packet.dest = dgram->dest;
@@ -317 +274 @@
         packet.data = dgram->data;
         packet.size = dgram->size;
-        
-        iplink_sdu_t sdu;
-        size_t offs = 0;
-        int rc;
-        
-        sdu.src = *lsrc;
-        sdu.dest = *ldest;
-        
+
+        sdu.lsrc.ipv4 = lsrc->ipv4;
+        sdu.ldest.ipv4 = ldest->ipv4;
+
+        offs = 0;
         do {
                 /* Encode one fragment */
-                size_t roffs;
                 rc = inet_pdu_encode(&packet, offs, ilink->def_mtu, &sdu.data,
                     &sdu.size, &roffs);
                 if (rc != EOK)
                         return rc;
-                
+
                 /* Send the PDU */
                 rc = iplink_send(ilink->iplink, &sdu);
                 free(sdu.data);
-                
+
                 offs = roffs;
         } while (offs < packet.size);
-        
+
         return rc;
 }