Changeset 10056483 in mainline for uspace/srv/net/tl/icmp/icmp.c

Timestamp:

2010-10-13T22:48:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef689ef0

Parents:

b278b4e (diff), 753bca3 (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:~jakub/helenos/net.

File:

• uspace/srv/net/tl/icmp/icmp.c (modified) (5 diffs)

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

@@ -44 +44 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/icmp.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -59 +60 @@
 #include <packet_remote.h>
 #include <net_checksum.h>
-#include <icmp_api.h>
+#include <net/icmp_api.h>
 #include <icmp_client.h>
-#include <icmp_codes.h>
-#include <icmp_common.h>
+#include <net/icmp_codes.h>
+#include <net/icmp_common.h>
 #include <icmp_interface.h>
 #include <il_interface.h>
@@ -71 +72 @@
 #include <tl_interface.h>
 #include <tl_local.h>
-#include <icmp_messages.h>
 #include <icmp_header.h>
 
@@ -449 +449 @@
 }
 
-int icmp_connect_module(services_t service, suseconds_t timeout){
-        icmp_echo_ref echo_data;
-        icmp_param_t id;
-        int index;
-
-        echo_data = (icmp_echo_ref) malloc(sizeof(*echo_data));
-        if(! echo_data){
-                return ENOMEM;
-        }
-        // assign a new identifier
-        fibril_rwlock_write_lock(&icmp_globals.lock);
-        index = icmp_bind_free_id(echo_data);
-        if(index < 0){
-                free(echo_data);
-                fibril_rwlock_write_unlock(&icmp_globals.lock);
-                return index;
-        }else{
-                id = echo_data->identifier;
-                fibril_rwlock_write_unlock(&icmp_globals.lock);
-                // return the echo data identifier as the ICMP phone
-                return id;
-        }
-}
-
 int icmp_initialize(async_client_conn_t client_connection){
         ERROR_DECLARE;
@@ -485 +461 @@
         icmp_replies_initialize(&icmp_globals.replies);
         icmp_echo_data_initialize(&icmp_globals.echo_data);
-        icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP, client_connection, icmp_received_msg);
+        icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP, client_connection);
         if(icmp_globals.ip_phone < 0){
                 return icmp_globals.ip_phone;