Changes in uspace/srv/net/net/net_bundle.c [01a9ef5:a64c64d] in mainline

File:

• uspace/srv/net/net/net_bundle.c (modified) (1 diff)

uspace/srv/net/net/net_bundle.c

@@ -60 +60 @@
 extern net_globals_t    net_globals;
 
-int module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ){
-        if(( IPC_GET_METHOD( * call ) == IPC_M_CONNECT_TO_ME )
-        || IS_NET_IL_MESSAGE( call )
-        || IS_NET_TL_MESSAGE( call )
-        || IS_NET_SOCKET_MESSAGE( call )){
-                switch( IPC_GET_TARGET( call )){
+int net_initialize_build(async_client_conn_t client_connection){
+        ERROR_DECLARE;
+
+        ipcarg_t phonehash;
+
+        ERROR_PROPAGATE(REGISTER_ME(SERVICE_IP, &phonehash));
+        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_get_id(), ip_connect_module));
+        ERROR_PROPAGATE(ip_initialize(client_connection));
+        ERROR_PROPAGATE(REGISTER_ME(SERVICE_ARP, &phonehash));
+        ERROR_PROPAGATE(arp_initialize(client_connection));
+        ERROR_PROPAGATE(REGISTER_ME(SERVICE_ICMP, &phonehash));
+        ERROR_PROPAGATE(icmp_initialize(client_connection));
+        ERROR_PROPAGATE(REGISTER_ME(SERVICE_UDP, &phonehash));
+        ERROR_PROPAGATE(udp_initialize(client_connection));
+        ERROR_PROPAGATE(REGISTER_ME(SERVICE_TCP, &phonehash));
+        ERROR_PROPAGATE(tcp_initialize(client_connection));
+        return EOK;
+}
+
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        if((IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME)
+                || IS_NET_IL_MESSAGE(call)
+                || IS_NET_TL_MESSAGE(call)
+                || IS_NET_SOCKET_MESSAGE(call)){
+                switch(IPC_GET_TARGET(call)){
                         case SERVICE_IP:
-                                return ip_message( callid, call, answer, answer_count );
+                                return ip_message(callid, call, answer, answer_count);
                         case SERVICE_ARP:
-                                return arp_message( callid, call, answer, answer_count );
+                                return arp_message(callid, call, answer, answer_count);
                         case SERVICE_ICMP:
-                                return icmp_message( callid, call, answer, answer_count );
+                                return icmp_message(callid, call, answer, answer_count);
                         case SERVICE_UDP:
-                                return udp_message( callid, call, answer, answer_count );
+                                return udp_message(callid, call, answer, answer_count);
                         case SERVICE_TCP:
-                                return tcp_message( callid, call, answer, answer_count );
+                                return tcp_message(callid, call, answer, answer_count);
                         default:
                                 return EINVAL;
                 }
-        }else if( IS_NET_IP_MESSAGE( call )){
-                return ip_message( callid, call, answer, answer_count );
-        }else if( IS_NET_ARP_MESSAGE( call )){
-                return arp_message( callid, call, answer, answer_count );
-        }else if( IS_NET_ICMP_MESSAGE( call )){
-                return icmp_message( callid, call, answer, answer_count );
-        }else if( IS_NET_UDP_MESSAGE( call )){
-                return udp_message( callid, call, answer, answer_count );
-        }else if( IS_NET_TCP_MESSAGE( call )){
-                return tcp_message( callid, call, answer, answer_count );
+        }else if(IS_NET_IP_MESSAGE(call)){
+                return ip_message(callid, call, answer, answer_count);
+        }else if(IS_NET_ARP_MESSAGE(call)){
+                return arp_message(callid, call, answer, answer_count);
+        }else if(IS_NET_ICMP_MESSAGE(call)){
+                return icmp_message(callid, call, answer, answer_count);
+        }else if(IS_NET_UDP_MESSAGE(call)){
+                return udp_message(callid, call, answer, answer_count);
+        }else if(IS_NET_TCP_MESSAGE(call)){
+                return tcp_message(callid, call, answer, answer_count);
         }else{
-                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, answer_count);
                 }else{
-                        return net_message( callid, call, answer, answer_count );
+                        return net_message(callid, call, answer, answer_count);
                 }
         }
 }
 
-int net_initialize_build( async_client_conn_t client_connection ){
-        ERROR_DECLARE;
-
-        ipcarg_t        phonehash;
-
-        ERROR_PROPAGATE( REGISTER_ME( SERVICE_IP, & phonehash ));
-        ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_get_id(), ip_connect_module ));
-        ERROR_PROPAGATE( ip_initialize( client_connection ));
-        ERROR_PROPAGATE( REGISTER_ME( SERVICE_ARP, & phonehash ));
-        ERROR_PROPAGATE( arp_initialize( client_connection ));
-        ERROR_PROPAGATE( REGISTER_ME( SERVICE_ICMP, & phonehash ));
-        ERROR_PROPAGATE( icmp_initialize( client_connection ));
-        ERROR_PROPAGATE( REGISTER_ME( SERVICE_UDP, & phonehash ));
-        ERROR_PROPAGATE( udp_initialize( client_connection ));
-        ERROR_PROPAGATE( REGISTER_ME( SERVICE_TCP, & phonehash ));
-        ERROR_PROPAGATE( tcp_initialize( client_connection ));
-        return EOK;
-}
-
 /** @}
  */