Changeset 7f95c904 in mainline

Timestamp:

2012-04-16T07:04:19Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7fda2e0

Parents:

347768d

Message:

Prototype datagram reassembly.

Location:

uspace/srv/inet

Files:

• Makefile (modified) (1 diff)
• inet.c (modified) (3 diffs)
• inet.h (modified) (3 diffs)
• inet_link.c (modified) (1 diff)
• pdu.c (modified) (3 diffs)
• reass.c (added)
• reass.h (added)

uspace/srv/inet/Makefile

@@ -39 +39 @@
         inetping.c \
         pdu.c \
+        reass.c \
         sroute.c
 

uspace/srv/inet/inet.c

@@ -54 +54 @@
 #include "inetping.h"
 #include "inet_link.h"
+#include "reass.h"
 #include "sroute.h"
 
@@ -375 +376 @@
 }
 
-static int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
+int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
 {
         inet_client_t *client;
@@ -404 +405 @@
                 /* Destined for one of the local addresses */
 
-                /* XXX Reassemble packets */
-                dgram.src = packet->src;
-                dgram.dest = packet->dest;
-                dgram.tos = packet->tos;
-                dgram.data = packet->data;
-                dgram.size = packet->size;
-
-                return inet_recv_dgram_local(&dgram, packet->proto);
+                /* Check if packet is a complete datagram */
+                if (packet->offs == 0 && !packet->mf) {
+                        /* It is complete deliver it immediately */
+                        dgram.src = packet->src;
+                        dgram.dest = packet->dest;
+                        dgram.tos = packet->tos;
+                        dgram.data = packet->data;
+                        dgram.size = packet->size;
+
+                        return inet_recv_dgram_local(&dgram, packet->proto);
+                } else {
+                        /* It is a fragment, queue it for reassembly */
+                        inet_reass_queue_packet(packet);
+                }
         }
 

uspace/srv/inet/inet.h

@@ -39 +39 @@
 
 #include <adt/list.h>
+#include <bool.h>
 #include <inet/iplink.h>
 #include <ipc/loc.h>
@@ -103 +104 @@
 
 typedef struct {
+        /** Source address */
         inet_addr_t src;
+        /** Destination address */
         inet_addr_t dest;
+        /** Type of service */
         uint8_t tos;
+        /** Protocol */
         uint8_t proto;
+        /** Time to live */
         uint8_t ttl;
-        int df;
+        /** Identifier */
+        uint16_t ident;
+        /** Do not fragment */
+        bool df;
+        /** More fragments */
+        bool mf;
+        /** Offset of fragment into datagram, in bytes */
+        size_t offs;
+        /** Packet data */
         void *data;
+        /** Packet data size in bytes */
         size_t size;
 } inet_packet_t;
@@ -180 +195 @@
 extern int inet_route_packet(inet_dgram_t *, uint8_t, uint8_t, int);
 extern int inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *);
-
+extern int inet_recv_dgram_local(inet_dgram_t *, uint8_t);
 
 #endif

uspace/srv/inet/inet_link.c

@@ -74 +74 @@
         rc = inet_recv_packet(&packet);
         log_msg(LVL_DEBUG, "call inet_recv_packet -> %d", rc);
+        free(packet.data);
 
         return rc;

uspace/srv/inet/pdu.c

@@ -201 +201 @@
         uint8_t version;
         uint16_t ident;
+        uint16_t flags_foff;
+        uint16_t foff;
 
         log_msg(LVL_DEBUG, "inet_pdu_decode()");
@@ -231 +233 @@
 
         ident = uint16_t_be2host(hdr->id);
-        (void)ident;
-        /* XXX Flags */
-        /* XXX Fragment offset */
+        flags_foff = uint16_t_be2host(hdr->flags_foff);
+        foff = BIT_RANGE_EXTRACT(uint16_t, FF_FRAGOFF_h, FF_FRAGOFF_l,
+            flags_foff);
         /* XXX Checksum */
 
@@ -241 +243 @@
         packet->proto = hdr->proto;
         packet->ttl = hdr->ttl;
-        packet->df = (uint16_t_be2host(hdr->tos) & BIT_V(uint16_t, FF_FLAG_DF))
-            ? 1 : 0;
+        packet->ident = ident;
+
+        packet->df = (flags_foff & BIT_V(uint16_t, FF_FLAG_DF)) != 0;
+        packet->mf = (flags_foff & BIT_V(uint16_t, FF_FLAG_MF)) != 0;
+        packet->offs = foff * FRAG_OFFS_UNIT;
 
         /* XXX IP options */