Changeset 10056483 in mainline for uspace/srv

Timestamp:

2010-10-13T22:48:25Z (15 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.

Location:

uspace/srv/net

Files:

• il/arp/arp.c (modified) (2 diffs)
• il/ip/ip.c (modified) (2 diffs)
• tl/icmp/icmp.c (modified) (5 diffs)
• tl/icmp/icmp.h (modified) (2 diffs)
• tl/tcp/tcp.c (modified) (1 diff)
• tl/udp/udp.c (modified) (1 diff)

uspace/srv/net/il/arp/arp.c

@@ -227 +227 @@
         printf("Device %d cleared\n", device_id);
         fibril_rwlock_write_unlock(&arp_globals.lock);
-        return EOK;
-}
-
-int arp_connect_module(services_t service){
-        if(service != SERVICE_ARP){
-                return EINVAL;
-        }
         return EOK;
 }
@@ -603 +596 @@
         nil_send_msg(device->phone, device_id, packet, SERVICE_ARP);
         return NULL;
-}
-
-int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data){
-        measured_string_ref tmp;
-
-        fibril_rwlock_read_lock(&arp_globals.lock);
-        tmp = arp_translate_message(device_id, protocol, address);
-        if(tmp){
-                *translation = measured_string_copy(tmp);
-                fibril_rwlock_read_unlock(&arp_globals.lock);
-                if(*translation){
-                        *data = (** translation).value;
-                        return EOK;
-                }else{
-                        return ENOMEM;
-                }
-        }else{
-                fibril_rwlock_read_unlock(&arp_globals.lock);
-                return ENOENT;
-        }
 }
 

uspace/srv/net/il/ip/ip.c

@@ -58 +58 @@
 #include <net_device.h>
 #include <icmp_client.h>
-#include <icmp_codes.h>
+#include <net/icmp_codes.h>
 #include <icmp_interface.h>
 #include <il_interface.h>
@@ -618 +618 @@
         printf("%s: Device %d changed state to %d\n", NAME, device_id, state);
         fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
-        return EOK;
-}
-
-int ip_connect_module(services_t service){
         return EOK;
 }

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;

uspace/srv/net/tl/icmp/icmp.h

@@ -40 +40 @@
 #include <fibril_synch.h>
 
-#include <icmp_codes.h>
+#include <net/icmp_codes.h>
 #include <adt/int_map.h>
 #include <icmp_header.h>
@@ -67 +67 @@
 
 /** Echo specific data map.
- *  The bundle module gets an identifier of the assigned echo specific data while connecting.
  *  The identifier is used in the future semi-remote calls instead of the ICMP phone.
  */

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

@@ -260 +260 @@
             ICMP_CONNECT_TIMEOUT);
         tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
-            SERVICE_TCP, client_connection, tcp_received_msg);
+            SERVICE_TCP, client_connection);
         if (tcp_globals.ip_phone < 0)
                 return tcp_globals.ip_phone;

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

@@ -241 +241 @@
             ICMP_CONNECT_TIMEOUT);
         udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP,
-            SERVICE_UDP, client_connection, udp_received_msg);
+            SERVICE_UDP, client_connection);
         if (udp_globals.ip_phone < 0)
                 return udp_globals.ip_phone;