Changes in uspace/srv/net/netif/lo/lo.c [19f857a:14f1db0] in mainline

File:

• uspace/srv/net/netif/lo/lo.c (modified) (10 diffs)

uspace/srv/net/netif/lo/lo.c

@@ -43 +43 @@
 #include <ipc/services.h>
 
-#include "../../err.h"
-#include "../../messages.h"
-#include "../../modules.h"
-
-#include "../../structures/measured_strings.h"
-#include "../../structures/packet/packet_client.h"
-
-#include "../../include/device.h"
-#include "../../include/nil_interface.h"
-
-#include "../../nil/nil_messages.h"
-
-#include "../netif.h"
-#include "../netif_module.h"
+#include <net_err.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <adt/measured_strings.h>
+#include <packet/packet_client.h>
+#include <net_device.h>
+#include <nil_interface.h>
+#include <nil_messages.h>
+#include <netif_interface.h>
+#include <netif_local.h>
 
 /** Default hardware address.
@@ -68 +64 @@
 /** Loopback module name.
  */
-#define NAME    "lo - loopback interface"
+#define NAME  "lo"
 
 /** Network interface global data.
@@ -80 +76 @@
  *  @returns EOK otherwise.
  */
-int change_state_message(device_ref device, device_state_t state);
+int change_state_message(netif_device_t * device, device_state_t state);
 
 /** Creates and returns the loopback network interface structure.
@@ -89 +85 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int create(device_id_t device_id, device_ref * device);
-
-/** Prints the module name.
- *  @see NAME
- */
-void module_print_name(void);
+int create(device_id_t device_id, netif_device_t * * device);
 
 int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
@@ -112 +103 @@
         ERROR_DECLARE;
 
-        device_ref device;
+        netif_device_t * device;
 
         if(! stats){
@@ -122 +113 @@
 }
 
-int change_state_message(device_ref device, device_state_t state){
-        if(device->state != state){
+int change_state_message(netif_device_t * device, device_state_t state)
+{
+        if (device->state != state) {
                 device->state = state;
-                printf("State changed to %s\n", (state == NETIF_ACTIVE) ? "ACTIVE" : "STOPPED");
+                
+                printf("%s: State changed to %s\n", NAME,
+                    (state == NETIF_ACTIVE) ? "active" : "stopped");
+                
                 return state;
         }
-        return EOK;
-}
-
-int create(device_id_t device_id, device_ref * device){
+        
+        return EOK;
+}
+
+int create(device_id_t device_id, netif_device_t * * device){
         int index;
 
-        if(device_map_count(&netif_globals.device_map) > 0){
+        if(netif_device_map_count(&netif_globals.device_map) > 0){
                 return EXDEV;
         }else{
-                *device = (device_ref) malloc(sizeof(device_t));
+                *device = (netif_device_t *) malloc(sizeof(netif_device_t));
                 if(!(*device)){
                         return ENOMEM;
@@ -150 +146 @@
                 (** device).nil_phone = -1;
                 (** device).state = NETIF_STOPPED;
-                index = device_map_add(&netif_globals.device_map, (** device).device_id, * device);
+                index = netif_device_map_add(&netif_globals.device_map, (** device).device_id, * device);
                 if(index < 0){
                         free(*device);
@@ -167 +163 @@
 }
 
-void module_print_name(void){
-        printf("%s", NAME);
-}
-
 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io){
         ERROR_DECLARE;
 
-        device_ref device;
+        netif_device_t * device;
 
         // create a new device
         ERROR_PROPAGATE(create(device_id, &device));
         // print the settings
-        printf("New device created:\n\tid\t= %d\n", device->device_id);
+        printf("%s: Device created (id: %d)\n", NAME, device->device_id);
         return EOK;
 }
@@ -186 +178 @@
         ERROR_DECLARE;
 
-        device_ref device;
+        netif_device_t * device;
         size_t length;
         packet_t next;
@@ -212 +204 @@
 }
 
-int netif_start_message(device_ref device){
+int netif_start_message(netif_device_t * device){
         return change_state_message(device, NETIF_ACTIVE);
 }
 
-int netif_stop_message(device_ref device){
+int netif_stop_message(netif_device_t * device){
         return change_state_message(device, NETIF_STOPPED);
 }
 
+/** Default thread for new connections.
+ *
+ * @param[in] iid The initial message identifier.
+ * @param[in] icall The initial message call structure.
+ *
+ */
+static void netif_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 = netif_module_message(NAME, 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);
+        }
+}
+
+int main(int argc, char *argv[])
+{
+        ERROR_DECLARE;
+        
+        /* Start the module */
+        if (ERROR_OCCURRED(netif_module_start(netif_client_connection)))
+                return ERROR_CODE;
+        
+        return EOK;
+}
+
 /** @}
  */