Changeset 1d24ad3 in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2013-07-03T14:20:04Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d8b47eca

Parents:

02a09ed

Message:

more IPv6 stub code

File:

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

uspace/srv/net/inetsrv/inet_link.c

@@ -71 +71 @@
                 break;
         case AF_INET6:
-                // FIXME TODO
-                return ENOTSUP;
+                rc = inet_pdu_decode6(sdu->data, sdu->size, &packet);
+                break;
         default:
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid address family");
@@ -206 +206 @@
 
         inet_addrobj_t *addr;
+        inet_addrobj_t *addr6;
 
         static int first = 1;
         
         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);
                 first = 0;
         } else {
-                /* XXX For testing: set static IP address 10.0.2.15/24 */
+                /*
+                 * 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->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 setting IP address on internet link.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding IPv4 address.");
                 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);
         rc = iplink_addr_add(ilink->iplink, &iaddr);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IP address on internet link.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IPv4 address on internet link.");
                 inet_addrobj_remove(addr);
                 inet_addrobj_delete(addr);
@@ -238 +258 @@
                 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;