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

Timestamp:

2012-02-12T22:40:15Z (12 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/inet_link.c (modified) (2 diffs)

uspace/srv/inet/inet_link.c

@@ -60 +60 @@
 static int inet_iplink_recv(iplink_t *iplink, iplink_sdu_t *sdu)
 {
-        inet_dgram_t dgram;
-        uint8_t ttl;
-        int df;
+        inet_packet_t packet;
         int rc;
 
         log_msg(LVL_DEBUG, "inet_iplink_recv()");
-        rc = inet_pdu_decode(sdu->data, sdu->size, &dgram, &ttl, &df);
-        if (rc != EOK)
+        rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
+        if (rc != EOK) {
+                log_msg(LVL_DEBUG, "failed decoding PDU");
                 return rc;
-
-        return inet_recv_packet(&dgram, ttl, df);
+        }
+
+        log_msg(LVL_DEBUG, "call inet_recv_packet()");
+        rc = inet_recv_packet(&packet);
+        log_msg(LVL_DEBUG, "call inet_recv_packet -> %d", rc);
+
+        return rc;
 }
 
@@ -216 +220 @@
 {
         iplink_sdu_t sdu;
-        int rc;
+        inet_packet_t packet;
+        int rc;
+
+        /* XXX Fragment packet */
+        packet.src = dgram->src;
+        packet.dest = dgram->dest;
+        packet.tos = dgram->tos;
+        packet.proto = 42;
+        packet.ttl = ttl;
+        packet.df = df;
+        packet.data = dgram->data;
+        packet.size = dgram->size;
 
         sdu.lsrc.ipv4 = lsrc->ipv4;
         sdu.ldest.ipv4 = ldest->ipv4;
-        rc = inet_pdu_encode(dgram, ttl, df, &sdu.data, &sdu.size);
+        rc = inet_pdu_encode(&packet, &sdu.data, &sdu.size);
         if (rc != EOK)
                 return rc;