Changeset 774e6d1a in mainline for uspace/srv

Timestamp:

2011-01-09T23:24:53Z (15 years ago)

Author:

martin@…>

Branches:

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

Children:

4b86dac

Parents:

3c106e88

Message:

partial networking stack overhaul

• a lot of coding style changes (comments, indentation, etc.)
• convert several ints to unsigned ints or size_t values
• streamline many of the IPC-related macros (they no longer dereference the call structure by themselves)
• get rid of netif_interface.h (containing only aliases for remote functions and not serving any purpose)
• rename netif_local.{c|h} to netif_skel.{c|h} (it is really just a skeleton)
• drop the "_remote" and "_standalone" suffixes from most of the netif_ functions (they do not serve any purpose anymore)
• implement netif_client_connection() as a common framework function for all netif modules
  • update the lo module accordingly
• ip module now reports the default gateway to the user whenever it is being set

Location:

uspace/srv/net

Files:

• il/arp/arp.c (modified) (12 diffs)
• il/arp/arp_module.c (modified) (1 diff)
• il/arp/arp_module.h (modified) (1 diff)
• il/ip/ip.c (modified) (14 diffs)
• il/ip/ip_module.c (modified) (1 diff)
• il/ip/ip_module.h (modified) (1 diff)
• net/net.c (modified) (6 diffs)
• net/net.h (modified) (1 diff)
• net/net_standalone.c (modified) (1 diff)
• netif/lo/lo.c (modified) (4 diffs)
• nil/eth/eth.c (modified) (9 diffs)
• nil/eth/eth_header.h (modified) (1 diff)
• nil/eth/eth_module.c (modified) (1 diff)
• nil/nildummy/nildummy.c (modified) (11 diffs)
• nil/nildummy/nildummy_module.c (modified) (1 diff)
• tl/icmp/icmp.c (modified) (6 diffs)
• tl/icmp/icmp_module.c (modified) (1 diff)
• tl/icmp/icmp_module.h (modified) (1 diff)
• tl/tcp/tcp.c (modified) (5 diffs)
• tl/tcp/tcp_module.c (modified) (1 diff)
• tl/tcp/tcp_module.h (modified) (1 diff)
• tl/udp/udp.c (modified) (5 diffs)
• tl/udp/udp_module.c (modified) (1 diff)
• tl/udp/udp_module.h (modified) (1 diff)

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

@@ -457 +457 @@
         uint8_t *des_proto;
         int rc;
-
+        
         length = packet_get_data_length(packet);
         if (length <= sizeof(arp_header_t))
@@ -677 +677 @@
 int
 arp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *address;
@@ -696 +696 @@
                         return rc;
                 
-                rc = arp_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), ARP_GET_NETIF(call), address);
+                rc = arp_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), ARP_GET_NETIF(*call), address);
                 if (rc != EOK) {
                         free(address);
@@ -710 +710 @@
                 
                 fibril_mutex_lock(&arp_globals.lock);
-                rc = arp_translate_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), address, &translation);
+                rc = arp_translate_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), address, &translation);
                 free(address);
                 free(data);
@@ -727 +727 @@
 
         case NET_ARP_CLEAR_DEVICE:
-                return arp_clear_device_req(0, IPC_GET_DEVICE(call));
+                return arp_clear_device_req(0, IPC_GET_DEVICE(*call));
 
         case NET_ARP_CLEAR_ADDRESS:
@@ -734 +734 @@
                         return rc;
                 
-                arp_clear_address_req(0, IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), address);
+                arp_clear_address_req(0, IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), address);
                 free(address);
                 free(data);
@@ -750 +750 @@
                 
                 rc = packet_translate_remote(arp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
@@ -757 +757 @@
                 do {
                         next = pq_detach(packet);
-                        rc = arp_receive_message(IPC_GET_DEVICE(call), packet);
+                        rc = arp_receive_message(IPC_GET_DEVICE(*call), packet);
                         if (rc != 1) {
                                 pq_release_remote(arp_globals.net_phone,
@@ -769 +769 @@
         
         case NET_IL_MTU_CHANGED:
-                return arp_mtu_changed_message(IPC_GET_DEVICE(call),
-                    IPC_GET_MTU(call));
+                return arp_mtu_changed_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_MTU(*call));
         }
         
@@ -791 +791 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -802 +802 @@
                 /* Process the message */
                 int res = il_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
+                    &count);
                 
                 /*
@@ -813 +813 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }

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

@@ -58 +58 @@
 
 int il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
-        return arp_message_standalone(callid, call, answer, answer_count);
+        return arp_message_standalone(callid, call, answer, count);
 }
 

uspace/srv/net/il/arp/arp_module.h

@@ -44 +44 @@
 extern int arp_initialize(async_client_conn_t);
 extern int arp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    int *);
+    size_t *);
 
 #endif

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

@@ -477 +477 @@
                 ip_globals.gateway.gateway.s_addr = gateway.s_addr;
                 ip_globals.gateway.netif = ip_netif;
+                
+                char defgateway[INET_ADDRSTRLEN];
+                inet_ntop(AF_INET, (uint8_t *) &gateway.s_addr,
+                    defgateway, INET_ADDRSTRLEN);
+                printf("%s: Default gateway (%s)\n", NAME, defgateway);
         }
 
@@ -1069 +1074 @@
         int index;
         ip_route_t *route;
-
+        
         if (!netif)
                 return NULL;
-
-        // start with the first one - the direct route
+        
+        /* Start with the first one (the direct route) */
         for (index = 0; index < ip_routes_count(&netif->routes); index++) {
                 route = ip_routes_get_index(&netif->routes, index);
-                if (route &&
+                if ((route) &&
                     ((route->address.s_addr & route->netmask.s_addr) ==
-                    (destination.s_addr & route->netmask.s_addr))) {
+                    (destination.s_addr & route->netmask.s_addr)))
                         return route;
-                }
         }
 
@@ -1288 +1292 @@
         if (device_id > 0) {
                 netif = ip_netifs_find(&ip_globals.netifs, device_id);
-                route = ip_netif_find_route(netif, * dest);
+                route = ip_netif_find_route(netif, *dest);
                 if (netif && !route && (ip_globals.gateway.netif == netif))
                         route = &ip_globals.gateway;
@@ -1318 +1322 @@
                 }
         }
-
+        
         // if the local host is the destination
         if ((route->address.s_addr == dest->s_addr) &&
@@ -1562 +1566 @@
         socklen_t addrlen;
         int rc;
-
+        
         header = (ip_header_t *) packet_get_data(packet);
         if (!header)
@@ -1588 +1592 @@
                 return EINVAL;
         }
-
+        
         // process ipopt and get destination
         dest = ip_get_destination(header);
@@ -1609 +1613 @@
         if (rc != EOK)
                 return rc;
-
+        
         route = ip_find_route(dest);
         if (!route) {
@@ -1886 +1890 @@
 int
 ip_message_standalone(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    int *answer_count)
+    size_t *answer_count)
 {
         packet_t *packet;
@@ -1905 +1909 @@
         
         case IPC_M_CONNECT_TO_ME:
-                return ip_register(IL_GET_PROTO(call), IL_GET_SERVICE(call),
-                    IPC_GET_PHONE(call), NULL);
+                return ip_register(IL_GET_PROTO(*call), IL_GET_SERVICE(*call),
+                    IPC_GET_PHONE(*call), NULL);
         
         case NET_IL_DEVICE:
-                return ip_device_req_local(0, IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call));
+                return ip_device_req_local(0, IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call));
         
         case NET_IL_SEND:
                 rc = packet_translate_remote(ip_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return ip_send_msg_local(0, IPC_GET_DEVICE(call), packet, 0,
-                    IPC_GET_ERROR(call));
+                return ip_send_msg_local(0, IPC_GET_DEVICE(*call), packet, 0,
+                    IPC_GET_ERROR(*call));
         
         case NET_IL_DEVICE_STATE:
-                return ip_device_state_message(IPC_GET_DEVICE(call),
-                    IPC_GET_STATE(call));
+                return ip_device_state_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_STATE(*call));
         
         case NET_IL_RECEIVED:
                 rc = packet_translate_remote(ip_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return ip_receive_message(IPC_GET_DEVICE(call), packet);
+                return ip_receive_message(IPC_GET_DEVICE(*call), packet);
         
         case NET_IP_RECEIVED_ERROR:
                 rc = packet_translate_remote(ip_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return ip_received_error_msg_local(0, IPC_GET_DEVICE(call),
-                    packet, IPC_GET_TARGET(call), IPC_GET_ERROR(call));
+                return ip_received_error_msg_local(0, 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),
-                    IP_GET_ADDRESS(call), IP_GET_NETMASK(call),
-                    IP_GET_GATEWAY(call));
+                return ip_add_route_req_local(0, 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),
-                    IP_GET_GATEWAY(call));
+                return ip_set_gateway_req_local(0, IPC_GET_DEVICE(*call),
+                    IP_GET_GATEWAY(*call));
 
         case NET_IP_GET_ROUTE:
@@ -1954 +1958 @@
                         return rc;
                 
-                rc = ip_get_route_req_local(0, IP_GET_PROTOCOL(call), addr,
+                rc = ip_get_route_req_local(0, IP_GET_PROTOCOL(*call), addr,
                     (socklen_t) addrlen, &device_id, &header, &headerlen);
                 if (rc != EOK)
                         return rc;
                 
-                IPC_SET_DEVICE(answer, device_id);
-                IP_SET_HEADERLEN(answer, headerlen);
+                IPC_SET_DEVICE(*answer, device_id);
+                IP_SET_HEADERLEN(*answer, headerlen);
                 
                 *answer_count = 2;
@@ -1972 +1976 @@
         
         case NET_IL_PACKET_SPACE:
-                rc = ip_packet_size_message(IPC_GET_DEVICE(call), &addrlen,
+                rc = ip_packet_size_message(IPC_GET_DEVICE(*call), &addrlen,
                     &prefix, &content, &suffix);
                 if (rc != EOK)
                         return rc;
                 
-                IPC_SET_ADDR(answer, addrlen);
-                IPC_SET_PREFIX(answer, prefix);
-                IPC_SET_CONTENT(answer, content);
-                IPC_SET_SUFFIX(answer, suffix);
+                IPC_SET_ADDR(*answer, addrlen);
+                IPC_SET_PREFIX(*answer, prefix);
+                IPC_SET_CONTENT(*answer, content);
+                IPC_SET_SUFFIX(*answer, suffix);
                 *answer_count = 4;
                 return EOK;
         
         case NET_IL_MTU_CHANGED:
-                return ip_mtu_changed_message(IPC_GET_DEVICE(call),
-                    IPC_GET_MTU(call));
+                return ip_mtu_changed_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_MTU(*call));
         }
         
@@ -2007 +2011 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -2018 +2022 @@
                 /* Process the message */
                 int res = il_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
+                    &count);
                 
                 /*
@@ -2030 +2034 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }

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

@@ -59 +59 @@
 int
 il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
-        return ip_message_standalone(callid, call, answer, answer_count);
+        return ip_message_standalone(callid, call, answer, count);
 }
 

uspace/srv/net/il/ip/ip_module.h

@@ -43 +43 @@
 extern int ip_initialize(async_client_conn_t);
 extern int ip_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    int *);
+    size_t *);
 
 #endif

uspace/srv/net/net/net.c

@@ -474 +474 @@
         
         setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_IO, 0);
-        int io = setting ? strtol((char *) setting->value, NULL, 16) : 0;
-        
-        rc = netif_probe_req_remote(netif->driver->phone, netif->id, irq, io);
+        uintptr_t io = setting ? strtol((char *) setting->value, NULL, 16) : 0;
+        
+        rc = netif_probe_req(netif->driver->phone, netif->id, irq, (void *) io);
         if (rc != EOK)
                 return rc;
@@ -511 +511 @@
         }
         
-        return netif_start_req_remote(netif->driver->phone, netif->id);
+        return netif_start_req(netif->driver->phone, netif->id);
 }
 
@@ -613 +613 @@
 /** Process the networking message.
  *
- * @param[in] callid        The message identifier.
- * @param[in] call          The message parameters.
+ * @param[in]  callid       The message identifier.
+ * @param[in]  call         The message parameters.
  * @param[out] answer       The message answer parameters.
  * @param[out] answer_count The last parameter for the actual answer
@@ -627 +627 @@
  */
 int net_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    int *answer_count)
+    size_t *answer_count)
 {
         measured_string_t *strings;
@@ -639 +639 @@
         case NET_NET_GET_DEVICE_CONF:
                 rc = measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call));
+                    IPC_GET_COUNT(*call));
                 if (rc != EOK)
                         return rc;
-                net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
-                    IPC_GET_COUNT(call), NULL);
+                net_get_device_conf_req(0, IPC_GET_DEVICE(*call), &strings,
+                    IPC_GET_COUNT(*call), NULL);
                 
                 /* Strings should not contain received data anymore */
                 free(data);
                 
-                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(*call));
                 free(strings);
                 return rc;
         case NET_NET_GET_CONF:
                 rc = measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call));
+                    IPC_GET_COUNT(*call));
                 if (rc != EOK)
                         return rc;
-                net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
+                net_get_conf_req(0, &strings, IPC_GET_COUNT(*call), NULL);
                 
                 /* Strings should not contain received data anymore */
                 free(data);
                 
-                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(*call));
                 free(strings);
                 return rc;
@@ -688 +688 @@
                 /* Clear the answer structure */
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
                 refresh_answer(&answer, &answer_count);
                 

uspace/srv/net/net/net.h

@@ -135 +135 @@
 extern int add_configuration(measured_strings_t *, const uint8_t *,
     const uint8_t *);
-extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *);
+extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *);
 extern int net_initialize_build(async_client_conn_t);
-extern int net_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *);
+extern int net_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *);
 
 #endif

uspace/srv/net/net/net_standalone.c

@@ -100 +100 @@
  */
 int net_module_message(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
-        if (IS_NET_PACKET_MESSAGE(call))
-                return packet_server_message(callid, call, answer, answer_count);
+        if (IS_NET_PACKET_MESSAGE(*call))
+                return packet_server_message(callid, call, answer, count);
         
-        return net_message(callid, call, answer, answer_count);
+        return net_message(callid, call, answer, count);
 }
 

uspace/srv/net/netif/lo/lo.c

@@ -49 +49 @@
 #include <net/device.h>
 #include <nil_interface.h>
-#include <netif_interface.h>
-#include <netif_local.h>
+#include <netif_skel.h>
 
 /** Default hardware address. */
@@ -65 +64 @@
 
 int netif_specific_message(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
         return ENOTSUP;
@@ -172 +171 @@
 }
 
-int netif_probe_message(device_id_t device_id, int irq, uintptr_t io)
+int netif_probe_message(device_id_t device_id, int irq, void *io)
 {
         netif_device_t *device;
@@ -233 +232 @@
 }
 
-/** Default thread for new connections.
- *
- * @param[in] iid       The initial message identifier.
- * @param[in] icall     The initial message call structure.
- */
-static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        /*
-         * Accept the connection
-         *  - Answer the first IPC_M_CONNECT_ME_TO call.
-         */
-        ipc_answer_0(iid, EOK);
-        
-        while (true) {
-                ipc_call_t answer;
-                int answer_count;
-                
-                /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
-                
-                /* Fetch the next message */
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                /* Process the message */
-                int res = netif_module_message(NAME, callid, &call, &answer,
-                    &answer_count);
-                
-                /*
-                 * End if told to either by the message or the processing
-                 * result.
-                 */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
-                        return;
-                
-                /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
-        }
-}
-
 int main(int argc, char *argv[])
 {
-        int rc;
-        
         /* Start the module */
-        rc = netif_module_start(netif_client_connection);
-        return rc;
+        return netif_module_start();
 }
 

uspace/srv/net/nil/eth/eth.c

@@ -54 +54 @@
 #include <protocol_map.h>
 #include <net/device.h>
-#include <netif_interface.h>
+#include <netif_remote.h>
 #include <net_interface.h>
 #include <nil_interface.h>
@@ -239 +239 @@
                 switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
-                        nil_device_state_msg_local(0, IPC_GET_DEVICE(icall),
-                            IPC_GET_STATE(icall));
+                        nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall),
+                            IPC_GET_STATE(*icall));
                         ipc_answer_0(iid, EOK);
                         break;
                 case NET_NIL_RECEIVED:
                         rc = packet_translate_remote(eth_globals.net_phone,
-                            &packet, IPC_GET_PACKET(icall));
+                            &packet, IPC_GET_PACKET(*icall));
                         if (rc == EOK) {
                                 rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(icall), packet, 0);
+                                    IPC_GET_DEVICE(*icall), packet, 0);
                         }
                         ipc_answer_0(iid, (sysarg_t) rc);
@@ -837 +837 @@
 
 int nil_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+    ipc_call_t *call, ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *address;
@@ -853 +853 @@
         
         case NET_NIL_DEVICE:
-                return eth_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                return eth_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), IPC_GET_MTU(*call));
         case NET_NIL_SEND:
                 rc = packet_translate_remote(eth_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return eth_send_message(IPC_GET_DEVICE(call), packet,
-                    IPC_GET_SERVICE(call));
+                return eth_send_message(IPC_GET_DEVICE(*call), packet,
+                    IPC_GET_SERVICE(*call));
         case NET_NIL_PACKET_SPACE:
-                rc = eth_packet_space_message(IPC_GET_DEVICE(call), &addrlen,
+                rc = eth_packet_space_message(IPC_GET_DEVICE(*call), &addrlen,
                     &prefix, &content, &suffix);
                 if (rc != EOK)
                         return rc;
-                IPC_SET_ADDR(answer, addrlen);
-                IPC_SET_PREFIX(answer, prefix);
-                IPC_SET_CONTENT(answer, content);
-                IPC_SET_SUFFIX(answer, suffix);
+                IPC_SET_ADDR(*answer, addrlen);
+                IPC_SET_PREFIX(*answer, prefix);
+                IPC_SET_CONTENT(*answer, content);
+                IPC_SET_SUFFIX(*answer, suffix);
                 *answer_count = 4;
                 return EOK;
         case NET_NIL_ADDR:
-                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_LOCAL_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_LOCAL_ADDR,
                     &address);
                 if (rc != EOK)
@@ -880 +880 @@
                 return measured_strings_reply(address, 1);
         case NET_NIL_BROADCAST_ADDR:
-                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_BROADCAST_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_BROADCAST_ADDR,
                     &address);
                 if (rc != EOK)
@@ -886 +886 @@
                 return measured_strings_reply(address, 1);
         case IPC_M_CONNECT_TO_ME:
-                return eth_register_message(NIL_GET_PROTO(call),
-                    IPC_GET_PHONE(call));
+                return eth_register_message(NIL_GET_PROTO(*call),
+                    IPC_GET_PHONE(*call));
         }
         
@@ -908 +908 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -919 +919 @@
                 /* Process the message */
                 int res = nil_module_message_standalone(NAME, callid, &call,
-                    &answer, &answer_count);
+                    &answer, &count);
                 
                 /*
@@ -930 +930 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }

uspace/srv/net/nil/eth/eth_header.h

@@ -42 +42 @@
 
 /** Ethernet address length. */
-#define ETH_ADDR        6
+#define ETH_ADDR  6
 
 /** Ethernet header preamble value. */
-#define ETH_PREAMBLE    0x55
+#define ETH_PREAMBLE  0x55
 
 /** Ethernet header start of frame value. */
-#define ETH_SFD         0xD5
+#define ETH_SFD  0xD5
 
 /** IEEE 802.2 unordered information control field. */
-#define IEEE_8023_2_UI  0x03
+#define IEEE_8023_2_UI  0x03
 
 /** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.

uspace/srv/net/nil/eth/eth_module.c

@@ -78 +78 @@
 
 int nil_module_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+    ipc_call_t *call, ipc_call_t *answer, size_t *count)
 {
-        return nil_message_standalone(name, callid, call, answer, answer_count);
+        return nil_message_standalone(name, callid, call, answer, count);
 }
 

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

@@ -47 +47 @@
 #include <net/modules.h>
 #include <net/device.h>
-#include <netif_interface.h>
 #include <nil_interface.h>
 #include <il_interface.h>
@@ -53 +52 @@
 #include <net/packet.h>
 #include <packet_remote.h>
+#include <netif_remote.h>
 #include <nil_local.h>
 
@@ -113 +113 @@
                 case NET_NIL_DEVICE_STATE:
                         rc = nil_device_state_msg_local(0,
-                            IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
+                            IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall));
                         ipc_answer_0(iid, (sysarg_t) rc);
                         break;
@@ -119 +119 @@
                 case NET_NIL_RECEIVED:
                         rc = packet_translate_remote(nildummy_globals.net_phone,
-                            &packet, IPC_GET_PACKET(icall));
+                            &packet, IPC_GET_PACKET(*icall));
                         if (rc == EOK) {
                                 rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(icall), packet, 0);
+                                    IPC_GET_DEVICE(*icall), packet, 0);
                         }
                         ipc_answer_0(iid, (sysarg_t) rc);
@@ -375 +375 @@
 
 int nil_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+    ipc_call_t *call, ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *address;
@@ -391 +391 @@
         
         case NET_NIL_DEVICE:
-                return nildummy_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                return nildummy_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), IPC_GET_MTU(*call));
         
         case NET_NIL_SEND:
                 rc = packet_translate_remote(nildummy_globals.net_phone,
-                    &packet, IPC_GET_PACKET(call));
+                    &packet, IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return nildummy_send_message(IPC_GET_DEVICE(call), packet,
-                    IPC_GET_SERVICE(call));
+                return nildummy_send_message(IPC_GET_DEVICE(*call), packet,
+                    IPC_GET_SERVICE(*call));
         
         case NET_NIL_PACKET_SPACE:
-                rc = nildummy_packet_space_message(IPC_GET_DEVICE(call),
+                rc = nildummy_packet_space_message(IPC_GET_DEVICE(*call),
                     &addrlen, &prefix, &content, &suffix);
                 if (rc != EOK)
                         return rc;
-                IPC_SET_ADDR(answer, addrlen);
-                IPC_SET_PREFIX(answer, prefix);
-                IPC_SET_CONTENT(answer, content);
-                IPC_SET_SUFFIX(answer, suffix);
+                IPC_SET_ADDR(*answer, addrlen);
+                IPC_SET_PREFIX(*answer, prefix);
+                IPC_SET_CONTENT(*answer, content);
+                IPC_SET_SUFFIX(*answer, suffix);
                 *answer_count = 4;
                 return EOK;
         
         case NET_NIL_ADDR:
-                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
                 if (rc != EOK)
                         return rc;
@@ -421 +421 @@
         
         case NET_NIL_BROADCAST_ADDR:
-                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
                 if (rc != EOK)
                         return rc;
@@ -427 +427 @@
         
         case IPC_M_CONNECT_TO_ME:
-                return nildummy_register_message(NIL_GET_PROTO(call),
-                    IPC_GET_PHONE(call));
+                return nildummy_register_message(NIL_GET_PROTO(*call),
+                    IPC_GET_PHONE(*call));
         }
         
@@ -449 +449 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -460 +460 @@
                 /* Process the message */
                 int res = nil_module_message_standalone(NAME, callid, &call,
-                    &answer, &answer_count);
+                    &answer, &count);
                 
                 /*
@@ -471 +471 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }

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

@@ -79 +79 @@
 
 int nil_module_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+    ipc_call_t *call, ipc_call_t *answer, size_t *count)
 {
-        return nil_message_standalone(name, callid, call, answer, answer_count);
+        return nil_message_standalone(name, callid, call, answer, count);
 }
 

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

@@ -696 +696 @@
         case NET_ICMP_DEST_UNREACH:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
                 return icmp_destination_unreachable_msg_local(0,
-                    ICMP_GET_CODE(call), ICMP_GET_MTU(call), packet);
+                    ICMP_GET_CODE(*call), ICMP_GET_MTU(*call), packet);
         case NET_ICMP_SOURCE_QUENCH:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
@@ -709 +709 @@
         case NET_ICMP_TIME_EXCEEDED:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return icmp_time_exceeded_msg_local(0, ICMP_GET_CODE(call),
+                return icmp_time_exceeded_msg_local(0, ICMP_GET_CODE(*call),
                     packet);
         case NET_ICMP_PARAMETERPROB:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return icmp_parameter_problem_msg_local(0, ICMP_GET_CODE(call),
-                    ICMP_GET_POINTER(call), packet);
+                return icmp_parameter_problem_msg_local(0, ICMP_GET_CODE(*call),
+                    ICMP_GET_POINTER(*call), packet);
         default:
                 return ENOTSUP;
@@ -787 +787 @@
         bool keep_on_going = true;
         ipc_call_t answer;
-        int answer_count;
+        size_t answer_count;
         size_t length;
         struct sockaddr *addr;
@@ -894 +894 @@
  */
 int icmp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *answer_count)
 {
         packet_t *packet;
@@ -903 +903 @@
         case NET_TL_RECEIVED:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return icmp_received_msg_local(IPC_GET_DEVICE(call), packet,
-                    SERVICE_ICMP, IPC_GET_ERROR(call));
+                return icmp_received_msg_local(IPC_GET_DEVICE(*call), packet,
+                    SERVICE_ICMP, IPC_GET_ERROR(*call));
         
         case NET_ICMP_INIT:
-                return icmp_process_client_messages(callid, * call);
+                return icmp_process_client_messages(callid, *call);
         
         default:
@@ -936 +936 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
                 
                 /* Clear the answer structure */

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

@@ -86 +86 @@
 
 int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
-        return icmp_message_standalone(callid, call, answer, answer_count);
+        return icmp_message_standalone(callid, call, answer, count);
 }
 

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

@@ -44 +44 @@
 extern int icmp_initialize(async_client_conn_t);
 extern int icmp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    int *);
+    size_t *);
 
 #endif

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

@@ -1262 +1262 @@
 int
 tcp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *answer_count)
 {
         packet_t *packet;
@@ -1276 +1276 @@
 //              fibril_rwlock_read_lock(&tcp_globals.lock);
                 rc = packet_translate_remote(tcp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK) {
 //                      fibril_rwlock_read_unlock(&tcp_globals.lock);
                         return rc;
                 }
-                rc = tcp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_TCP,
-                    IPC_GET_ERROR(call));
+                rc = tcp_received_msg(IPC_GET_DEVICE(*call), packet, SERVICE_TCP,
+                    IPC_GET_ERROR(*call));
 //              fibril_rwlock_read_unlock(&tcp_globals.lock);
                 return rc;
@@ -1323 +1323 @@
         bool keep_on_going = true;
         socket_cores_t local_sockets;
-        int app_phone = IPC_GET_PHONE(&call);
+        int app_phone = IPC_GET_PHONE(call);
         struct sockaddr *addr;
         int socket_id;
@@ -1330 +1330 @@
         fibril_rwlock_t lock;
         ipc_call_t answer;
-        int answer_count;
+        size_t answer_count;
         tcp_socket_data_t *socket_data;
         socket_core_t *socket;
@@ -2502 +2502 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
 
                 /* Clear the answer structure */

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

@@ -87 +87 @@
 
 int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
-        return tcp_message_standalone(callid, call, answer, answer_count);
+        return tcp_message_standalone(callid, call, answer, count);
 }
 

uspace/srv/net/tl/tcp/tcp_module.h

@@ -44 +44 @@
 extern int tcp_initialize(async_client_conn_t);
 extern int tcp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    int *);
+    size_t *);
 
 #endif

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

@@ -707 +707 @@
         bool keep_on_going = true;
         socket_cores_t local_sockets;
-        int app_phone = IPC_GET_PHONE(&call);
+        int app_phone = IPC_GET_PHONE(call);
         struct sockaddr *addr;
         int socket_id;
@@ -713 +713 @@
         size_t size;
         ipc_call_t answer;
-        int answer_count;
+        size_t answer_count;
         packet_dimension_t *packet_dimension;
 
@@ -861 +861 @@
  */
 int udp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *answer_count)
 {
         packet_t *packet;
@@ -871 +871 @@
         case NET_TL_RECEIVED:
                 rc = packet_translate_remote(udp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return udp_received_msg(IPC_GET_DEVICE(call), packet,
-                    SERVICE_UDP, IPC_GET_ERROR(call));
+                return udp_received_msg(IPC_GET_DEVICE(*call), packet,
+                    SERVICE_UDP, IPC_GET_ERROR(*call));
         case IPC_M_CONNECT_TO_ME:
-                return udp_process_client_messages(callid, * call);
+                return udp_process_client_messages(callid, *call);
         }
 
@@ -898 +898 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
                 
                 /* Clear the answer structure */

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

@@ -87 +87 @@
 
 int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
-        return udp_message_standalone(callid, call, answer, answer_count);
+        return udp_message_standalone(callid, call, answer, count);
 }
 

uspace/srv/net/tl/udp/udp_module.h

@@ -44 +44 @@
 extern int udp_initialize(async_client_conn_t);
 extern int udp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    int *);
+    size_t *);
 
 #endif