Changeset 313824a in mainline

Timestamp:

2013-07-16T17:05:30Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1f97352

Parents:

fc4bf2a

Message:

all fragments of a packet need to have the same identifier (thx Antonin Steinhauser)

Location:

uspace/srv/net/inetsrv

Files:

• inet_link.c (modified) (3 diffs)
• inet_std.h (modified) (2 diffs)
• inetsrv.h (modified) (1 diff)
• pdu.c (modified) (5 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -52 +52 @@
 static bool first_link6 = true;
 
+static FIBRIL_MUTEX_INITIALIZE(ip_ident_lock);
+static uint16_t ip_ident = 0;
+
 static int inet_link_open(service_id_t);
 static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
@@ -366 +369 @@
         packet.proto = proto;
         packet.ttl = ttl;
+        
+        /* Allocate identifier */
+        fibril_mutex_lock(&ip_ident_lock);
+        packet.ident = ++ip_ident;
+        fibril_mutex_unlock(&ip_ident_lock);
+        
         packet.df = df;
         packet.data = dgram->data;
         packet.size = dgram->size;
         
+        int rc;
         size_t offs = 0;
-        int rc;
         
         do {
@@ -421 +430 @@
         packet.proto = proto;
         packet.ttl = ttl;
+        
+        /* Allocate identifier */
+        fibril_mutex_lock(&ip_ident_lock);
+        packet.ident = ++ip_ident;
+        fibril_mutex_unlock(&ip_ident_lock);
+        
         packet.df = df;
         packet.data = dgram->data;

uspace/srv/net/inetsrv/inet_std.h

@@ -48 +48 @@
         /** Total Length */
         uint16_t tot_len;
-        /** Identification */
+        /** Identifier */
         uint16_t id;
         /** Flags, Fragment Offset */
@@ -126 +126 @@
         /** Fragmentation offset, reserved and M flag */
         uint16_t offsmf;
-        /** Identification */
+        /** Identifier */
         uint32_t id;
 } ip6_header_fragment_t;

uspace/srv/net/inetsrv/inetsrv.h

@@ -113 +113 @@
         uint8_t ttl;
         /** Identifier */
-        uint16_t ident;
+        uint32_t ident;
         /** Do not fragment */
         bool df;

uspace/srv/net/inetsrv/pdu.c

@@ -49 +49 @@
 #include "pdu.h"
 
-static FIBRIL_MUTEX_INITIALIZE(ip_ident_lock);
-static uint16_t ip_ident = 0;
 
 /** One's complement addition.
@@ -107 +105 @@
  */
 int inet_pdu_encode(inet_packet_t *packet, addr32_t src, addr32_t dest,
-   size_t offs, size_t mtu, void **rdata, size_t *rsize, size_t *roffs)
+    size_t offs, size_t mtu, void **rdata, size_t *rsize, size_t *roffs)
 {
         /* Upper bound for fragment offset field */
@@ -152 +150 @@
                 return ENOMEM;
         
-        /* Allocate identifier */
-        fibril_mutex_lock(&ip_ident_lock);
-        uint16_t ident = ++ip_ident;
-        fibril_mutex_unlock(&ip_ident_lock);
-        
         /* Encode header fields */
         ip_header_t *hdr = (ip_header_t *) data;
@@ -164 +157 @@
         hdr->tos = packet->tos;
         hdr->tot_len = host2uint16_t_be(size);
-        hdr->id = host2uint16_t_be(ident);
+        hdr->id = host2uint16_t_be(packet->ident);
         hdr->flags_foff = host2uint16_t_be(flags_foff);
         hdr->ttl = packet->ttl;
@@ -259 +252 @@
                 return ENOMEM;
         
-#if 0
-        // FIXME TODO fragmentation
-        
-        /* Allocate identifier */
-        fibril_mutex_lock(&ip_ident_lock);
-        uint16_t ident = ++ip_ident;
-        fibril_mutex_unlock(&ip_ident_lock);
-#endif
-        
         /* Encode header fields */
         ip6_header_t *hdr6 = (ip6_header_t *) data;