Changeset 1d24ad3 in mainline for uspace/srv/net/inetsrv

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

Location:

uspace/srv/net/inetsrv

Files:

• Makefile (modified) (1 diff)
• icmpv6.c (added)
• icmpv6.h (added)
• icmpv6_std.h (added)
• inet_link.c (modified) (3 diffs)
• inet_std.h (modified) (2 diffs)
• inetping6.c (added)
• inetping6.h (added)
• inetsrv.c (modified) (4 diffs)
• inetsrv.h (modified) (2 diffs)
• pdu.c (modified) (4 diffs)
• pdu.h (modified) (1 diff)

uspace/srv/net/inetsrv/Makefile

@@ -33 +33 @@
         addrobj.c \
         icmp.c \
+        icmpv6.c \
         inetsrv.c \
         inet_link.c \
         inetcfg.c \
         inetping.c \
+        inetping6.c \
         pdu.c \
         reass.c \

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;
         

uspace/srv/net/inetsrv/inet_std.h

@@ -40 +40 @@
 #include <sys/types.h>
 
-/** Internet Datagram header (fixed part) */
+/** IPv4 Datagram header (fixed part) */
 typedef struct {
         /** Version, Internet Header Length */
@@ -90 +90 @@
 };
 
+/** IPv6 Datagram header (fixed part) */
+typedef struct {
+        /** Version, Traffic class first 4 bits */
+        uint8_t ver_tc;
+        /** Traffic class (the rest), Flow label */
+        uint8_t tc_fl[3];
+        /* Payload length */
+        uint16_t payload_len;
+        /** Next header */
+        uint8_t next;
+        /** Hop limit */
+        uint8_t hop_limit;
+        /** Source address */
+        uint8_t src_addr[16];
+        /** Destination address */
+        uint8_t dest_addr[16];
+} ip6_header_t;
+
+/** IPv6 Datagram Fragment extension header */
+typedef struct {
+        /** Next header */
+        uint8_t next;
+        /** Reserved */
+        uint8_t reserved;
+        /** Fragment Offset, Flags */
+        uint16_t foff_flags;
+        /** Identification */
+        uint32_t id;
+} ip6_header_fragment_t;
+
 /** Fragment offset is expressed in units of 8 bytes */
 #define FRAG_OFFS_UNIT 8

uspace/srv/net/inetsrv/inetsrv.c

@@ -50 +50 @@
 #include "icmp.h"
 #include "icmp_std.h"
+#include "icmpv6.h"
+#include "icmpv6_std.h"
 #include "inetsrv.h"
 #include "inetcfg.h"
 #include "inetping.h"
+#include "inetping6.h"
 #include "inet_link.h"
 #include "reass.h"
@@ -93 +96 @@
         rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid,
             INET_PORT_PING);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                return EEXIST;
+        }
+        
+        rc = loc_service_register_with_iface(SERVICE_NAME_INETPING6, &sid,
+            INET_PORT_PING6);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
@@ -350 +360 @@
                 inetping_conn(iid, icall, arg);
                 break;
+        case INET_PORT_PING6:
+                inetping6_conn(iid, icall, arg);
+                break;
         default:
                 async_answer_0(iid, ENOTSUP);
@@ -416 +429 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_recv_dgram_local()");
 
-        /* ICMP messages are handled internally */
+        /* ICMP and ICMPv6 messages are handled internally */
         if (proto == IP_PROTO_ICMP)
                 return icmp_recv(dgram);
+        
+        if (proto == IP_PROTO_ICMPV6)
+                return icmpv6_recv(dgram);
 
         client = inet_client_find(proto);

uspace/srv/net/inetsrv/inetsrv.h

@@ -63 +63 @@
 } inetping_client_t;
 
+/** Inetping6 Client */
+typedef struct {
+        /** Callback session */
+        async_sess_t *sess;
+        /** Session identifier */
+        uint16_t ident;
+        /** Link to client list */
+        link_t client_list;
+} inetping6_client_t;
+
 /** Address object info */
 typedef struct {
@@ -179 +189 @@
 } inetping_sdu_t;
 
+typedef struct {
+        addr128_t src;
+        addr128_t dest;
+        uint16_t seq_no;
+        void *data;
+        size_t size;
+} inetping6_sdu_t;
+
 extern int inet_ev_recv(inet_client_t *, inet_dgram_t *);
 extern int inet_recv_packet(inet_packet_t *);

uspace/srv/net/inetsrv/pdu.c

@@ -131 +131 @@
                 break;
         case AF_INET6:
-                // FIXME TODO
-                assert(false);
+                hdr_size = sizeof(ip6_header_t);
+                break;
         default:
                 assert(false);
@@ -178 +178 @@
         /* Encode header fields */
         ip_header_t *hdr;
+        ip6_header_t *hdr6;
         
         switch (src_af) {
@@ -202 +203 @@
                 break;
         case AF_INET6:
-                // FIXME TODO
-                return ENOTSUP;
+                // TODO FIXME: fragmentation
+                
+                hdr6 = (ip6_header_t *) data;
+                
+                hdr6->ver_tc = (6 << (VI_VERSION_l));
+                memset(hdr6->tc_fl, 0, 3);
+                hdr6->payload_len = host2uint16_t_be(packet->size);
+                hdr6->next = packet->proto;
+                hdr6->hop_limit = packet->ttl;
+                
+                host2addr128_t_be(src_v6, hdr6->src_addr);
+                host2addr128_t_be(dest_v6, hdr6->dest_addr);
+                
+                break;
         default:
                 assert(false);
@@ -281 +294 @@
 }
 
+int inet_pdu_decode6(void *data, size_t size, inet_packet_t *packet)
+{
+        // FIXME TODO
+        return ENOTSUP;
+}
+
 /** @}
  */

uspace/srv/net/inetsrv/pdu.h

@@ -48 +48 @@
     size_t *, size_t *);
 extern int inet_pdu_decode(void *, size_t, inet_packet_t *);
+extern int inet_pdu_decode6(void *, size_t, inet_packet_t *);
 
 #endif