Changeset fe8dfa6 in mainline for uspace/lib/net/nil/nil_skel.c

Timestamp:

2011-01-11T15:57:39Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

77429d3

Parents:

04aade50

Message:

networking: streamline NIL skeleton and NIL modules (nildummy, eth)

File:

• uspace/lib/net/nil/nil_skel.c (moved) (moved from uspace/srv/net/nil/nildummy/nildummy_module.c ) (3 diffs)

uspace/lib/net/nil/nil_skel.c

@@ -27 +27 @@
  */
 
-/** @addtogroup nildummy
+/** @addtogroup libnet
  * @{
  */
 
 /** @file
- *  Dummy network interface layer module stub.
- *  @see module.c
+ * Network network interface layer module implementation.
+ * @see nil_skel.h
  */
 
-#include <async.h>
-#include <stdio.h>
+#include <bool.h>
 #include <errno.h>
+#include <nil_skel.h>
+#include <net_interface.h>
+#include <net/modules.h>
 
-#include <ipc/ipc.h>
-#include <ipc/services.h>
+/** Default thread for new connections.
+ *
+ * @param[in] iid   The initial message identifier.
+ * @param[in] icall The initial message call structure.
+ *
+ */
+static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+        /*
+         * Accept the connection by answering
+         * the initial IPC_M_CONNECT_ME_TO call.
+         */
+        ipc_answer_0(iid, EOK);
+        
+        while (true) {
+                ipc_call_t answer;
+                size_t count;
+                
+                /* Clear the answer structure */
+                refresh_answer(&answer, &count);
+                
+                /* Fetch the next message */
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                /* Process the message */
+                int res = nil_module_message(callid, &call, &answer,
+                    &count);
+                
+                /*
+                 * End if told to either by the message or the processing
+                 * result.
+                 */
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                    (res == EHANGUP))
+                        return;
+                
+                /* Answer the message */
+                answer_call(callid, res, &answer, count);
+        }
+}
 
-#include <net/modules.h>
-#include <net_interface.h>
-#include <net/packet.h>
-#include <nil_local.h>
-
-#include "nildummy.h"
-
-int nil_module_start_standalone(async_client_conn_t client_connection)
+/** Start the network interface layer module.
+ *
+ * Initialize the client connection serving function, initialize
+ * the module, register the module service and start the async
+ * manager, processing IPC messages in an infinite loop.
+ *
+ * @param[in] service Service identification.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the pm_init() function.
+ * @return Other error codes as defined for the nil_initialize()
+ *         function.
+ * @return Other error codes as defined for the REGISTER_ME() macro
+ *         function.
+ *
+ */
+int nil_module_start(int service)
 {
-        sysarg_t phonehash;
-        int rc;
-        
-        async_set_client_connection(client_connection);
+        async_set_client_connection(nil_client_connection);
         int net_phone = net_connect_module();
         
-        rc = pm_init();
+        int rc = pm_init();
         if (rc != EOK)
                 return rc;
-        
         
         rc = nil_initialize(net_phone);
@@ -67 +113 @@
                 goto out;
         
-        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NILDUMMY, 0, 0, &phonehash);
+        sysarg_t phonehash;
+        rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;
         
         async_manager();
-
+        
 out:
         pm_destroy();
@@ -78 +125 @@
 }
 
-int nil_module_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, size_t *count)
-{
-        return nil_message_standalone(name, callid, call, answer, count);
-}
-
 /** @}
  */