Changeset 330df83 in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2013-07-19T20:42:57Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

f4cbf9dd

Parents:

8a8a08d1 (diff), cd18cd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline changes.

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (5 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -51 +51 @@
 static bool first_link = true;
 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);
@@ -335 +338 @@
 }
 
-/** Send IPv4 datagram over Internet link */
+/** Send IPv4 datagram over Internet link
+ *
+ * @param ilink Internet link
+ * @param lsrc  Source IPv4 address
+ * @param ldest Destination IPv4 address
+ * @param dgram IPv4 datagram body
+ * @param proto Protocol
+ * @param ttl   Time-to-live
+ * @param df    Do-not-Fragment flag
+ *
+ * @return EOK on success
+ * @return ENOMEM when not enough memory to create the datagram
+ * @return ENOTSUP if networking mode is not supported
+ *
+ */
 int inet_link_send_dgram(inet_link_t *ilink, addr32_t lsrc, addr32_t ldest,
     inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
@@ -366 +383 @@
         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 {
@@ -392 +415 @@
 }
 
-/** Send IPv6 datagram over Internet link */
+/** Send IPv6 datagram over Internet link
+ *
+ * @param ilink Internet link
+ * @param ldest Destination MAC address
+ * @param dgram IPv6 datagram body
+ * @param proto Next header
+ * @param ttl   Hop limit
+ * @param df    Do-not-Fragment flag (unused)
+ *
+ * @return EOK on success
+ * @return ENOMEM when not enough memory to create the datagram
+ *
+ */
 int inet_link_send_dgram6(inet_link_t *ilink, addr48_t ldest,
     inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
@@ -421 +456 @@
         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;