Changeset 14f1db0 in mainline for uspace/lib/net/netif

Timestamp:

2010-04-09T12:54:57Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a1caa3c2

Parents:

24ab58b3

Message:

networking overhaul:

• separation of conserns
• removal of (almost all) overlaping symbols, libnetif is not needed anymore
• again, it is possible to build the networking in multiple architecture configurations (however, currently only the bundling netif and nil layers is supported, more to come)
• code style updates and fixes (still a huge amount of work to do)

Location:

uspace/lib/net/netif

Files:

• netif.c (deleted)
• netif_local.c (added)
• netif_nil_bundle.c (modified) (2 diffs)
• netif_remote.c (moved) (moved from uspace/lib/netif/generic/netif_remote.c ) (2 diffs)
• netif_standalone.c (deleted)

uspace/lib/net/netif/netif_nil_bundle.c

@@ -41 +41 @@
 #include <net_messages.h>
 #include <packet/packet.h>
-#include <nil_module.h>
 #include <netif_nil_bundle.h>
-#include <netif.h>
+#include <netif_local.h>
+#include <nil_local.h>
 
 /** Distribute the messages between the module parts.
@@ -62 +62 @@
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
-        if (IS_NET_NIL_MESSAGE(call)
+        if ((IS_NET_NIL_MESSAGE(call))
             || (IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME))
-                return nil_message(name, callid, call, answer, answer_count);
+                return nil_message_standalone(name, callid, call, answer,
+                    answer_count);
         else
-                return netif_message(name, callid, call, answer, answer_count);
+                return netif_module_message_standalone(name, callid, call, answer,
+                    answer_count);
 }
 
-/** Starts the bundle network interface module.
- *  Initializes the client connection serving function, initializes both module parts, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
- *  @param[in] client_connection The client connection processing function. The module skeleton propagates its own one.
- *  @returns EOK on success.
- *  @returns Other error codes as defined for each specific module message function.
+/** Start the bundle network interface module.
+ *
+ * Initialize the client connection serving function, initialize
+ * both module parts, register the module service and start the
+ * async manager, processing IPC messages in an infinite loop.
+ *
+ * @param[in] client_connection The client connection processing
+ *                              function. The module skeleton propagates
+ *                              its own one.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for each specific module message
+ *         function.
+ *
  */
-int netif_nil_module_start(async_client_conn_t client_connection){
+int netif_nil_module_start(async_client_conn_t client_connection)
+{
         ERROR_DECLARE;
-
+        
         ERROR_PROPAGATE(netif_init_module(client_connection));
-        if(ERROR_OCCURRED(nil_initialize(netif_globals.net_phone))){
+        if (ERROR_OCCURRED(nil_initialize(netif_globals.net_phone))) {
                 pm_destroy();
                 return ERROR_CODE;
         }
-        return netif_run_module();
+        
+        async_manager();
+        
+        pm_destroy();
+        return EOK;
 }
 

uspace/lib/net/netif/netif_remote.c

@@ -28 +28 @@
 
 /** @addtogroup netif
- *  @{
+ * @{
  */
 
 /** @file
- *  Network interface module interface implementation for standalone remote modules.
- *  @see netif_interface.h
+ * Network interface module interface implementation for remote modules.
  */
 
@@ -43 +42 @@
 #include <packet/packet_client.h>
 #include <net_device.h>
-#include <netif_interface.h>
+#include <netif_remote.h>
 #include <netif_messages.h>
 
-int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data){
-        return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id, address, data);
+int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
+    measured_string_ref *address, char **data)
+{
+        return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id,
+            address, data);
 }
 
-int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io){
+int netif_probe_req_remote(int netif_phone, device_id_t device_id, int irq, int io)
+{
         return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, io);
 }
 
-int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender){
-        return generic_send_msg(netif_phone, NET_NETIF_SEND, device_id, packet_get_id(packet), sender, 0);
+int netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t packet,
+    services_t sender)
+{
+        return generic_send_msg_remote(netif_phone, NET_NETIF_SEND, device_id,
+            packet_get_id(packet), sender, 0);
 }
 
-int netif_start_req(int netif_phone, device_id_t device_id){
+int netif_start_req_remote(int netif_phone, device_id_t device_id)
+{
         return async_req_1_0(netif_phone, NET_NETIF_START, device_id);
 }
 
-int netif_stop_req(int netif_phone, device_id_t device_id){
+int netif_stop_req_remote(int netif_phone, device_id_t device_id)
+{
         return async_req_1_0(netif_phone, NET_NETIF_STOP, device_id);
 }
 
-int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats){
-        aid_t message_id;
+int netif_stats_req_remote(int netif_phone, device_id_t device_id,
+    device_stats_ref stats)
+{
+        if (!stats)
+                return EBADMEM;
+        
+        aid_t message_id = async_send_1(netif_phone, NET_NETIF_STATS,
+            (ipcarg_t) device_id, NULL);
+        async_data_read_start(netif_phone, stats, sizeof(*stats));
+        
         ipcarg_t result;
-
-        if(! stats){
-                return EBADMEM;
-        }
-        message_id = async_send_1(netif_phone, NET_NETIF_STATS, (ipcarg_t) device_id, NULL);
-        async_data_read_start(netif_phone, stats, sizeof(*stats));
         async_wait_for(message_id, &result);
+        
         return (int) result;
 }
 
-int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver){
+int netif_bind_service_remote(services_t service, device_id_t device_id, services_t me,
+    async_client_conn_t receiver)
+{
         return bind_service(service, device_id, me, 0, receiver);
 }