Changeset 7f95c904 in mainline for uspace/srv/inet/inet.c

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.

File:

• uspace/srv/inet/inet.c (modified) (3 diffs)

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);
+                }
         }