Changeset 02a09ed in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (5 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 sid);
-static int inet_iplink_recv(iplink_t *ilink, iplink_sdu_t *sdu);
+static int inet_link_open(service_id_t);
+static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
 
 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_sdu_t *sdu)
-{
+static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, uint16_t af)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
+        
+        int rc;
         inet_packet_t packet;
-        int rc;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
-        rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
+        
+        switch (af) {
+        case AF_INET:
+                rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
+                break;
+        case AF_INET6:
+                // FIXME TODO
+                return ENOTSUP;
+        default:
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid address family");
+                return EINVAL;
+        }
+        
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "failed decoding PDU");
@@ -228 +240 @@
 
         return EOK;
-
+        
 error:
         if (ilink->iplink != NULL)
@@ -277 +289 @@
         
         iplink_sdu_t sdu;
-        
-        int rc = inet_addr_pack(lsrc, &sdu.lsrc);
-        if (rc != EOK)
-                return rc;
-        
-        rc = inet_addr_pack(ldest, &sdu.ldest);
-        if (rc != EOK)
-                return rc;
-        
         size_t offs = 0;
+        int rc;
+        
+        sdu.src = *lsrc;
+        sdu.dest = *ldest;
+        
         do {
+                /* Encode one fragment */
                 size_t roffs;
-                
-                /* Encode one fragment */
                 rc = inet_pdu_encode(&packet, offs, ilink->def_mtu, &sdu.data,
                     &sdu.size, &roffs);