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

Timestamp:

2013-07-12T15:33:20Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bb9b0c6

Parents:

f5f79cd

Message:

iplink IPv6 datagram support
rudimentary IPv6 support (sans fragmentation)

File:

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

uspace/srv/net/inetsrv/inet_link.c

@@ -201 +201 @@
                 goto error;
         }
+        
+        /*
+         * Get the MAC address of the link. If the link has a MAC
+         * address, we assume that it supports NDP.
+         */
+        rc = iplink_get_mac48(ilink->iplink, &ilink->mac);
+        ilink->mac_valid = (rc == EOK);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name);
@@ -298 +305 @@
 }
 
-/** Send datagram over Internet link */
-int inet_link_send_dgram(inet_link_t *ilink, inet_addr_t *lsrc,
-    inet_addr_t *ldest, inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
-{
+/** Send IPv4 datagram over Internet link */
+int inet_link_send_dgram(inet_link_t *ilink, addr32_t lsrc, addr32_t ldest,
+    inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
+{
+        addr32_t src_v4;
+        uint16_t src_af = inet_addr_get(&dgram->src, &src_v4, NULL);
+        if (src_af != AF_INET)
+                return EINVAL;
+        
+        addr32_t dest_v4;
+        uint16_t dest_af = inet_addr_get(&dgram->dest, &dest_v4, NULL);
+        if (dest_af != AF_INET)
+                return EINVAL;
+        
         /*
          * Fill packet structure. Fragmentation is performed by
          * inet_pdu_encode().
          */
+        
+        iplink_sdu_t sdu;
+        
+        sdu.src = lsrc;
+        sdu.dest = ldest;
         
         inet_packet_t packet;
@@ -318 +340 @@
         packet.size = dgram->size;
         
-        iplink_sdu_t sdu;
         size_t offs = 0;
         int rc;
-        
-        sdu.src = *lsrc;
-        sdu.dest = *ldest;
         
         do {
                 /* Encode one fragment */
+                
                 size_t roffs;
-                rc = inet_pdu_encode(&packet, offs, ilink->def_mtu, &sdu.data,
-                    &sdu.size, &roffs);
+                rc = inet_pdu_encode(&packet, src_v4, dest_v4, offs, ilink->def_mtu,
+                    &sdu.data, &sdu.size, &roffs);
                 if (rc != EOK)
                         return rc;
@@ -335 +354 @@
                 /* Send the PDU */
                 rc = iplink_send(ilink->iplink, &sdu);
+                
                 free(sdu.data);
-                
+                offs = roffs;
+        } while (offs < packet.size);
+        
+        return rc;
+}
+
+/** Send IPv6 datagram over Internet link */
+int inet_link_send_dgram6(inet_link_t *ilink, addr48_t ldest,
+    inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
+{
+        addr128_t src_v6;
+        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &src_v6);
+        if (src_af != AF_INET6)
+                return EINVAL;
+        
+        addr128_t dest_v6;
+        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &dest_v6);
+        if (dest_af != AF_INET6)
+                return EINVAL;
+        
+        iplink_sdu6_t sdu6;
+        addr48(ldest, sdu6.dest);
+        
+        /*
+         * Fill packet structure. Fragmentation is performed by
+         * inet_pdu_encode6().
+         */
+        
+        inet_packet_t packet;
+        
+        packet.src = dgram->src;
+        packet.dest = dgram->dest;
+        packet.tos = dgram->tos;
+        packet.proto = proto;
+        packet.ttl = ttl;
+        packet.df = df;
+        packet.data = dgram->data;
+        packet.size = dgram->size;
+        
+        int rc;
+        size_t offs = 0;
+        
+        do {
+                /* Encode one fragment */
+                
+                size_t roffs;
+                rc = inet_pdu_encode6(&packet, src_v6, dest_v6, offs, ilink->def_mtu,
+                    &sdu6.data, &sdu6.size, &roffs);
+                if (rc != EOK)
+                        return rc;
+                
+                /* Send the PDU */
+                rc = iplink_send6(ilink->iplink, &sdu6);
+                
+                free(sdu6.data);
                 offs = roffs;
         } while (offs < packet.size);