Changeset 49bd793b in mainline for uspace/lib/c

Timestamp:

2011-10-07T21:42:14Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

80099c19

Parents:

00d7e1b

Message:

networking fixes

• use sysarg_t for packet_id_t to avoid potential overflow
• fix the confusion in the order of arguments for nil_received_msg(), this fixes the strange ping timeout on 127.0.0.1

Location:

uspace/lib/c

Files:

• generic/net/packet.c (modified) (4 diffs)
• include/net/packet.h (modified) (2 diffs)

uspace/lib/c/generic/net/packet.c

@@ -139 +139 @@
 packet_t *pm_find(packet_id_t packet_id)
 {
-        packet_t *packet;
         if (!packet_id)
                 return NULL;
-
+        
         fibril_rwlock_read_lock(&pm_globals.lock);
-        link_t *link =
-            hash_table_find(&pm_globals.packet_map, &packet_id);
+        
+        unsigned long key = packet_id;
+        link_t *link = hash_table_find(&pm_globals.packet_map, &key);
+        
+        packet_t *packet;
         if (link != NULL) {
                 pm_entry_t *entry =
@@ -172 +174 @@
         
         fibril_rwlock_write_lock(&pm_globals.lock);
-        pm_entry_t *entry = malloc(sizeof (pm_entry_t));
+        
+        pm_entry_t *entry = malloc(sizeof(pm_entry_t));
         if (entry == NULL) {
                 fibril_rwlock_write_unlock(&pm_globals.lock);
@@ -179 +182 @@
         
         entry->packet = packet;
-        hash_table_insert(&pm_globals.packet_map, &packet->packet_id,
-            &entry->link);
+        
+        unsigned long key = packet->packet_id;
+        hash_table_insert(&pm_globals.packet_map, &key, &entry->link);
+        
         fibril_rwlock_write_unlock(&pm_globals.lock);
+        
         return EOK;
 }
@@ -195 +201 @@
         
         fibril_rwlock_write_lock(&pm_globals.lock);
-        hash_table_remove(&pm_globals.packet_map, &packet->packet_id, 1);
+        
+        unsigned long key = packet->packet_id;
+        hash_table_remove(&pm_globals.packet_map, &key, 1);
+        
         fibril_rwlock_write_unlock(&pm_globals.lock);
 }

uspace/lib/c/include/net/packet.h

@@ -38 +38 @@
 #define LIBC_PACKET_H_
 
+#include <sys/types.h>
+
 /** Packet identifier type.
  * Value zero is used as an invalid identifier.
  */
-typedef unsigned long packet_id_t;
+typedef sysarg_t packet_id_t;
 
 /** Type definition of the packet.
@@ -51 +53 @@
  * @see packet_dimension
  */
-typedef struct packet_dimension packet_dimension_t;
+typedef struct packet_dimension packet_dimension_t;
 
 /** Packet dimension. */