Changes in uspace/srv/net/loopip/loopip.c [02a09ed:a1a101d] in mainline

File:

• uspace/srv/net/loopip/loopip.c (modified) (9 diffs)

uspace/srv/net/loopip/loopip.c

@@ -39 +39 @@
 #include <errno.h>
 #include <inet/iplink_srv.h>
-#include <inet/addr.h>
 #include <io/log.h>
 #include <loc.h>
@@ -45 +44 @@
 #include <stdlib.h>
 
-#define NAME  "loopip"
+#define NAME "loopip"
 
 static int loopip_open(iplink_srv_t *srv);
 static int loopip_close(iplink_srv_t *srv);
-static int loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
+static int loopip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu);
 static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static int loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
-static int loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
+static int loopip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr);
+static int loopip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr);
 
 static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -70 +69 @@
 typedef struct {
         link_t link;
-        
-        uint16_t af;
-        iplink_recv_sdu_t sdu;
+        iplink_srv_sdu_t sdu;
 } rqueue_entry_t;
 
@@ -80 +77 @@
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_recv_fibril(): Wait for one item");
                 link_t *link = prodcons_consume(&loopip_rcv_queue);
-                rqueue_entry_t *rqe =
-                    list_get_instance(link, rqueue_entry_t, link);
-                
-                (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu, rqe->af);
-                
-                free(rqe->sdu.data);
-                free(rqe);
-        }
+                rqueue_entry_t *rqe = list_get_instance(link, rqueue_entry_t, link);
+
+                (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu);
+        }
+
+        return 0;
+}
+
+static int loopip_init(void)
+{
+        int rc;
+        service_id_t sid;
+        category_id_t iplink_cat;
+        const char *svc_name = "net/loopback";
         
-        return 0;
-}
-
-static int loopip_init(void)
-{
         async_set_client_connection(loopip_client_conn);
         
-        int rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
                 return rc;
         }
-        
+
         iplink_srv_init(&loopip_iplink);
         loopip_iplink.ops = &loopip_iplink_ops;
         loopip_iplink.arg = NULL;
-        
+
         prodcons_initialize(&loopip_rcv_queue);
-        
-        const char *svc_name = "net/loopback";
-        service_id_t sid;
+
         rc = loc_service_register(svc_name, &sid);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.",
-                    svc_name);
-                return rc;
-        }
-        
-        category_id_t iplink_cat;
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name);
+                return rc;
+        }
+
         rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -123 +117 @@
                 return rc;
         }
-        
+
         rc = loc_service_add_to_cat(sid, iplink_cat);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.",
-                    svc_name);
-                return rc;
-        }
-        
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name);
+                return rc;
+        }
+
         fid_t fid = fibril_create(loopip_recv_fibril, NULL);
         if (fid == 0)
                 return ENOMEM;
-        
+
         fibril_add_ready(fid);
-        
+
         return EOK;
 }
@@ -158 +151 @@
 }
 
-static int loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
-{
+static int loopip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu)
+{
+        rqueue_entry_t *rqe;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_send()");
-        
-        addr32_t src_v4;
-        addr128_t src_v6;
-        uint16_t src_af = inet_addr_get(&sdu->src, &src_v4, &src_v6);
-        
-        addr32_t dest_v4;
-        addr128_t dest_v6;
-        uint16_t dest_af = inet_addr_get(&sdu->dest, &dest_v4, &dest_v6);
-        
-        if (src_af != dest_af)
-                return EINVAL;
-        
-        rqueue_entry_t *rqe = calloc(1, sizeof(rqueue_entry_t));
+
+        rqe = calloc(1, sizeof(rqueue_entry_t));
         if (rqe == NULL)
                 return ENOMEM;
-        
         /*
          * Clone SDU
          */
-        rqe->af = src_af;
+        rqe->sdu.lsrc = sdu->ldest;
+        rqe->sdu.ldest = sdu->lsrc;
         rqe->sdu.data = malloc(sdu->size);
         if (rqe->sdu.data == NULL) {
@@ -186 +170 @@
                 return ENOMEM;
         }
-        
+
         memcpy(rqe->sdu.data, sdu->data, sdu->size);
         rqe->sdu.size = sdu->size;
-        
+
         /*
          * Insert to receive queue
          */
         prodcons_produce(&loopip_rcv_queue, &rqe->link);
-        
+
         return EOK;
 }
@@ -205 +189 @@
 }
 
-static int loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
-{
-        return EOK;
-}
-
-static int loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
-{
+static int loopip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_add(0x%" PRIx32 ")", addr->ipv4);
+        return EOK;
+}
+
+static int loopip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
         return EOK;
 }
@@ -217 +203 @@
 int main(int argc, char *argv[])
 {
-        printf("%s: HelenOS loopback IP link provider\n", NAME);
-        
-        int rc = log_init(NAME);
-        if (rc != EOK) {
-                printf("%s: Failed to initialize logging.\n", NAME);
-                return rc;
-        }
-        
+        int rc;
+
+        printf(NAME ": HelenOS loopback IP link provider\n");
+
+        if (log_init(NAME) != EOK) {
+                printf(NAME ": Failed to initialize logging.\n");
+                return 1;
+        }
+
         rc = loopip_init();
         if (rc != EOK)
-                return rc;
-        
-        printf("%s: Accepting connections.\n", NAME);
+                return 1;
+
+        printf(NAME ": Accepting connections.\n");
         task_retval(0);
         async_manager();
-        
+
         /* Not reached */
         return 0;