Changeset 7715994 in mainline for uspace/srv/net/net/net_standalone.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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 mainline changes.

File:

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

uspace/srv/net/net/net_standalone.c

@@ -53 +53 @@
 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( IS_NET_PACKET_MESSAGE( call )){
-                return packet_server_message( callid, call, answer, answer_count );
-        }else{
-                return net_message( callid, call, answer, answer_count );
+int net_initialize_build(async_client_conn_t client_connection){
+        ERROR_DECLARE;
+
+        task_id_t task_id;
+
+        task_id = spawn("/srv/ip");
+        if(! task_id){
+                return EINVAL;
         }
+        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_id, ip_connect_module));
+        if(! spawn("/srv/icmp")){
+                return EINVAL;
+        }
+        if(! spawn("/srv/udp")){
+                return EINVAL;
+        }
+        if(! spawn("/srv/tcp")){
+                return EINVAL;
+        }
+        return EOK;
 }
 
-int net_initialize_build( async_client_conn_t client_connection ){
-        ERROR_DECLARE;
-
-        task_id_t       task_id;
-
-        task_id = spawn( "/srv/ip" );
-        if( ! task_id ) return EINVAL;
-        ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_id, ip_connect_module ));
-        if( ! spawn( "/srv/icmp" )) return EINVAL;
-        if( ! spawn( "/srv/udp" )) return EINVAL;
-        if( ! spawn( "/srv/tcp" )) return EINVAL;
-        return EOK;
+int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * 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);
+        }
 }