Changeset 14f1db0 in mainline for uspace/srv/net/il

Timestamp:

2010-04-09T12:54:57Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a1caa3c2

Parents:

24ab58b3

Message:

networking overhaul:

• separation of conserns
• removal of (almost all) overlaping symbols, libnetif is not needed anymore
• again, it is possible to build the networking in multiple architecture configurations (however, currently only the bundling netif and nil layers is supported, more to come)
• code style updates and fixes (still a huge amount of work to do)

Location:

uspace/srv/net/il

Files:

• arp/arp.c (modified) (13 diffs)
• arp/arp_module.c (modified) (3 diffs)
• arp/arp_module.h (modified) (1 diff)
• ip/ip.c (modified) (19 diffs)
• ip/ip_module.c (modified) (4 diffs)
• ip/ip_module.h (modified) (1 diff)

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

@@ -57 +57 @@
 #include <packet/packet.h>
 #include <packet/packet_client.h>
+#include <packet_remote.h>
 #include <il_messages.h>
+#include <il_interface.h>
+#include <il_local.h>
 #include <arp_messages.h>
 
@@ -370 +373 @@
 }
 
-int arp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int arp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int *answer_count)
+{
         ERROR_DECLARE;
-
+        
         measured_string_ref address;
         measured_string_ref translation;
@@ -378 +383 @@
         packet_t packet;
         packet_t next;
-
-//      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_ARP_FIRST);
+        
         *answer_count = 0;
-        switch(IPC_GET_METHOD(*call)){
+        switch (IPC_GET_METHOD(*call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return EOK;
@@ -418 +422 @@
                         return EOK;
                 case NET_IL_RECEIVED:
-                        if(! ERROR_OCCURRED(packet_translate(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate_remote(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 fibril_rwlock_read_lock(&arp_globals.lock);
                                 do{
@@ -424 +428 @@
                                         ERROR_CODE = arp_receive_message(IPC_GET_DEVICE(call), packet);
                                         if(ERROR_CODE != 1){
-                                                pq_release(arp_globals.net_phone, packet_get_id(packet));
+                                                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
                                         }
                                         packet = next;
@@ -434 +438 @@
                         return arp_mtu_changed_message(IPC_GET_DEVICE(call), IPC_GET_MTU(call));
         }
+        
         return ENOTSUP;
 }
@@ -570 +575 @@
                 return NULL;
         }
-        packet = packet_get_4(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix);
+        packet = packet_get_4_remote(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix);
         if(! packet){
                 return NULL;
@@ -576 +581 @@
         header = (arp_header_ref) packet_suffix(packet, length);
         if(! header){
-                pq_release(arp_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
                 return NULL;
         }
@@ -593 +598 @@
         memcpy(((uint8_t *) header) + length, target->value, target->length);
         if(packet_set_addr(packet, (uint8_t *) device->addr->value, (uint8_t *) device->broadcast_addr->value, CONVERT_SIZE(char, uint8_t, device->addr->length)) != EOK){
-                pq_release(arp_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
                 return NULL;
         }
@@ -619 +624 @@
         }
 }
-
-#ifdef CONFIG_NETWORKING_modular
-
-#include <il_standalone.h>
 
 /** Default thread for new connections.
@@ -650 +651 @@
                 
                 /* Process the message */
-                int res = il_module_message(callid, &call, &answer, &answer_count);
+                int res = il_module_message_standalone(callid, &call, &answer,
+                    &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -675 +677 @@
         
         /* Start the module */
-        if (ERROR_OCCURRED(il_module_start(il_client_connection)))
+        if (ERROR_OCCURRED(il_module_start_standalone(il_client_connection)))
                 return ERROR_CODE;
         
@@ -681 +683 @@
 }
 
-#endif /* CONFIG_NETWORKING_modular */
-
 /** @}
  */

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

@@ -48 +48 @@
 #include <net_interface.h>
 #include <packet/packet.h>
-#include <il_standalone.h>
+#include <il_local.h>
 
 #include "arp.h"
@@ -65 +65 @@
  *  @returns Other error codes as defined for the arp_message() function.
  */
-int il_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        return arp_message(callid, call, answer, answer_count);
+int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return arp_message_standalone(callid, call, answer, answer_count);
 }
 
@@ -76 +76 @@
  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
  */
-int il_module_start(async_client_conn_t client_connection){
+int il_module_start_standalone(async_client_conn_t client_connection){
         ERROR_DECLARE;
-
-        ipcarg_t phonehash;
-
+        
         async_set_client_connection(client_connection);
         arp_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
         ERROR_PROPAGATE(pm_init());
-        if(ERROR_OCCURRED(arp_initialize(client_connection))
-                || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))){
+        
+        ipcarg_t phonehash;
+        if (ERROR_OCCURRED(arp_initialize(client_connection))
+            || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))) {
                 pm_destroy();
                 return ERROR_CODE;
         }
-
+        
         async_manager();
-
+        
         pm_destroy();
         return EOK;

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

@@ -58 +58 @@
  *  @see IS_NET_ARP_MESSAGE()
  */
-int arp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
+int arp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
 #endif

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

@@ -69 +69 @@
 #include <adt/module_map.h>
 #include <packet/packet_client.h>
+#include <packet_remote.h>
 #include <nil_messages.h>
 #include <il_messages.h>
+#include <il_local.h>
+#include <ip_local.h>
 
 #include "ip.h"
@@ -424 +427 @@
 }
 
-int ip_device_req(int il_phone, device_id_t device_id, services_t netif){
+int ip_device_req_local(int il_phone, device_id_t device_id, services_t netif){
         ERROR_DECLARE;
 
@@ -656 +659 @@
 }
 
-int ip_send_msg(int il_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error){
+int ip_send_msg_local(int il_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error){
         ERROR_DECLARE;
 
@@ -782 +785 @@
 //                      sleep(1);
 //                      ERROR_PROPAGATE(arp_translate_req(netif->arp->phone, netif->device_id, SERVICE_IP, &destination, &translation, &data));
-                        pq_release(ip_globals.net_phone, packet_get_id(packet));
+                        pq_release_remote(ip_globals.net_phone, packet_get_id(packet));
                         return ERROR_CODE;
                 }
@@ -799 +802 @@
         }else translation = NULL;
         if(ERROR_OCCURRED(ip_prepare_packet(src, dest, packet, translation))){
-                pq_release(ip_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(ip_globals.net_phone, packet_get_id(packet));
         }else{
                 packet = ip_split_packet(packet, netif->packet_dimension.prefix, netif->packet_dimension.content, netif->packet_dimension.suffix, netif->packet_dimension.addr_len, error);
@@ -891 +894 @@
 }
 
-int ip_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int ip_message_standalone(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int * answer_count)
+{
         ERROR_DECLARE;
-
+        
         packet_t packet;
-        struct sockaddr * addr;
+        struct sockaddr *addr;
         size_t addrlen;
         size_t prefix;
         size_t suffix;
         size_t content;
-        ip_pseudo_header_ref header;
+        void *header;
         size_t headerlen;
         device_id_t device_id;
-
+        
         *answer_count = 0;
-        switch(IPC_GET_METHOD(*call)){
+        switch (IPC_GET_METHOD(*call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return EOK;
                 case NET_IL_DEVICE:
-                        return ip_device_req(0, IPC_GET_DEVICE(call), IPC_GET_SERVICE(call));
+                        return ip_device_req_local(0, IPC_GET_DEVICE(call),
+                            IPC_GET_SERVICE(call));
                 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_SEND:
-                        ERROR_PROPAGATE(packet_translate(ip_globals.net_phone, &packet, IPC_GET_PACKET(call)));
-                        return ip_send_msg(0, IPC_GET_DEVICE(call), packet, 0, IPC_GET_ERROR(call));
+                        ERROR_PROPAGATE(packet_translate_remote(ip_globals.net_phone, &packet,
+                            IPC_GET_PACKET(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:
-                        ERROR_PROPAGATE(packet_translate(ip_globals.net_phone, &packet, IPC_GET_PACKET(call)));
+                        ERROR_PROPAGATE(packet_translate_remote(ip_globals.net_phone, &packet,
+                            IPC_GET_PACKET(call)));
                         return ip_receive_message(IPC_GET_DEVICE(call), packet);
                 case NET_IP_RECEIVED_ERROR:
-                        ERROR_PROPAGATE(packet_translate(ip_globals.net_phone, &packet, IPC_GET_PACKET(call)));
-                        return ip_received_error_msg(0, IPC_GET_DEVICE(call), packet, IPC_GET_TARGET(call), IPC_GET_ERROR(call));
+                        ERROR_PROPAGATE(packet_translate_remote(ip_globals.net_phone, &packet,
+                            IPC_GET_PACKET(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(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(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:
                         ERROR_PROPAGATE(data_receive((void **) &addr, &addrlen));
-                        ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen,
-                            &device_id, &header, &headerlen));
+                        ERROR_PROPAGATE(ip_get_route_req_local(0, IP_GET_PROTOCOL(call),
+                            addr, (socklen_t) addrlen, &device_id, &header, &headerlen));
                         IPC_SET_DEVICE(answer, device_id);
                         IP_SET_HEADERLEN(answer, headerlen);
+                        
                         *answer_count = 2;
-                        if(! ERROR_OCCURRED(data_reply(&headerlen, sizeof(headerlen)))){
+                        
+                        if (!ERROR_OCCURRED(data_reply(&headerlen, sizeof(headerlen))))
                                 ERROR_CODE = data_reply(header, headerlen);
-                        }
+                        
                         free(header);
                         return ERROR_CODE;
                 case NET_IL_PACKET_SPACE:
-                        ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &suffix));
+                        ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call),
+                            &addrlen, &prefix, &content, &suffix));
                         IPC_SET_ADDR(answer, addrlen);
                         IPC_SET_PREFIX(answer, prefix);
@@ -948 +966 @@
                         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));
+        }
+        
         return ENOTSUP;
 }
 
-int ip_packet_size_req(int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension){
-        if(! packet_dimension){
+int ip_packet_size_req_local(int ip_phone, device_id_t device_id,
+    packet_dimension_ref packet_dimension)
+{
+        if (!packet_dimension)
                 return EBADMEM;
-        }
-        return ip_packet_size_message(device_id, &packet_dimension->addr_len, &packet_dimension->prefix, &packet_dimension->content, &packet_dimension->suffix);
+        
+        return ip_packet_size_message(device_id, &packet_dimension->addr_len,
+            &packet_dimension->prefix, &packet_dimension->content,
+            &packet_dimension->suffix);
 }
 
@@ -1003 +1027 @@
 }
 
-int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway){
+int ip_add_route_req_local(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway){
         ip_route_ref route;
         ip_netif_ref netif;
@@ -1067 +1091 @@
 }
 
-int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway){
+int ip_set_gateway_req_local(int ip_phone, device_id_t device_id, in_addr_t gateway)
+{
         ip_netif_ref netif;
 
@@ -1112 +1137 @@
                                         }
                                 }else{
-                                        pq_release(ip_globals.net_phone, packet_get_id(next));
+                                        pq_release_remote(ip_globals.net_phone, packet_get_id(next));
                                 }
                                 next = new_packet;
@@ -1153 +1178 @@
         }
         // create the last fragment
-        new_packet = packet_get_4(ip_globals.net_phone, prefix, length, suffix, ((addrlen > addr_len) ? addrlen : addr_len));
+        new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length, suffix, ((addrlen > addr_len) ? addrlen : addr_len));
         if(! new_packet){
                 return ENOMEM;
@@ -1177 +1202 @@
         // create middle framgents
         while(IP_TOTAL_LENGTH(header) > length){
-                new_packet = packet_get_4(ip_globals.net_phone, prefix, length, suffix, ((addrlen >= addr_len) ? addrlen : addr_len));
+                new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length, suffix, ((addrlen >= addr_len) ? addrlen : addr_len));
                 if(! new_packet){
                         return ENOMEM;
@@ -1357 +1382 @@
 }
 
-int ip_received_error_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error){
+/** 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.
+ *
+ */
+int ip_received_error_msg_local(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error){
         uint8_t * data;
         int offset;
@@ -1492 +1530 @@
         next = pq_detach(packet);
         if(next){
-                pq_release(ip_globals.net_phone, packet_get_id(next));
+                pq_release_remote(ip_globals.net_phone, packet_get_id(next));
         }
         if(! header){
@@ -1556 +1594 @@
 
 int ip_release_and_return(packet_t packet, int result){
-        pq_release(ip_globals.net_phone, packet_get_id(packet));
+        pq_release_remote(ip_globals.net_phone, packet_get_id(packet));
         return result;
 }
 
-int ip_get_route_req(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, ip_pseudo_header_ref * header, size_t * headerlen){
+int ip_get_route_req_local(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, void **header, size_t * headerlen){
         struct sockaddr_in * address_in;
 //      struct sockaddr_in6 *   address_in6;
@@ -1624 +1662 @@
         header_in->protocol = protocol;
         header_in->data_length = 0;
-        *header = (ip_pseudo_header_ref) header_in;
+        *header = header_in;
         return EOK;
 }
-
-#ifdef CONFIG_NETWORKING_modular
-
-#include <il_standalone.h>
 
 /** Default thread for new connections.
@@ -1658 +1692 @@
                 
                 /* Process the message */
-                int res = il_module_message(callid, &call, &answer, &answer_count);
+                int res = il_module_message_standalone(callid, &call, &answer,
+                    &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -1683 +1718 @@
         
         /* Start the module */
-        if (ERROR_OCCURRED(il_module_start(il_client_connection)))
+        if (ERROR_OCCURRED(il_module_start_standalone(il_client_connection)))
                 return ERROR_CODE;
         
@@ -1689 +1724 @@
 }
 
-#endif /* CONFIG_NETWORKING_modular */
-
 /** @}
  */

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

@@ -47 +47 @@
 #include <net_interface.h>
 #include <packet/packet.h>
-#include <il_standalone.h>
+#include <il_local.h>
 
 #include "ip.h"
@@ -54 +54 @@
 /** IP module global data.
  */
-extern ip_globals_t     ip_globals;
+extern ip_globals_t ip_globals;
 
 /** Processes the IP message.
@@ -64 +64 @@
  *  @returns Other error codes as defined for the ip_message() function.
  */
-int il_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        return ip_message(callid, call, answer, answer_count);
+int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return ip_message_standalone(callid, call, answer, answer_count);
 }
 
@@ -75 +75 @@
  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
  */
-int il_module_start(async_client_conn_t client_connection){
+int il_module_start_standalone(async_client_conn_t client_connection){
         ERROR_DECLARE;
-
-        ipcarg_t phonehash;
-
+        
         async_set_client_connection(client_connection);
         ip_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
         ERROR_PROPAGATE(pm_init());
-        if(ERROR_OCCURRED(ip_initialize(client_connection))
-                || ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))){
+        
+        ipcarg_t phonehash;
+        if (ERROR_OCCURRED(ip_initialize(client_connection))
+            || ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))) {
                 pm_destroy();
                 return ERROR_CODE;
         }
-
+        
         async_manager();
-
+        
         pm_destroy();
         return EOK;

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

@@ -59 +59 @@
  *  @see IS_NET_IP_MESSAGE()
  */
-int ip_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
+int ip_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
 #endif