Changeset 60ab6c3 in mainline for uspace/srv/net/tl

Timestamp:

2010-03-10T05:46:54Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5782081

Parents:

71b00dcc (diff), b48ebd19 (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 from lp:~lukasmejdrech/helenos/network.

Location:

uspace/srv/net/tl

Files:

• icmp/icmp.c (modified) (1 diff)
• icmp/icmp_client.c (modified) (2 diffs)
• tcp/tcp.c (modified) (2 diffs)
• udp/udp.c (modified) (1 diff)

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

@@ -41 +41 @@
 #include <fibril_synch.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <ipc/ipc.h>

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

@@ -37 +37 @@
 
 #include <errno.h>
-//#include <stdio.h>
+
+#ifdef CONFIG_DEBUG
+        #include <stdio.h>
+#endif
 
 #include <sys/types.h>
@@ -70 +73 @@
         }
         // remove debug dump
-//      printf("ICMP error %d (%d) in packet %d\n", header->type, header->code, packet_get_id(packet));
+#ifdef CONFIG_DEBUG
+        printf("ICMP error %d (%d) in packet %d\n", header->type, header->code, packet_get_id(packet));
+#endif
         return sizeof(icmp_header_t);
 }

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

@@ -1241 +1241 @@
         }
 
+        // release the application phone
+        ipc_hangup(app_phone);
+
         printf("release\n");
         // release all local sockets
@@ -1277 +1280 @@
                                         // TODO release as connection lost
                                         //tcp_refresh_socket_data(socket_data);
+                                        fibril_rwlock_write_unlock(socket_data->local_lock);
                                 }else{
                                         // retransmit
-                                        tcp_retransmit_packet(socket, socket_data, timeout->sequence_number);
-                                }
-                                fibril_rwlock_write_unlock(socket_data->local_lock);
+//                                      tcp_retransmit_packet(socket, socket_data, timeout->sequence_number);
+                                        fibril_rwlock_write_unlock(socket_data->local_lock);
+                                }
                         }else{
                                 fibril_mutex_lock(&socket_data->operation.mutex);

uspace/srv/net/tl/udp/udp.c

@@ -508 +508 @@
         }
 
+        // release the application phone
+        ipc_hangup(app_phone);
+
         // release all local sockets
         socket_cores_release(udp_globals.net_phone, &local_sockets, &udp_globals.sockets, NULL);