Changes in uspace/srv/net/netif/lo/lo.c [774e6d1a:f87c900] in mainline

File:

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

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

@@ -49 +49 @@
 #include <net/device.h>
 #include <nil_interface.h>
-#include <netif_skel.h>
+#include <netif_interface.h>
+#include <netif_local.h>
 
 /** Default hardware address. */
-#define DEFAULT_ADDR  0
+#define DEFAULT_ADDR            "\0\0\0\0\0\0"
 
 /** Default address length. */
-#define DEFAULT_ADDR_LEN  6
+#define DEFAULT_ADDR_LEN        (sizeof(DEFAULT_ADDR) / sizeof(char))
 
 /** Loopback module name. */
@@ -61 +62 @@
 
 /** Network interface global data. */
-netif_globals_t netif_globals;
+netif_globals_t netif_globals;
 
 int netif_specific_message(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, size_t *count)
+    ipc_call_t *answer, int *answer_count)
 {
         return ENOTSUP;
@@ -73 +74 @@
         if (!address)
                 return EBADMEM;
-        
-        uint8_t *addr = (uint8_t *) malloc(DEFAULT_ADDR_LEN);
-        memset(addr, DEFAULT_ADDR, DEFAULT_ADDR_LEN);
-        
-        address->value = addr;
+
+        address->value = str_dup(DEFAULT_ADDR);
         address->length = DEFAULT_ADDR_LEN;
-        
+
         return EOK;
 }
@@ -171 +169 @@
 }
 
-int netif_probe_message(device_id_t device_id, int irq, void *io)
+int netif_probe_message(device_id_t device_id, int irq, uintptr_t io)
 {
         netif_device_t *device;
@@ -232 +230 @@
 }
 
+/** 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 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, answer_count);
+        }
+}
+
 int main(int argc, char *argv[])
 {
+        int rc;
+        
         /* Start the module */
-        return netif_module_start();
+        rc = netif_module_start(netif_client_connection);
+        return rc;
 }