Changeset a2e3ee6 in mainline for uspace/srv/net/inetsrv/pdu.c

Timestamp:

2013-06-20T16:45:58Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

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

uspace/srv/net/inetsrv/pdu.c

@@ -106 +106 @@
     void **rdata, size_t *rsize, size_t *roffs)
 {
-        void *data;
-        size_t size;
-        ip_header_t *hdr;
-        size_t hdr_size;
-        size_t data_offs;
-        uint16_t chksum;
-        uint16_t ident;
-        uint16_t flags_foff;
-        uint16_t foff;
-        size_t fragoff_limit;
-        size_t xfer_size;
-        size_t spc_avail;
-        size_t rem_offs;
-
+        uint32_t src_addr;
+        int rc = inet_addr_pack(&packet->src, &src_addr);
+        if (rc != EOK)
+                return rc;
+        
+        uint32_t dest_addr;
+        rc = inet_addr_pack(&packet->dest, &dest_addr);
+        if (rc != EOK)
+                return rc;
+        
         /* Upper bound for fragment offset field */
-        fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l);
-
+        size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l);
+        
         /* Verify that total size of datagram is within reasonable bounds */
         if (offs + packet->size > FRAG_OFFS_UNIT * fragoff_limit)
                 return ELIMIT;
-
-        hdr_size = sizeof(ip_header_t);
-        data_offs = ROUND_UP(hdr_size, 4);
-
+        
+        size_t hdr_size = sizeof(ip_header_t);
+        size_t data_offs = ROUND_UP(hdr_size, 4);
+        
         assert(offs % FRAG_OFFS_UNIT == 0);
         assert(offs / FRAG_OFFS_UNIT < fragoff_limit);
-
+        
         /* Value for the fragment offset field */
-        foff = offs / FRAG_OFFS_UNIT;
-
+        uint16_t foff = offs / FRAG_OFFS_UNIT;
+        
         if (hdr_size >= mtu)
                 return EINVAL;
-
+        
         /* Amount of space in the PDU available for payload */
-        spc_avail = mtu - hdr_size;
+        size_t spc_avail = mtu - hdr_size;
         spc_avail -= (spc_avail % FRAG_OFFS_UNIT);
-
+        
         /* Amount of data (payload) to transfer */
-        xfer_size = min(packet->size - offs, spc_avail);
-
+        size_t xfer_size = min(packet->size - offs, spc_avail);
+        
         /* Total PDU size */
-        size = hdr_size + xfer_size;
-
+        size_t size = hdr_size + xfer_size;
+        
         /* Offset of remaining payload */
-        rem_offs = offs + xfer_size;
-
+        size_t rem_offs = offs + xfer_size;
+        
         /* Flags */
-        flags_foff =
+        uint16_t flags_foff =
             (packet->df ? BIT_V(uint16_t, FF_FLAG_DF) : 0) +
             (rem_offs < packet->size ? BIT_V(uint16_t, FF_FLAG_MF) : 0) +
             (foff << FF_FRAGOFF_l);
-
-        data = calloc(size, 1);
+        
+        void *data = calloc(size, 1);
         if (data == NULL)
                 return ENOMEM;
-
+        
         /* Allocate identifier */
         fibril_mutex_lock(&ip_ident_lock);
-        ident = ++ip_ident;
+        uint16_t ident = ++ip_ident;
         fibril_mutex_unlock(&ip_ident_lock);
-
+        
         /* Encode header fields */
-        hdr = (ip_header_t *)data;
+        ip_header_t *hdr = (ip_header_t *) data;
+        
         hdr->ver_ihl = (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t));
         hdr->tos = packet->tos;
@@ -177 +174 @@
         hdr->proto = packet->proto;
         hdr->chksum = 0;
-        hdr->src_addr = host2uint32_t_be(packet->src.ipv4);
-        hdr->dest_addr = host2uint32_t_be(packet->dest.ipv4);
-
+        hdr->src_addr = host2uint32_t_be(src_addr);
+        hdr->dest_addr = host2uint32_t_be(dest_addr);
+        
         /* Compute checksum */
-        chksum = inet_checksum_calc(INET_CHECKSUM_INIT, (void *)hdr, hdr_size);
+        uint16_t chksum = inet_checksum_calc(INET_CHECKSUM_INIT, (void *) hdr,
+            hdr_size);
         hdr->chksum = host2uint16_t_be(chksum);
-
+        
         /* Copy payload */
-        memcpy((uint8_t *)data + data_offs, packet->data + offs, xfer_size);
-
+        memcpy((uint8_t *) data + data_offs, packet->data + offs, xfer_size);
+        
         *rdata = data;
         *rsize = size;
         *roffs = rem_offs;
-
+        
         return EOK;
 }
@@ -238 +236 @@
         /* XXX Checksum */
 
-        packet->src.ipv4 = uint32_t_be2host(hdr->src_addr);
-        packet->dest.ipv4 = uint32_t_be2host(hdr->dest_addr);
+        inet_addr_unpack(uint32_t_be2host(hdr->src_addr), &packet->src);
+        inet_addr_unpack(uint32_t_be2host(hdr->dest_addr), &packet->dest);
         packet->tos = hdr->tos;
         packet->proto = hdr->proto;