Changeset fe4310f in mainline for uspace/srv/inet/pdu.c

Timestamp:

2012-02-12T22:40:15Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2ff150e

Parents:

bd8bfc5a

Message:

Distinguish between datagram and packet. Deliver received datagrams to
clients based on protocol number.

File:

• uspace/srv/inet/pdu.c (modified) (6 diffs)

uspace/srv/inet/pdu.c

@@ -48 +48 @@
 
 /** Encode Internet PDU.
- *
- * XXX We should be encoding from packet, not from datagram.
  */
-int inet_pdu_encode(inet_dgram_t *dgram, uint8_t ttl, int df, void **rdata,
-    size_t *rsize)
+int inet_pdu_encode(inet_packet_t *packet, void **rdata, size_t *rsize)
 {
         void *data;
@@ -61 +58 @@
 
         hdr_size = sizeof(ip_header_t);
-        size = hdr_size + dgram->size;
+        size = hdr_size + packet->size;
         data_offs = ROUND_UP(hdr_size, 4);
 
@@ -70 +67 @@
         hdr = (ip_header_t *)data;
         hdr->ver_ihl = (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t));
-        hdr->tos = dgram->tos;
+        hdr->tos = packet->tos;
         hdr->tot_len = host2uint16_t_be(size);
         hdr->id = host2uint16_t_be(42);
-        hdr->flags_foff = host2uint16_t_be(df ? BIT_V(uint16_t, FF_FLAG_DF) : 0);
-        hdr->ttl = ttl;
+        hdr->flags_foff = host2uint16_t_be(packet->df ?
+            BIT_V(uint16_t, FF_FLAG_DF) : 0);
+        hdr->ttl = packet->ttl;
         hdr->proto = 0;
         hdr->chksum = 0;
-        hdr->src_addr = host2uint32_t_be(dgram->src.ipv4);
-        hdr->dest_addr = host2uint32_t_be(dgram->dest.ipv4);
+        hdr->src_addr = host2uint32_t_be(packet->src.ipv4);
+        hdr->dest_addr = host2uint32_t_be(packet->dest.ipv4);
 
-        memcpy((uint8_t *)data + data_offs, dgram->data, dgram->size);
+        memcpy((uint8_t *)data + data_offs, packet->data, packet->size);
 
         *rdata = data;
@@ -87 +85 @@
 }
 
-int inet_pdu_decode(void *data, size_t size, inet_dgram_t *dgram, uint8_t *ttl,
-    int *df)
+int inet_pdu_decode(void *data, size_t size, inet_packet_t *packet)
 {
         ip_header_t *hdr;
@@ -131 +128 @@
         /* XXX Checksum */
 
-        dgram->src.ipv4 = uint32_t_be2host(hdr->src_addr);
-        dgram->dest.ipv4 = uint32_t_be2host(hdr->dest_addr);
-        dgram->tos = hdr->tos;
-        *ttl = hdr->ttl;
-        *df = (uint16_t_be2host(hdr->tos) & BIT_V(uint16_t, FF_FLAG_DF)) ?
-            1 : 0;
+        packet->src.ipv4 = uint32_t_be2host(hdr->src_addr);
+        packet->dest.ipv4 = uint32_t_be2host(hdr->dest_addr);
+        packet->tos = hdr->tos;
+        packet->ttl = hdr->ttl;
+        packet->df = (uint16_t_be2host(hdr->tos) & BIT_V(uint16_t, FF_FLAG_DF))
+            ? 1 : 0;
 
         /* XXX IP options */
@@ -142 +139 @@
             VI_IHL_l, hdr->ver_ihl);
 
-        dgram->size = tot_len - data_offs;
-        dgram->data = calloc(dgram->size, 1);
-        if (dgram->data == NULL) {
+        packet->size = tot_len - data_offs;
+        packet->data = calloc(packet->size, 1);
+        if (packet->data == NULL) {
                 log_msg(LVL_WARN, "Out of memory.");
                 return ENOMEM;
         }
 
-        memcpy(dgram->data, (uint8_t *)data + data_offs, dgram->size);
+        memcpy(packet->data, (uint8_t *)data + data_offs, packet->size);
 
         return EOK;