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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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

@@ -49 +49 @@
 /** Networking module global data.
  */
-extern net_globals_t    net_globals;
+extern net_globals_t net_globals;
 
+/** Initialize the networking module for the chosen subsystem build type.
+ *
+ *  @param[in] client_connection The client connection processing function.
+ *                               The module skeleton propagates its own one.
+ *
+ *  @return EOK on success.
+ *  @return ENOMEM if there is not enough memory left.
+ *
+ */
 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){
+        
+        task_id_t 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")){
+        
+        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")){
+        
+        if (!spawn("/srv/udp"))
                 return EINVAL;
-        }
-        if(! spawn("/srv/tcp")){
+        
+        if (!spawn("/srv/tcp"))
                 return EINVAL;
-        }
+        
         return EOK;
 }
 
-int net_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        if(IS_NET_PACKET_MESSAGE(call)){
+/** Process the module message.
+ *
+ * Distribute the message to the right module.
+ *
+ * @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 in
+ *                          the answer parameter.
+ *
+ * @return EOK on success.
+ * @return ENOTSUP if the message is not known.
+ * @return Other error codes as defined for each bundled module
+ *         message function.
+ *
+ */
+int net_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);
-        }
+        
+        return net_message(callid, call, answer, answer_count);
 }