Changeset 849ed54 in mainline for uspace/srv/net/nil/nildummy

Timestamp:

2010-03-30T18:39:04Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7553689

Parents:

7d6fe4db

Message:

Networking work:
Split the networking stack into end-user library (libsocket) and two helper libraries (libnet and libnetif).
Don't use over-the-hand compiling and linking, but rather separation of conserns.
There might be still some issues and the non-modular networking architecture is currently broken, but this will be fixed soon.

Location:

uspace/srv/net/nil/nildummy

Files:

• Makefile (modified) (1 diff)
• nildummy.c (modified) (2 diffs)
• nildummy.h (modified) (1 diff)
• nildummy_module.c (modified) (3 diffs)

uspace/srv/net/nil/nildummy/Makefile

@@ -28 +28 @@
 #
 
-NET_BASE = ../..
 USPACE_PREFIX = ../../../..
+LIBS = $(LIBNETIF_PREFIX)/libnetif.a $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
+EXTRA_CFLAGS = -I$(LIBNETIF_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
 BINARY = nildummy
 
 SOURCES = \
         nildummy.c \
-        nildummy_module.c \
-        $(NET_BASE)/module.c \
-        $(NET_BASE)/modules.c \
-        $(NET_BASE)/net/net_remote.c \
-        $(NET_BASE)/netif/netif_remote.c \
-        $(NET_BASE)/structures/measured_strings.c \
-        $(NET_BASE)/structures/packet/packet.c \
-        $(NET_BASE)/structures/packet/packet_client.c \
-        $(NET_BASE)/structures/packet/packet_remote.c
+        nildummy_module.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/net/nil/nildummy/nildummy.c

@@ -45 +45 @@
 #include <ipc/services.h>
 
-#include "../../err.h"
-#include "../../messages.h"
-#include "../../modules.h"
-
-#include "../../include/device.h"
-#include "../../include/netif_interface.h"
-#include "../../include/nil_interface.h"
-#include "../../include/il_interface.h"
-
-#include "../../structures/measured_strings.h"
-#include "../../structures/packet/packet.h"
-
-#include "../nil_module.h"
+#include <net_err.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <net_device.h>
+#include <netif_interface.h>
+#include <nil_interface.h>
+#include <il_interface.h>
+#include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <nil_module.h>
 
 #include "nildummy.h"
+
+/** The module name.
+ */
+#define NAME    "Dummy nil protocol"
 
 /** Default maximum transmission unit.
@@ -373 +374 @@
 }
 
+#ifdef CONFIG_NETWORKING_modular
+
+#include <nil_standalone.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
+         *  - Answer the first IPC_M_CONNECT_ME_TO call.
+         */
+        ipc_answer_0(iid, EOK);
+        
+        while(true) {
+                ipc_call_t answer;
+                int answer_count;
+                
+                /* Clear the answer structure */
+                refresh_answer(&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, &answer_count);
+                
+                /* End if said to either by the message or the processing result */
+                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+                        return;
+                
+                /* Answer the message */
+                answer_call(callid, res, &answer, answer_count);
+        }
+}
+
+/** Starts the module.
+ *
+ *  @param argc The count of the command line arguments. Ignored parameter.
+ *  @param argv The command line parameters. Ignored parameter.
+ *
+ *  @returns EOK on success.
+ *  @returns Other error codes as defined for each specific module start function.
+ *
+ */
+int main(int argc, char *argv[])
+{
+        ERROR_DECLARE;
+        
+        /* Print the module label */
+        printf("Task %d - %s\n", task_get_id(), NAME);
+        
+        /* Start the module */
+        if (ERROR_OCCURRED(nil_module_start(nil_client_connection))) {
+                printf(" - ERROR %i\n", ERROR_CODE);
+                return ERROR_CODE;
+        }
+        
+        return EOK;
+}
+
+#endif /* CONFIG_NETWORKING_modular */
+
 /** @}
  */

uspace/srv/net/nil/nildummy/nildummy.h

@@ -41 +41 @@
 #include <ipc/services.h>
 
-#include "../../include/device.h"
-#include "../../structures/measured_strings.h"
+#include <net_device.h>
+#include <adt/measured_strings.h>
 
 /** Type definition of the dummy nil global data.

uspace/srv/net/nil/nildummy/nildummy_module.c

@@ -42 +42 @@
 #include <ipc/services.h>
 
-#include "../../err.h"
-#include "../../modules.h"
-
-#include "../../include/net_interface.h"
-
-#include "../../structures/packet/packet.h"
-
-#include "../nil_module.h"
+#include <net_err.h>
+#include <net_modules.h>
+#include <net_interface.h>
+#include <packet/packet.h>
+#include <nil_module.h>
+#include <nil_standalone.h>
 
 #include "nildummy.h"
-
-/** The module name.
- */
-#define NAME    "Dummy nil protocol"
-
-/** Prints the module name.
- */
-void module_print_name(void);
 
 /** Starts the dummy nil module.
@@ -69 +59 @@
  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
  */
-int module_start(async_client_conn_t client_connection);
-
-/** Passes the parameters to the module specific nil_message() function.
- *  @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.
- *  @returns EOK on success.
- *  @returns ENOTSUP if the message is not known.
- *  @returns Other error codes as defined for each specific module message function.
- */
-int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
-
-void module_print_name(void){
-        printf("%s", NAME);
-}
-
-int module_start(async_client_conn_t client_connection){
+int nil_module_start(async_client_conn_t client_connection){
         ERROR_DECLARE;
 
@@ -107 +80 @@
 }
 
-int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+/** Passes the parameters to the module specific nil_message() function.
+ *  @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.
+ *  @returns EOK on success.
+ *  @returns ENOTSUP if the message is not known.
+ *  @returns Other error codes as defined for each specific module message function.
+ */
+int nil_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
         return nil_message(callid, call, answer, answer_count);
 }