Changeset b86a32e in mainline for uspace/srv/net/loopip/loopip.c

Timestamp:

2013-07-15T12:14:55Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

c84146d3

Parents:

87159eb8 (diff), 956d4281 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline changes.

File:

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

uspace/srv/net/loopip/loopip.c

@@ -40 +40 @@
 #include <inet/iplink_srv.h>
 #include <inet/addr.h>
+#include <net/socket_codes.h>
 #include <io/log.h>
 #include <loc.h>
@@ -50 +51 @@
 static int loopip_close(iplink_srv_t *srv);
 static int loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
+static int loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
 static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
+static int loopip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
 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);
@@ -60 +63 @@
         .close = loopip_close,
         .send = loopip_send,
+        .send6 = loopip_send6,
         .get_mtu = loopip_get_mtu,
+        .get_mac48 = loopip_get_mac48,
         .addr_add = loopip_addr_add,
         .addr_remove = loopip_addr_remove
@@ -162 +167 @@
         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));
         if (rqe == NULL)
@@ -180 +174 @@
          * Clone SDU
          */
-        rqe->af = src_af;
+        rqe->af = AF_INET;
         rqe->sdu.data = malloc(sdu->size);
         if (rqe->sdu.data == NULL) {
@@ -198 +192 @@
 }
 
+static int loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip6_send()");
+        
+        rqueue_entry_t *rqe = calloc(1, sizeof(rqueue_entry_t));
+        if (rqe == NULL)
+                return ENOMEM;
+        
+        /*
+         * Clone SDU
+         */
+        rqe->af = AF_INET6;
+        rqe->sdu.data = malloc(sdu->size);
+        if (rqe->sdu.data == NULL) {
+                free(rqe);
+                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;
+}
+
 static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
@@ -203 +226 @@
         *mtu = 1500;
         return EOK;
+}
+
+static int loopip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mac48()");
+        return ENOTSUP;
 }