Changes in uspace/srv/net/inetsrv/inet_link.c [a2e3ee6:3e6a98c5] in mainline

File:

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

uspace/srv/net/inetsrv/inet_link.c

@@ -153 +153 @@
 {
         inet_link_t *ilink;
-        inet_addr_t iaddr;
+        iplink_addr_t iaddr;
         int rc;
 
@@ -196 +196 @@
 
         static int first = 1;
-        
+        /* XXX For testing: set static IP address 192.168.0.4/24 */
         addr = inet_addrobj_new();
-        
         if (first) {
-                inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
+                addr->naddr.ipv4 = (127 << 24) + (0 << 16) + (0 << 8) + 1;
                 first = 0;
         } else {
-                /* XXX For testing: set static IP address 10.0.2.15/24 */
-                inet_naddr(&addr->naddr, 10, 0, 2, 15, 24);
-        }
-        
+                addr->naddr.ipv4 = (192 << 24) + (168 << 16) + (0 << 8) + 4;
+        }
+        addr->naddr.bits = 24;
         addr->ilink = ilink;
         addr->name = str_dup("v4a");
@@ -217 +215 @@
         }
 
-        inet_naddr_addr(&addr->naddr, &iaddr);
+        iaddr.ipv4 = addr->naddr.ipv4;
         rc = iplink_addr_add(ilink->iplink, &iaddr);
         if (rc != EOK) {
@@ -259 +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;
@@ -273 +274 @@
         packet.data = dgram->data;
         packet.size = dgram->size;
-        
-        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;
+
+        sdu.lsrc.ipv4 = lsrc->ipv4;
+        sdu.ldest.ipv4 = ldest->ipv4;
+
+        offs = 0;
         do {
-                size_t roffs;
-                
                 /* Encode one fragment */
                 rc = inet_pdu_encode(&packet, offs, ilink->def_mtu, &sdu.data,
@@ -293 +285 @@
                 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;
 }