Changeset e4f8c77 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

• uspace/srv/net/il/ip/ip.c (modified) (48 diffs)

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

@@ -77 +77 @@
 #include <il_skel.h>
 
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
 /** IP module name. */
 #define NAME                    "ip"
@@ -123 +120 @@
 GENERIC_FIELD_IMPLEMENT(ip_routes, ip_route_t);
 
-static void ip_receiver(ipc_callid_t, ipc_call_t *);
-
-/** Releases the packet and returns the result.
- *
- * @param[in] packet    The packet queue to be released.
- * @param[in] result    The result to be returned.
- * @return              The result parameter.
+static void ip_receiver(ipc_callid_t, ipc_call_t *, void *);
+
+/** Release the packet and returns the result.
+ *
+ * @param[in] packet Packet queue to be released.
+ * @param[in] result Result to be returned.
+ *
+ * @return Result parameter.
+ *
  */
 static int ip_release_and_return(packet_t *packet, int result)
 {
-        pq_release_remote(ip_globals.net_phone, packet_get_id(packet));
+        pq_release_remote(ip_globals.net_sess, packet_get_id(packet));
         return result;
 }
 
-/** Returns the ICMP phone.
- *
- * Searches the registered protocols.
- *
- * @return              The found ICMP phone.
- * @return              ENOENT if the ICMP is not registered.
- */
-static int ip_get_icmp_phone(void)
-{
-        ip_proto_t *proto;
-        int phone;
-
+/** Return the ICMP session.
+ *
+ * Search the registered protocols.
+ *
+ * @return Found ICMP session.
+ * @return NULL if the ICMP is not registered.
+ *
+ */
+static async_sess_t *ip_get_icmp_session(void)
+{
         fibril_rwlock_read_lock(&ip_globals.protos_lock);
-        proto = ip_protos_find(&ip_globals.protos, IPPROTO_ICMP);
-        phone = proto ? proto->phone : ENOENT;
+        ip_proto_t *proto = ip_protos_find(&ip_globals.protos, IPPROTO_ICMP);
+        async_sess_t *sess = proto ? proto->sess : NULL;
         fibril_rwlock_read_unlock(&ip_globals.protos_lock);
-        return phone;
+        
+        return sess;
 }
 
@@ -182 +180 @@
         next = pq_detach(packet);
         if (next)
-                pq_release_remote(ip_globals.net_phone, packet_get_id(next));
+                pq_release_remote(ip_globals.net_sess, packet_get_id(next));
 
         if (!header) {
@@ -221 +219 @@
 }
 
-/** Prepares the ICMP notification packet.
- *
- * Releases additional packets and keeps only the first one.
+/** Prepare the ICMP notification packet.
+ *
+ * Release additional packets and keep only the first one.
  * All packets are released on error.
  *
- * @param[in] error     The packet error service.
- * @param[in] packet    The packet or the packet queue to be reported as faulty.
- * @param[in] header    The first packet IP header. May be NULL.
- * @return              The found ICMP phone.
- * @return              EINVAL if the error parameter is set.
- * @return              EINVAL if the ICMP phone is not found.
- * @return              EINVAL if the ip_prepare_icmp() fails.
- */
-static int
-ip_prepare_icmp_and_get_phone(services_t error, packet_t *packet,
-    ip_header_t *header)
-{
-        int phone;
-
-        phone = ip_get_icmp_phone();
-        if (error || (phone < 0) || ip_prepare_icmp(packet, header))
-                return ip_release_and_return(packet, EINVAL);
-        return phone;
-}
-
-int il_initialize(int net_phone)
+ * @param[in] error  Packet error service.
+ * @param[in] packet Packet or the packet queue to be reported as faulty.
+ * @param[in] header First packet IP header. May be NULL.
+ *
+ * @return Found ICMP session.
+ * @return NULL if the error parameter is set.
+ * @return NULL if the ICMP session is not found.
+ * @return NULL if the ip_prepare_icmp() fails.
+ *
+ */
+static async_sess_t *ip_prepare_icmp_and_get_session(services_t error,
+    packet_t *packet, ip_header_t *header)
+{
+        async_sess_t *sess = ip_get_icmp_session();
+        
+        if ((error) || (!sess) || (ip_prepare_icmp(packet, header))) {
+                pq_release_remote(ip_globals.net_sess, packet_get_id(packet));
+                return NULL;
+        }
+        
+        return sess;
+}
+
+int il_initialize(async_sess_t *net_sess)
 {
         fibril_rwlock_initialize(&ip_globals.lock);
@@ -253 +254 @@
         fibril_rwlock_initialize(&ip_globals.netifs_lock);
         
-        ip_globals.net_phone = net_phone;
+        ip_globals.net_sess = net_sess;
         ip_globals.packet_counter = 0;
         ip_globals.gateway.address.s_addr = 0;
@@ -355 +356 @@
 
         /* Get configuration */
-        rc = net_get_device_conf_req(ip_globals.net_phone, ip_netif->device_id,
+        rc = net_get_device_conf_req(ip_globals.net_sess, ip_netif->device_id,
             &configuration, count, &data);
         if (rc != EOK)
@@ -423 +424 @@
 
         /* Bind netif service which also initializes the device */
-        ip_netif->phone = nil_bind_service(ip_netif->service,
+        ip_netif->sess = nil_bind_service(ip_netif->service,
             (sysarg_t) ip_netif->device_id, SERVICE_IP,
             ip_receiver);
-        if (ip_netif->phone < 0) {
+        if (ip_netif->sess == NULL) {
                 printf("Failed to contact the nil service %d\n",
                     ip_netif->service);
-                return ip_netif->phone;
+                return ENOENT;
         }
 
@@ -438 +439 @@
                         address.length = sizeof(in_addr_t);
                         
-                        rc = arp_device_req(ip_netif->arp->phone,
+                        rc = arp_device_req(ip_netif->arp->sess,
                             ip_netif->device_id, SERVICE_IP, ip_netif->service,
                             &address);
@@ -449 +450 @@
 
         /* Get packet dimensions */
-        rc = nil_packet_size_req(ip_netif->phone, ip_netif->device_id,
+        rc = nil_packet_size_req(ip_netif->sess, ip_netif->device_id,
             &ip_netif->packet_dimension);
         if (rc != EOK)
@@ -481 +482 @@
 }
 
-static int ip_device_req_local(int il_phone, device_id_t device_id,
-    services_t netif)
+static int ip_device_req_local(device_id_t device_id, services_t netif)
 {
         ip_netif_t *ip_netif;
@@ -516 +516 @@
 
         /* Print the settings */
-        printf("%s: Device registered (id: %d, phone: %d, ipv: %d, conf: %s)\n",
-            NAME, ip_netif->device_id, ip_netif->phone, ip_netif->ipv,
+        printf("%s: Device registered (id: %d, ipv: %d, conf: %s)\n",
+            NAME, ip_netif->device_id, ip_netif->ipv,
             ip_netif->dhcp ? "dhcp" : "static");
         
@@ -932 +932 @@
 
         /* Create the last fragment */
-        new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length,
+        new_packet = packet_get_4_remote(ip_globals.net_sess, prefix, length,
             suffix, ((addrlen > addr_len) ? addrlen : addr_len));
         if (!new_packet)
@@ -969 +969 @@
         /* Create middle fragments */
         while (IP_TOTAL_LENGTH(header) > length) {
-                new_packet = packet_get_4_remote(ip_globals.net_phone, prefix,
+                new_packet = packet_get_4_remote(ip_globals.net_sess, prefix,
                     length, suffix,
                     ((addrlen >= addr_len) ? addrlen : addr_len));
@@ -994 +994 @@
 }
 
-/** Checks the packet queue lengths and fragments the packets if needed.
+/** Check the packet queue lengths and fragments the packets if needed.
  *
  * The ICMP_FRAG_NEEDED error notification may be sent if the packet needs to
  * be fragmented and the fragmentation is not allowed.
  *
- * @param[in,out] packet The packet or the packet queue to be checked.
- * @param[in] prefix    The minimum prefix size.
- * @param[in] content   The maximum content size.
- * @param[in] suffix    The minimum suffix size.
- * @param[in] addr_len  The minimum address length.
- * @param[in] error     The error module service.
- * @return              The packet or the packet queue of the allowed length.
- * @return              NULL if there are no packets left.
- */
-static packet_t *
-ip_split_packet(packet_t *packet, size_t prefix, size_t content, size_t suffix,
-    socklen_t addr_len, services_t error)
+ * @param[in,out] packet   Packet or the packet queue to be checked.
+ * @param[in]     prefix   Minimum prefix size.
+ * @param[in]     content  Maximum content size.
+ * @param[in]     suffix   Minimum suffix size.
+ * @param[in]     addr_len Minimum address length.
+ * @param[in]     error    Error module service.
+ *
+ * @return The packet or the packet queue of the allowed length.
+ * @return NULL if there are no packets left.
+ *
+ */
+static packet_t *ip_split_packet(packet_t *packet, size_t prefix, size_t content,
+    size_t suffix, socklen_t addr_len, services_t error)
 {
         size_t length;
@@ -1016 +1017 @@
         packet_t *new_packet;
         int result;
-        int phone;
-
+        async_sess_t *sess;
+        
         next = packet;
         /* Check all packets */
@@ -1039 +1040 @@
                         /* Fragmentation needed? */
                         if (result == EPERM) {
-                                phone = ip_prepare_icmp_and_get_phone(
-                                    error, next, NULL);
-                                if (phone >= 0) {
+                                sess = ip_prepare_icmp_and_get_session(error, next, NULL);
+                                if (sess) {
                                         /* Fragmentation necessary ICMP */
-                                        icmp_destination_unreachable_msg(phone,
+                                        icmp_destination_unreachable_msg(sess,
                                             ICMP_FRAG_NEEDED, content, next);
                                 }
                         } else {
-                                pq_release_remote(ip_globals.net_phone,
+                                pq_release_remote(ip_globals.net_sess,
                                     packet_get_id(next));
                         }
@@ -1061 +1061 @@
 }
 
-/** Sends the packet or the packet queue via the specified route.
+/** Send the packet or the packet queue via the specified route.
  *
  * The ICMP_HOST_UNREACH error notification may be sent if route hardware
  * destination address is found.
  *
- * @param[in,out] packet The packet to be sent.
- * @param[in] netif     The target network interface.
- * @param[in] route     The target route.
- * @param[in] src       The source address.
- * @param[in] dest      The destination address.
- * @param[in] error     The error module service.
- * @return              EOK on success.
- * @return              Other error codes as defined for the arp_translate_req()
- *                      function.
- * @return              Other error codes as defined for the ip_prepare_packet()
- *                      function.
+ * @param[in,out] packet Packet to be sent.
+ * @param[in]     netif  Target network interface.
+ * @param[in]     route  Target route.
+ * @param[in]     src    Source address.
+ * @param[in]     dest   Destination address.
+ * @param[in]     error  Error module service.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for arp_translate_req().
+ * @return Other error codes as defined for ip_prepare_packet().
+ *
  */
 static int ip_send_route(packet_t *packet, ip_netif_t *netif,
@@ -1084 +1084 @@
         measured_string_t *translation;
         uint8_t *data;
-        int phone;
+        async_sess_t *sess;
         int rc;
 
@@ -1093 +1093 @@
                 destination.length = sizeof(dest.s_addr);
 
-                rc = arp_translate_req(netif->arp->phone, netif->device_id,
+                rc = arp_translate_req(netif->arp->sess, netif->device_id,
                     SERVICE_IP, &destination, &translation, &data);
                 if (rc != EOK) {
-                        pq_release_remote(ip_globals.net_phone,
+                        pq_release_remote(ip_globals.net_sess,
                             packet_get_id(packet));
                         return rc;
@@ -1106 +1106 @@
                                 free(data);
                         }
-                        phone = ip_prepare_icmp_and_get_phone(error, packet,
+                        sess = ip_prepare_icmp_and_get_session(error, packet,
                             NULL);
-                        if (phone >= 0) {
+                        if (sess) {
                                 /* Unreachable ICMP if no routing */
-                                icmp_destination_unreachable_msg(phone,
+                                icmp_destination_unreachable_msg(sess,
                                     ICMP_HOST_UNREACH, 0, packet);
                         }
@@ -1122 +1122 @@
         rc = ip_prepare_packet(src, dest, packet, translation);
         if (rc != EOK) {
-                pq_release_remote(ip_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(ip_globals.net_sess, packet_get_id(packet));
         } else {
                 packet = ip_split_packet(packet, netif->packet_dimension.prefix,
@@ -1129 +1129 @@
                     netif->packet_dimension.addr_len, error);
                 if (packet) {
-                        nil_send_msg(netif->phone, netif->device_id, packet,
+                        nil_send_msg(netif->sess, netif->device_id, packet,
                             SERVICE_IP);
                 }
@@ -1142 +1142 @@
 }
 
-static int ip_send_msg_local(int il_phone, device_id_t device_id,
-    packet_t *packet, services_t sender, services_t error)
+static int ip_send_msg_local(device_id_t device_id, packet_t *packet,
+    services_t sender, services_t error)
 {
         int addrlen;
@@ -1152 +1152 @@
         in_addr_t *dest;
         in_addr_t *src;
-        int phone;
+        async_sess_t *sess;
         int rc;
 
@@ -1197 +1197 @@
         if (!netif || !route) {
                 fibril_rwlock_read_unlock(&ip_globals.netifs_lock);
-                phone = ip_prepare_icmp_and_get_phone(error, packet, NULL);
-                if (phone >= 0) {
+                sess = ip_prepare_icmp_and_get_session(error, packet, NULL);
+                if (sess) {
                         /* Unreachable ICMP if no routing */
-                        icmp_destination_unreachable_msg(phone,
+                        icmp_destination_unreachable_msg(sess,
                             ICMP_NET_UNREACH, 0, packet);
                 }
@@ -1228 +1228 @@
                 if (!netif || !route) {
                         fibril_rwlock_read_unlock(&ip_globals.netifs_lock);
-                        phone = ip_prepare_icmp_and_get_phone(error, packet,
+                        sess = ip_prepare_icmp_and_get_session(error, packet,
                             NULL);
-                        if (phone >= 0) {
+                        if (sess) {
                                 /* Unreachable ICMP if no routing */
-                                icmp_destination_unreachable_msg(phone,
+                                icmp_destination_unreachable_msg(sess,
                                     ICMP_HOST_UNREACH, 0, packet);
                         }
@@ -1316 +1316 @@
 {
         ip_proto_t *proto;
-        int phone;
+        async_sess_t *sess;
         services_t service;
         tl_received_msg_t received_msg;
@@ -1369 +1369 @@
         if (!proto) {
                 fibril_rwlock_read_unlock(&ip_globals.protos_lock);
-                phone = ip_prepare_icmp_and_get_phone(error, packet, header);
-                if (phone >= 0) {
+                sess = ip_prepare_icmp_and_get_session(error, packet, header);
+                if (sess) {
                         /* Unreachable ICMP */
-                        icmp_destination_unreachable_msg(phone,
+                        icmp_destination_unreachable_msg(sess,
                             ICMP_PROT_UNREACH, 0, packet);
                 }
@@ -1384 +1384 @@
                 rc = received_msg(device_id, packet, service, error);
         } else {
-                rc = tl_received_msg(proto->phone, device_id, packet,
+                rc = tl_received_msg(proto->sess, device_id, packet,
                     proto->service, error);
                 fibril_rwlock_read_unlock(&ip_globals.protos_lock);
@@ -1418 +1418 @@
         in_addr_t dest;
         ip_route_t *route;
-        int phone;
+        async_sess_t *sess;
         struct sockaddr *addr;
         struct sockaddr_in addr_in;
@@ -1431 +1431 @@
         if ((header->header_checksum) &&
             (IP_HEADER_CHECKSUM(header) != IP_CHECKSUM_ZERO)) {
-                phone = ip_prepare_icmp_and_get_phone(0, packet, header);
-                if (phone >= 0) {
+                sess = ip_prepare_icmp_and_get_session(0, packet, header);
+                if (sess) {
                         /* Checksum error ICMP */
-                        icmp_parameter_problem_msg(phone, ICMP_PARAM_POINTER,
+                        icmp_parameter_problem_msg(sess, ICMP_PARAM_POINTER,
                             ((size_t) ((void *) &header->header_checksum)) -
                             ((size_t) ((void *) header)), packet);
@@ -1442 +1442 @@
 
         if (header->ttl <= 1) {
-                phone = ip_prepare_icmp_and_get_phone(0, packet, header);
-                if (phone >= 0) {
+                sess = ip_prepare_icmp_and_get_session(0, packet, header);
+                if (sess) {
                         /* TTL exceeded ICMP */
-                        icmp_time_exceeded_msg(phone, ICMP_EXC_TTL, packet);
+                        icmp_time_exceeded_msg(sess, ICMP_EXC_TTL, packet);
                 }
                 return EINVAL;
@@ -1473 +1473 @@
         route = ip_find_route(dest);
         if (!route) {
-                phone = ip_prepare_icmp_and_get_phone(0, packet, header);
-                if (phone >= 0) {
+                sess = ip_prepare_icmp_and_get_session(0, packet, header);
+                if (sess) {
                         /* Unreachable ICMP */
-                        icmp_destination_unreachable_msg(phone,
+                        icmp_destination_unreachable_msg(sess,
                             ICMP_HOST_UNREACH, 0, packet);
                 }
@@ -1493 +1493 @@
         }
 
-        phone = ip_prepare_icmp_and_get_phone(0, packet, header);
-        if (phone >= 0) {
+        sess = ip_prepare_icmp_and_get_session(0, packet, header);
+        if (sess) {
                 /* Unreachable ICMP if no routing */
-                icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0,
+                icmp_destination_unreachable_msg(sess, ICMP_HOST_UNREACH, 0,
                     packet);
         }
@@ -1503 +1503 @@
 }
 
-/** Returns the device packet dimensions for sending.
- *
- * @param[in] phone     The service module phone.
- * @param[in] message   The service specific message.
- * @param[in] device_id The device identifier.
- * @param[out] addr_len The minimum reserved address length.
- * @param[out] prefix   The minimum reserved prefix size.
- * @param[out] content  The maximum content size.
- * @param[out] suffix   The minimum reserved suffix size.
- * @return              EOK on success.
+/** Return the device packet dimensions for sending.
+ *
+ * @param[in]  device_id Device identifier.
+ * @param[out] addr_len  Minimum reserved address length.
+ * @param[out] prefix    Minimum reserved prefix size.
+ * @param[out] content   Maximum content size.
+ * @param[out] suffix    Minimum reserved suffix size.
+ *
+ * @return EOK on success.
+ *
  */
 static int ip_packet_size_message(device_id_t device_id, size_t *addr_len,
@@ -1594 +1594 @@
  * @param[in]     iid   Message identifier.
  * @param[in,out] icall Message parameters.
- *
- */
-static void ip_receiver(ipc_callid_t iid, ipc_call_t *icall)
+ * @param[in]     arg   Local argument.
+ *
+ */
+static void ip_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         packet_t *packet;
@@ -1610 +1611 @@
                 
                 case NET_IL_RECEIVED:
-                        rc = packet_translate_remote(ip_globals.net_phone, &packet,
+                        rc = packet_translate_remote(ip_globals.net_sess, &packet,
                             IPC_GET_PACKET(*icall));
                         if (rc == EOK) {
@@ -1637 +1638 @@
 }
 
-/** Registers the transport layer protocol.
+/** Register the transport layer protocol.
  *
  * The traffic of this protocol will be supplied using either the receive
  * function or IPC message.
  *
- * @param[in] protocol  The transport layer module protocol.
- * @param[in] service   The transport layer module service.
- * @param[in] phone     The transport layer module phone.
- * @param[in] received_msg The receiving function.
- * @return              EOK on success.
- * @return              EINVAL if the protocol parameter and/or the service
- *                      parameter is zero.
- * @return              EINVAL if the phone parameter is not a positive number
- *                      and the tl_receive_msg is NULL.
- * @return              ENOMEM if there is not enough memory left.
- */
-static int
-ip_register(int protocol, services_t service, int phone,
+ * @param[in] protocol     Transport layer module protocol.
+ * @param[in] service      Transport layer module service.
+ * @param[in] sess         Transport layer module session.
+ * @param[in] received_msg Receiving function.
+ *
+ * @return EOK on success.
+ * @return EINVAL if the protocol parameter and/or the service
+ *         parameter is zero.
+ * @return EINVAL if the phone parameter is not a positive number
+ *         and the tl_receive_msg is NULL.
+ * @return ENOMEM if there is not enough memory left.
+ *
+ */
+static int ip_register(int protocol, services_t service, async_sess_t *sess,
     tl_received_msg_t received_msg)
 {
@@ -1660 +1662 @@
         int index;
 
-        if (!protocol || !service || ((phone < 0) && !received_msg))
+        if ((!protocol) || (!service) || ((!sess) && (!received_msg)))
                 return EINVAL;
-
+        
         proto = (ip_proto_t *) malloc(sizeof(ip_protos_t));
         if (!proto)
@@ -1669 +1671 @@
         proto->protocol = protocol;
         proto->service = service;
-        proto->phone = phone;
+        proto->sess = sess;
         proto->received_msg = received_msg;
 
@@ -1681 +1683 @@
         fibril_rwlock_write_unlock(&ip_globals.protos_lock);
 
-        printf("%s: Protocol registered (protocol: %d, phone: %d)\n",
-            NAME, proto->protocol, proto->phone);
+        printf("%s: Protocol registered (protocol: %d)\n",
+            NAME, proto->protocol);
 
         return EOK;
 }
 
-
-static int
-ip_add_route_req_local(int ip_phone, device_id_t device_id, in_addr_t address,
+static int ip_add_route_req_local(device_id_t device_id, in_addr_t address,
     in_addr_t netmask, in_addr_t gateway)
 {
@@ -1723 +1723 @@
 }
 
-static int
-ip_set_gateway_req_local(int ip_phone, device_id_t device_id, in_addr_t gateway)
+static int ip_set_gateway_req_local(device_id_t device_id, in_addr_t gateway)
 {
         ip_netif_t *netif;
@@ -1748 +1747 @@
 /** Notify the IP module about the received error notification packet.
  *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] device_id The device identifier.
- * @param[in] packet    The received packet or the received packet queue.
- * @param[in] target    The target internetwork module service to be
- *                      delivered to.
- * @param[in] error     The packet error reporting service. Prefixes the
- *                      received packet.
- * @return              EOK on success.
- *
- */
-static int
-ip_received_error_msg_local(int ip_phone, device_id_t device_id,
+ * @param[in] device_id Device identifier.
+ * @param[in] packet    Received packet or the received packet queue.
+ * @param[in] target    Target internetwork module service to be
+ *                      delivered to.
+ * @param[in] error     Packet error reporting service. Prefixes the
+ *                      received packet.
+ *
+ * @return EOK on success.
+ *
+ */
+static int ip_received_error_msg_local(device_id_t device_id,
     packet_t *packet, services_t target, services_t error)
 {
@@ -1804 +1802 @@
                         address.value = (uint8_t *) &header->destination_address;
                         address.length = sizeof(header->destination_address);
-                        arp_clear_address_req(netif->arp->phone,
+                        arp_clear_address_req(netif->arp->sess,
                             netif->device_id, SERVICE_IP, &address);
                 }
@@ -1818 +1816 @@
 }
 
-static int
-ip_get_route_req_local(int ip_phone, ip_protocol_t protocol,
+static int ip_get_route_req_local(ip_protocol_t protocol,
     const struct sockaddr *destination, socklen_t addrlen,
     device_id_t *device_id, void **header, size_t *headerlen)
@@ -1920 +1917 @@
                 return EOK;
         
+        async_sess_t *callback =
+            async_callback_receive_start(EXCHANGE_SERIALIZE, call);
+        if (callback)
+                return ip_register(IL_GET_PROTO(*call), IL_GET_SERVICE(*call),
+                    callback, NULL);
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_CONNECT_TO_ME:
-                return ip_register(IL_GET_PROTO(*call), IL_GET_SERVICE(*call),
-                    IPC_GET_PHONE(*call), NULL);
-        
         case NET_IP_DEVICE:
-                return ip_device_req_local(0, IPC_GET_DEVICE(*call),
+                return ip_device_req_local(IPC_GET_DEVICE(*call),
                     IPC_GET_SERVICE(*call));
         
         case NET_IP_RECEIVED_ERROR:
-                rc = packet_translate_remote(ip_globals.net_phone, &packet,
+                rc = packet_translate_remote(ip_globals.net_sess, &packet,
                     IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return ip_received_error_msg_local(0, IPC_GET_DEVICE(*call),
+                return ip_received_error_msg_local(IPC_GET_DEVICE(*call),
                     packet, IPC_GET_TARGET(*call), IPC_GET_ERROR(*call));
         
         case NET_IP_ADD_ROUTE:
-                return ip_add_route_req_local(0, IPC_GET_DEVICE(*call),
+                return ip_add_route_req_local(IPC_GET_DEVICE(*call),
                     IP_GET_ADDRESS(*call), IP_GET_NETMASK(*call),
                     IP_GET_GATEWAY(*call));
 
         case NET_IP_SET_GATEWAY:
-                return ip_set_gateway_req_local(0, IPC_GET_DEVICE(*call),
+                return ip_set_gateway_req_local(IPC_GET_DEVICE(*call),
                     IP_GET_GATEWAY(*call));
 
@@ -1952 +1951 @@
                         return rc;
                 
-                rc = ip_get_route_req_local(0, IP_GET_PROTOCOL(*call), addr,
+                rc = ip_get_route_req_local(IP_GET_PROTOCOL(*call), addr,
                     (socklen_t) addrlen, &device_id, &header, &headerlen);
                 if (rc != EOK)
@@ -1983 +1982 @@
         
         case NET_IP_SEND:
-                rc = packet_translate_remote(ip_globals.net_phone, &packet,
+                rc = packet_translate_remote(ip_globals.net_sess, &packet,
                     IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
                 
-                return ip_send_msg_local(0, IPC_GET_DEVICE(*call), packet, 0,
+                return ip_send_msg_local(IPC_GET_DEVICE(*call), packet, 0,
                     IPC_GET_ERROR(*call));
         }