Changeset 49bd793b in mainline

Timestamp:

2011-10-07T21:42:14Z (13 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

Files:

• lib/c/generic/net/packet.c (modified) (4 diffs)
• lib/c/include/net/packet.h (modified) (2 diffs)
• lib/net/generic/packet_remote.c (modified) (2 diffs)
• lib/nic/src/nic_driver.c (modified) (2 diffs)
• srv/net/nil/nildummy/nildummy.c (modified) (1 diff)
• srv/net/tl/icmp/icmp.c (modified) (1 diff)
• srv/net/tl/tcp/tcp.c (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. */

uspace/lib/net/generic/packet_remote.c

@@ -115 +115 @@
         
         *packet = pm_find(packet_id);
-        if (!*packet) {
+        if (*packet == NULL) {
                 async_exch_t *exch = async_exchange_begin(sess);
                 sysarg_t size;
@@ -130 +130 @@
         }
         
-        if ((*packet)->next) {
+        if ((*packet != NULL) && ((*packet)->next)) {
                 packet_t *next;
                 return packet_translate_remote(sess, &next, (*packet)->next);

uspace/lib/nic/src/nic_driver.c

@@ -671 +671 @@
                 }
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
-                nil_received_msg(nic_data->nil_session, pid, nic_data->device_id);
+                nil_received_msg(nic_data->nil_session, nic_data->device_id, pid);
         } else {
                 switch (frame_type) {
@@ -703 +703 @@
         nic_data->stats.receive_bytes += packet_get_data_length(packet);
         fibril_rwlock_write_unlock(&nic_data->stats_lock);
-
-        nil_received_msg(nic_data->nil_session, packet_get_id(packet),
-                nic_data->device_id);
+        
+        nil_received_msg(nic_data->nil_session, nic_data->device_id,
+            packet_get_id(packet));
 }
 

uspace/srv/net/nil/nildummy/nildummy.c

@@ -136 +136 @@
                         device->mtu = NET_DEFAULT_MTU;
                 
-                printf("Device %d already exists:\tMTU\t= %zu\n", device->device_id,
+                printf("Device %d already exists (mtu: %zu)\n", device->device_id,
                     device->mtu);
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);

uspace/srv/net/tl/icmp/icmp.c

@@ -753 +753 @@
                         return rc;
                 
-                rc = icmp_echo(icmp_id, icmp_seq, ICMP_GET_SIZE(*call), 
+                rc = icmp_echo(icmp_id, icmp_seq, ICMP_GET_SIZE(*call),
                     ICMP_GET_TIMEOUT(*call), ICMP_GET_TTL(*call),
                     ICMP_GET_TOS(*call), ICMP_GET_DONT_FRAGMENT(*call),

uspace/srv/net/tl/tcp/tcp.c

@@ -1651 +1651 @@
         /* Sent packet? */
         packet = pq_find(socket_data->outgoing, sequence_number);
-        printf("retransmit %lu\n", packet_get_id(packet));
         if (packet) {
                 pq_get_order(packet, NULL, &data_length);
@@ -1790 +1789 @@
 
                         /* Send the packet */
-                        printf("connecting %lu\n", packet_get_id(packet));
                         tcp_send_packets(socket_data->device_id, packet);