Changeset 89c57b6 in mainline for uspace/srv/net/net/net_standalone.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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) (3 diffs)

uspace/srv/net/net/net_standalone.c

@@ -28 +28 @@
 
 /** @addtogroup net
- *  @{
+ * @{
  */
 
 /** @file
- *  Wrapper for the standalone networking module.
+ * Wrapper for the standalone networking module.
  */
-
-#include <str.h>
-
-#include <ipc/ipc.h>
-
-#include <net_messages.h>
-#include <ip_interface.h>
-#include <adt/measured_strings.h>
-#include <adt/module_map.h>
-#include <packet/packet_server.h>
 
 #include "net.h"
 
-/** Networking module global data.
- */
+#include <str.h>
+#include <adt/measured_strings.h>
+#include <adt/module_map.h>
+#include <ipc/net.h>
+#include <errno.h>
+
+#include <ip_interface.h>
+#include <packet_server.h>
+
+/** Networking module global data. */
 extern net_globals_t net_globals;
 
@@ -60 +58 @@
  *
  */
-int net_initialize_build(async_client_conn_t client_connection){
-        ERROR_DECLARE;
+int net_initialize_build(async_client_conn_t client_connection)
+{
+        int rc;
         
-        task_id_t task_id = spawn("/srv/ip");
+        task_id_t task_id = net_spawn((uint8_t *) "/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));
+        rc = add_module(NULL, &net_globals.modules, (uint8_t *) IP_NAME,
+            (uint8_t *) IP_FILENAME, SERVICE_IP, task_id, ip_connect_module);
+        if (rc != EOK)
+                return rc;
         
-        if (!spawn("/srv/icmp"))
+        if (!net_spawn((uint8_t *) "/srv/icmp"))
                 return EINVAL;
         
-        if (!spawn("/srv/udp"))
+        if (!net_spawn((uint8_t *) "/srv/udp"))
                 return EINVAL;
         
-        if (!spawn("/srv/tcp"))
+        if (!net_spawn((uint8_t *) "/srv/tcp"))
                 return EINVAL;
         
@@ -94 +95 @@
  * @return EOK on success.
  * @return ENOTSUP if the message is not known.
- * @return Other error codes as defined for each bundled module
- *         message function.
+ * @return Other error codes.
  *
  */
 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);
 }