Changeset 47f5a77 in mainline

Timestamp:

2013-07-17T08:46:06Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (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 mainline changes

Files:

• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (2 diffs)
• kernel/genarch/src/drivers/am335x/timer.c (modified) (1 diff)
• uspace/app/mkmfs/mkmfs.c (modified) (1 diff)
• uspace/app/ping6/ping6.c (modified) (1 diff)
• uspace/drv/block/ata_bd/main.c (modified) (1 diff)
• uspace/drv/char/ns8250/ns8250.c (modified) (7 diffs)
• uspace/lib/c/generic/inet/addr.c (modified) (4 diffs)
• uspace/lib/c/generic/inetping6.c (modified) (3 diffs)
• uspace/lib/c/generic/iplink.c (modified) (3 diffs)
• uspace/lib/c/generic/iplink_srv.c (modified) (7 diffs)
• uspace/lib/c/generic/net/socket_parse.c (modified) (1 diff)
• uspace/lib/c/include/inet/addr.h (modified) (3 diffs)
• uspace/lib/c/include/inet/iplink.h (modified) (3 diffs)
• uspace/lib/c/include/inet/iplink_srv.h (modified) (1 diff)
• uspace/lib/c/include/ipc/iplink.h (modified) (1 diff)
• uspace/srv/net/dnsrsrv/dns_std.h (modified) (1 diff)
• uspace/srv/net/ethip/ethip.c (modified) (4 diffs)
• uspace/srv/net/ethip/pdu.c (modified) (1 diff)
• uspace/srv/net/inetsrv/Makefile (modified) (1 diff)
• uspace/srv/net/inetsrv/addrobj.c (modified) (3 diffs)
• uspace/srv/net/inetsrv/icmp.c (modified) (1 diff)
• uspace/srv/net/inetsrv/icmpv6.c (modified) (7 diffs)
• uspace/srv/net/inetsrv/icmpv6_std.h (modified) (5 diffs)
• uspace/srv/net/inetsrv/inet_link.c (modified) (7 diffs)
• uspace/srv/net/inetsrv/inet_link.h (modified) (1 diff)
• uspace/srv/net/inetsrv/inet_std.h (modified) (3 diffs)
• uspace/srv/net/inetsrv/inetping6.c (modified) (2 diffs)
• uspace/srv/net/inetsrv/inetsrv.c (modified) (2 diffs)
• uspace/srv/net/inetsrv/inetsrv.h (modified) (2 diffs)
• uspace/srv/net/inetsrv/ndp.c (added)
• uspace/srv/net/inetsrv/ndp.h (added)
• uspace/srv/net/inetsrv/ntrans.c (added)
• uspace/srv/net/inetsrv/ntrans.h (added)
• uspace/srv/net/inetsrv/pdu.c (modified) (8 diffs)
• uspace/srv/net/inetsrv/pdu.h (modified) (2 diffs)
• uspace/srv/net/loopip/loopip.c (modified) (7 diffs)
• uspace/srv/net/slip/slip.c (modified) (5 diffs)
• uspace/srv/net/tcp/conn.c (modified) (3 diffs)
• uspace/srv/net/tcp/pdu.c (modified) (1 diff)
• uspace/srv/net/tcp/sock.c (modified) (6 diffs)
• uspace/srv/net/tcp/std.h (modified) (3 diffs)
• uspace/srv/net/tcp/tcp.c (modified) (1 diff)
• uspace/srv/net/tcp/tqueue.c (modified) (1 diff)
• uspace/srv/net/tcp/ucall.c (modified) (1 diff)
• uspace/srv/net/udp/assoc.c (modified) (1 diff)
• uspace/srv/net/udp/pdu.c (modified) (1 diff)
• uspace/srv/net/udp/sock.c (modified) (5 diffs)
• uspace/srv/net/udp/std.h (modified) (3 diffs)

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -177 +177 @@
 {
         const unsigned inum = am335x_irc_inum_get(bbone.irc_addr);
-        am335x_irc_irq_ack(bbone.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -187 +186 @@
                 printf("Spurious interrupt\n");
         }
+
+        am335x_irc_irq_ack(bbone.irc_addr);
 }
 

kernel/genarch/src/drivers/am335x/timer.c

@@ -119 +119 @@
         /* Disable compare mode */
         tclr &= ~AM335x_TIMER_TCLR_CE_FLAG;
-        /* Enable the prescaler, divisor = 2 */
-        tclr |= AM335x_TIMER_TCLR_PRE_FLAG;
-        tclr &= ~(AM335x_TIMER_TCLR_PTV_MASK << AM335x_TIMER_TCLR_PTV_SHIFT);
+
         /* Enable auto-reload mode */
         tclr |= AM335x_TIMER_TCLR_AR_FLAG;

uspace/app/mkmfs/mkmfs.c

@@ -649 +649 @@
                 mark_bmap(ibmap_buf, i, FREE);
 
-        for (i = 2; i < sb->n_zones; ++i)
+        for (i = 2; i < sb->n_zones - sb->first_data_zone; ++i)
                 mark_bmap(zbmap_buf, i, FREE);
 

uspace/app/ping6/ping6.c

@@ -102 +102 @@
         }
         
-        printf("Received ICMP echo reply: from %s to %s, seq. no %u, "
+        printf("Received ICMPv6 echo reply: from %s to %s, seq. no %u, "
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
         

uspace/drv/block/ata_bd/main.c

@@ -198 +198 @@
         }
 
+        ddf_fun_add_to_category(fun, "bd");
+
         free(fun_name);
         disk->afun = afun;

uspace/drv/char/ns8250/ns8250.c

@@ -236 +236 @@
  *
  * @param fun           The serial port function
- * @param buf           The ouput buffer for read data.
+ * @param buf           The output buffer for read data.
  * @param count         The number of bytes to be read.
  *
@@ -420 +420 @@
                         ns->irq = res->res.interrupt.irq;
                         irq = true;
-                        ddf_msg(LVL_NOTE, "Device %s was asigned irq = 0x%x.",
+                        ddf_msg(LVL_NOTE, "Device %s was assigned irq = 0x%x.",
                             ddf_dev_get_name(ns->dev), ns->irq);
                         break;
@@ -433 +433 @@
                         }
                         ioport = true;
-                        ddf_msg(LVL_NOTE, "Device %s was asigned I/O address = "
+                        ddf_msg(LVL_NOTE, "Device %s was assigned I/O address = "
                             "0x%x.", ddf_dev_get_name(ns->dev), ns->io_addr);
                         break;
@@ -827 +827 @@
         ddf_fun_t *fun = NULL;
         bool need_cleanup = false;
+        bool need_unreg_intr_handler = false;
         int rc;
         
@@ -869 +870 @@
                 goto fail;
         }
+        need_unreg_intr_handler = true;
         
         /* Enable interrupt. */
@@ -903 +905 @@
         if (fun != NULL)
                 ddf_fun_destroy(fun);
+        if (need_unreg_intr_handler)
+                ns8250_unregister_interrupt_handler(ns);
         if (need_cleanup)
                 ns8250_dev_cleanup(ns);
@@ -914 +918 @@
         
         fibril_mutex_lock(&ns->mutex);
-                if (ns->client_connections > 0) {
+        if (ns->client_connections > 0) {
                 fibril_mutex_unlock(&ns->mutex);
                 return EBUSY;

uspace/lib/c/generic/inet/addr.c

@@ -70 +70 @@
 {
         memcpy(dst, src, 16);
+}
+
+int addr128_compare(const addr128_t a, const addr128_t b)
+{
+        return memcmp(a, b, 16);
 }
 
@@ -212 +217 @@
 }
 
+void inet_addr_naddr(const inet_addr_t *addr, uint8_t prefix,
+    inet_naddr_t *naddr)
+{
+        naddr->family = addr->family;
+        memcpy(naddr->addr6, addr->addr6, 16);
+        naddr->prefix = prefix;
+}
+
 void inet_addr_any(inet_addr_t *addr)
 {
@@ -234 +247 @@
                 return (a->addr == b->addr);
         case AF_INET6:
-                return memcmp(&a->addr6, &b->addr6, 16);
+                return addr128_compare(a->addr6, b->addr6);
         default:
                 return 0;
@@ -245 +258 @@
             (inet_addr_compare(addr, &inet_addr_any_addr)) ||
             (inet_addr_compare(addr, &inet_addr_any_addr6)));
+}
+
+int inet_naddr_compare(const inet_naddr_t *naddr, const inet_addr_t *addr)
+{
+        if (naddr->family != addr->family)
+                return 0;
+        
+        switch (naddr->family) {
+        case AF_INET:
+                return (naddr->addr == addr->addr);
+        case AF_INET6:
+                return addr128_compare(naddr->addr6, addr->addr6);
+        default:
+                return 0;
+        }
 }
 

uspace/lib/c/generic/inetping6.c

@@ -79 +79 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INETPING6_SEND, (sysarg_t) sdu->src,
-            (sysarg_t) sdu->dest, sdu->seq_no, &answer);
-        sysarg_t retval = async_data_write_start(exch, sdu->data, sdu->size);
+        aid_t req = async_send_1(exch, INETPING6_SEND, sdu->seq_no, &answer);
+        
+        int rc = async_data_write_start(exch, &sdu->src, sizeof(addr128_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+        
+        rc = async_data_write_start(exch, &sdu->dest, sizeof(addr128_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+        
+        rc = async_data_write_start(exch, sdu->data, sdu->size);
         
         async_exchange_end(exch);
         
-        if (retval != EOK) {
-                async_forget(req);
-                return retval;
-        }
-        
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+        
+        sysarg_t retval;
         async_wait_for(req, &retval);
-        return retval;
+        
+        return (int) retval;
 }
 
@@ -142 +158 @@
         }
         
-        if (size != sizeof(inet_addr_t)) {
+        if (size != sizeof(addr128_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -161 +177 @@
         }
         
-        if (size != sizeof(inet_addr_t)) {
+        if (size != sizeof(addr128_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);

uspace/lib/c/generic/iplink.c

@@ -86 +86 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_0(exch, IPLINK_SEND, &answer);
-        
-        int rc = async_data_write_start(exch, &sdu->src, sizeof(inet_addr_t));
+        aid_t req = async_send_2(exch, IPLINK_SEND, (sysarg_t) sdu->src,
+            (sysarg_t) sdu->dest, &answer);
+        
+        int rc = async_data_write_start(exch, sdu->data, sdu->size);
+        
+        async_exchange_end(exch);
+        
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        
+        return (int) retval;
+}
+
+int iplink_send6(iplink_t *iplink, iplink_sdu6_t *sdu)
+{
+        async_exch_t *exch = async_exchange_begin(iplink->sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, IPLINK_SEND6, &answer);
+        
+        int rc = async_data_write_start(exch, &sdu->dest, sizeof(addr48_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -95 +118 @@
         }
         
-        rc = async_data_write_start(exch, &sdu->dest, sizeof(inet_addr_t));
-        if (rc != EOK) {
-                async_exchange_end(exch);
-                async_forget(req);
-                return rc;
-        }
-        
         rc = async_data_write_start(exch, sdu->data, sdu->size);
         
@@ -119 +135 @@
 int iplink_get_mtu(iplink_t *iplink, size_t *rmtu)
 {
+        async_exch_t *exch = async_exchange_begin(iplink->sess);
+        
         sysarg_t mtu;
-        async_exch_t *exch = async_exchange_begin(iplink->sess);
-
         int rc = async_req_0_1(exch, IPLINK_GET_MTU, &mtu);
-        async_exchange_end(exch);
-
+        
+        async_exchange_end(exch);
+        
         if (rc != EOK)
                 return rc;
-
+        
         *rmtu = mtu;
         return EOK;
+}
+
+int iplink_get_mac48(iplink_t *iplink, addr48_t *mac)
+{
+        async_exch_t *exch = async_exchange_begin(iplink->sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, IPLINK_GET_MAC48, &answer);
+        
+        int rc = async_data_read_start(exch, mac, sizeof(addr48_t));
+        
+        loc_exchange_end(exch);
+        
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        
+        return (int) retval;
 }
 

uspace/lib/c/generic/iplink_srv.c

@@ -50 +50 @@
 }
 
+static void iplink_get_mac48_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        addr48_t mac;
+        int rc = srv->ops->get_mac48(srv, &mac);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(addr48_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        rc = async_data_read_finalize(callid, &mac, size);
+        if (rc != EOK)
+                async_answer_0(callid, rc);
+        
+        async_answer_0(iid, (sysarg_t) rc);
+}
+
 static void iplink_addr_add_srv(iplink_srv_t *srv, ipc_callid_t iid,
     ipc_call_t *icall)
@@ -111 +142 @@
         iplink_sdu_t sdu;
         
+        sdu.src = IPC_GET_ARG1(*icall);
+        sdu.dest = IPC_GET_ARG2(*icall);
+        
+        int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
+            &sdu.size);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        rc = srv->ops->send(srv, &sdu);
+        free(sdu.data);
+        async_answer_0(iid, rc);
+}
+
+static void iplink_send6_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        iplink_sdu6_t sdu;
+        
         ipc_callid_t callid;
         size_t size;
@@ -119 +170 @@
         }
         
-        if (size != sizeof(inet_addr_t)) {
+        if (size != sizeof(addr48_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -125 +176 @@
         }
         
-        int rc = async_data_write_finalize(callid, &sdu.src, size);
+        int rc = async_data_write_finalize(callid, &sdu.dest, size);
         if (rc != EOK) {
                 async_answer_0(callid, (sysarg_t) rc);
@@ -131 +182 @@
         }
         
-        if (!async_data_write_receive(&callid, &size)) {
-                async_answer_0(callid, EREFUSED);
-                async_answer_0(iid, EREFUSED);
-                return;
-        }
-        
-        if (size != sizeof(inet_addr_t)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-        
-        rc = async_data_write_finalize(callid, &sdu.dest, size);
-        if (rc != EOK) {
-                async_answer_0(callid, (sysarg_t) rc);
-                async_answer_0(iid, (sysarg_t) rc);
-        }
-        
         rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
             &sdu.size);
-        if (rc != EOK)
-                return;
-        
-        rc = srv->ops->send(srv, &sdu);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        rc = srv->ops->send6(srv, &sdu);
         free(sdu.data);
         async_answer_0(iid, rc);
@@ -170 +205 @@
 int iplink_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        iplink_srv_t *srv = (iplink_srv_t *)arg;
+        iplink_srv_t *srv = (iplink_srv_t *) arg;
         int rc;
         
@@ -214 +249 @@
                         iplink_get_mtu_srv(srv, callid, &call);
                         break;
+                case IPLINK_GET_MAC48:
+                        iplink_get_mac48_srv(srv, callid, &call);
+                        break;
                 case IPLINK_SEND:
                         iplink_send_srv(srv, callid, &call);
+                        break;
+                case IPLINK_SEND6:
+                        iplink_send6_srv(srv, callid, &call);
                         break;
                 case IPLINK_ADDR_ADD:

uspace/lib/c/generic/net/socket_parse.c

@@ -53 +53 @@
 int socket_parse_address_family(const char *name, int *af)
 {
-        if (str_lcmp(name, "AF_INET", 7) == 0) {
-                *af = AF_INET;
+        if (str_lcmp(name, "AF_INET6", 8) == 0) {
+                *af = AF_INET6;
                 return EOK;
         }
         
-        if (str_lcmp(name, "AF_INET6", 8) == 0) {
-                *af = AF_INET6;
+        if (str_lcmp(name, "AF_INET", 7) == 0) {
+                *af = AF_INET;
                 return EOK;
         }

uspace/lib/c/include/inet/addr.h

@@ -73 +73 @@
 extern void addr128(const addr128_t, addr128_t);
 
+extern int addr128_compare(const addr128_t, const addr128_t);
+
 extern void host2addr128_t_be(const addr128_t, addr128_t);
 extern void addr128_t_be2host(const addr128_t, addr128_t);
@@ -87 +89 @@
 extern int inet_addr_family(const char *, uint16_t *);
 extern void inet_naddr_addr(const inet_naddr_t *, inet_addr_t *);
+extern void inet_addr_naddr(const inet_addr_t *, uint8_t, inet_naddr_t *);
 
 extern void inet_addr_any(inet_addr_t *);
@@ -94 +97 @@
 extern int inet_addr_is_any(const inet_addr_t *);
 
+extern int inet_naddr_compare(const inet_naddr_t *, const inet_addr_t *);
 extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *);
 

uspace/lib/c/include/inet/iplink.h

@@ -47 +47 @@
 } iplink_t;
 
-/** Internet link Service Data Unit */
+/** IPv4 link Service Data Unit */
 typedef struct {
         /** Local source address */
-        inet_addr_t src;
+        addr32_t src;
         /** Local destination address */
-        inet_addr_t dest;
+        addr32_t dest;
         /** Serialized IP packet */
         void *data;
@@ -58 +58 @@
         size_t size;
 } iplink_sdu_t;
+
+/** IPv6 link Service Data Unit */
+typedef struct {
+        /** Local MAC destination address */
+        addr48_t dest;
+        /** Serialized IP packet */
+        void *data;
+        /** Size of @c data in bytes */
+        size_t size;
+} iplink_sdu6_t;
 
 /** Internet link receive Service Data Unit */
@@ -74 +84 @@
 extern void iplink_close(iplink_t *);
 extern int iplink_send(iplink_t *, iplink_sdu_t *);
+extern int iplink_send6(iplink_t *, iplink_sdu6_t *);
 extern int iplink_addr_add(iplink_t *, inet_addr_t *);
 extern int iplink_addr_remove(iplink_t *, inet_addr_t *);
 extern int iplink_get_mtu(iplink_t *, size_t *);
+extern int iplink_get_mac48(iplink_t *, addr48_t *);
 
 #endif

uspace/lib/c/include/inet/iplink_srv.h

@@ -57 +57 @@
         int (*close)(iplink_srv_t *);
         int (*send)(iplink_srv_t *, iplink_sdu_t *);
+        int (*send6)(iplink_srv_t *, iplink_sdu6_t *);
         int (*get_mtu)(iplink_srv_t *, size_t *);
+        int (*get_mac48)(iplink_srv_t *, addr48_t *);
         int (*addr_add)(iplink_srv_t *, inet_addr_t *);
         int (*addr_remove)(iplink_srv_t *, inet_addr_t *);

uspace/lib/c/include/ipc/iplink.h

@@ -40 +40 @@
 typedef enum {
         IPLINK_GET_MTU = IPC_FIRST_USER_METHOD,
+        IPLINK_GET_MAC48,
         IPLINK_SEND,
+        IPLINK_SEND6,
         IPLINK_ADDR_ADD,
         IPLINK_ADDR_REMOVE

uspace/srv/net/dnsrsrv/dns_std.h

@@ -65 +65 @@
         DTYPE_MX        = 15,
         DTYPE_TXT       = 16,
+        DTYPE_AAAA      = 28,
         DQTYPE_AXFR     = 252,
         DQTYPE_MAILB    = 253,

uspace/srv/net/ethip/ethip.c

@@ -56 +56 @@
 static int ethip_close(iplink_srv_t *srv);
 static int ethip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
+static int ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
 static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
+static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
 static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
 static int ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
@@ -66 +68 @@
         .close = ethip_close,
         .send = ethip_send,
+        .send6 = ethip_send6,
         .get_mtu = ethip_get_mtu,
+        .get_mac48 = ethip_get_mac48,
         .addr_add = ethip_addr_add,
         .addr_remove = ethip_addr_remove
@@ -169 +173 @@
         
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
-        
-        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;
-        
-        int rc;
         eth_frame_t frame;
         
-        switch (src_af) {
-        case AF_INET:
-                rc = arp_translate(nic, src_v4, dest_v4, frame.dest);
-                if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%"
-                            PRIx32, dest_v4);
-                        return rc;
-                }
-                
-                addr48(nic->mac_addr, frame.src);
-                frame.etype_len = ETYPE_IP;
-                frame.data = sdu->data;
-                frame.size = sdu->size;
-                
-                break;
-        case AF_INET6:
-                // FIXME TODO
-                return ENOTSUP;
-        default:
-                return EINVAL;
-        }
+        int rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%"
+                    PRIx32, sdu->dest);
+                return rc;
+        }
+        
+        addr48(nic->mac_addr, frame.src);
+        frame.etype_len = ETYPE_IP;
+        frame.data = sdu->data;
+        frame.size = sdu->size;
         
         void *data;
         size_t size;
         rc = eth_pdu_encode(&frame, &data, &size);
+        if (rc != EOK)
+                return rc;
+        
+        rc = ethip_nic_send(nic, data, size);
+        free(data);
+        
+        return rc;
+}
+
+static int ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send6()");
+        
+        ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
+        eth_frame_t frame;
+        
+        addr48(sdu->dest, frame.dest);
+        addr48(nic->mac_addr, frame.src);
+        frame.etype_len = ETYPE_IPV6;
+        frame.data = sdu->data;
+        frame.size = sdu->size;
+        
+        void *data;
+        size_t size;
+        int rc = eth_pdu_encode(&frame, &data, &size);
         if (rc != EOK)
                 return rc;
@@ -268 +274 @@
 }
 
+static int ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()");
+        
+        ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
+        addr48(nic->mac_addr, *mac);
+        
+        return EOK;
+}
+
 static int ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {

uspace/srv/net/ethip/pdu.c

@@ -46 +46 @@
 #include "pdu.h"
 
-#define MAC48_BYTES 6
-
 /** Encode Ethernet PDU. */
 int eth_pdu_encode(eth_frame_t *frame, void **rdata, size_t *rsize)

uspace/srv/net/inetsrv/Makefile

@@ -39 +39 @@
         inetping.c \
         inetping6.c \
+        ndp.c \
+        ntrans.c \
         pdu.c \
         reass.c \

uspace/srv/net/inetsrv/addrobj.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
+#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "inetsrv.h"
 #include "inet_link.h"
+#include "ndp.h"
 
 static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *, inet_link_t *);
@@ -117 +119 @@
                     inet_addrobj_t, addr_list);
                 
-                if (inet_naddr_compare_mask(&naddr->naddr, addr)) {
-                        fibril_mutex_unlock(&addr_list_lock);
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
-                            naddr);
-                        return naddr;
+                switch (find) {
+                case iaf_net:
+                        if (inet_naddr_compare_mask(&naddr->naddr, addr)) {
+                                fibril_mutex_unlock(&addr_list_lock);
+                                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
+                                    naddr);
+                                return naddr;
+                        }
+                        break;
+                case iaf_addr:
+                        if (inet_naddr_compare(&naddr->naddr, addr)) {
+                                fibril_mutex_unlock(&addr_list_lock);
+                                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
+                                    naddr);
+                                return naddr;
+                        }
+                        break;
                 }
         }
@@ -214 +228 @@
         inet_naddr_addr(&addr->naddr, &lsrc_addr);
         
-        return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest, dgram,
-            proto, ttl, df);
+        addr32_t lsrc_v4;
+        addr128_t lsrc_v6;
+        uint16_t lsrc_af = inet_addr_get(&lsrc_addr, &lsrc_v4, &lsrc_v6);
+        
+        addr32_t ldest_v4;
+        addr128_t ldest_v6;
+        uint16_t ldest_af = inet_addr_get(ldest, &ldest_v4, &ldest_v6);
+        
+        if (lsrc_af != ldest_af)
+                return EINVAL;
+        
+        int rc;
+        addr48_t ldest_mac;
+        
+        switch (ldest_af) {
+        case AF_INET:
+                return inet_link_send_dgram(addr->ilink, lsrc_v4, ldest_v4,
+                    dgram, proto, ttl, df);
+        case AF_INET6:
+                /*
+                 * Translate local destination IPv6 address.
+                 */
+                rc = ndp_translate(lsrc_v6, ldest_v6, ldest_mac, addr->ilink);
+                if (rc != EOK)
+                        return rc;
+                
+                return inet_link_send_dgram6(addr->ilink, ldest_mac, dgram,
+                    proto, ttl, df);
+        }
+        
+        return ENOTSUP;
 }
 

uspace/srv/net/inetsrv/icmp.c

@@ -153 +153 @@
                 return ENOMEM;
         
-        icmp_echo_t *request = (icmp_echo_t *)rdata;
+        icmp_echo_t *request = (icmp_echo_t *) rdata;
         
         request->type = ICMP_ECHO_REQUEST;

uspace/srv/net/inetsrv/icmpv6.c

@@ -47 +47 @@
 #include "pdu.h"
 
-static int ndp_received(inet_dgram_t *dgram)
-{
-        // FIXME TODO
-        return ENOTSUP;
-}
-
 static int icmpv6_recv_echo_request(inet_dgram_t *dgram)
 {
@@ -84 +78 @@
         inet_dgram_t rdgram;
         
-        rdgram.src = dgram->dest;
+        inet_get_srcaddr(&dgram->src, 0, &rdgram.src);
         rdgram.dest = dgram->src;
         rdgram.tos = 0;
@@ -90 +84 @@
         rdgram.size = size;
         
-        icmpv6_pseudo_header phdr;
+        icmpv6_phdr_t phdr;
         
         host2addr128_t_be(dest_v6, phdr.src_addr);
@@ -100 +94 @@
         uint16_t cs_phdr =
             inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
-            sizeof(icmpv6_pseudo_header));
+            sizeof(icmpv6_phdr_t));
         
         uint16_t cs_all = inet_checksum_calc(cs_phdr, reply, size);
@@ -156 +150 @@
         case ICMPV6_NEIGHBOUR_SOLICITATION:
         case ICMPV6_NEIGHBOUR_ADVERTISEMENT:
-#ifdef ACCEPT_RA
         case ICMPV6_ROUTER_ADVERTISEMENT:
-#endif
                 return ndp_received(dgram);
         default:
@@ -192 +184 @@
         dgram.size = rsize;
         
-        icmpv6_pseudo_header phdr;
+        icmpv6_phdr_t phdr;
         
         host2addr128_t_be(sdu->src, phdr.src_addr);
@@ -202 +194 @@
         uint16_t cs_phdr =
             inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
-            sizeof(icmpv6_pseudo_header));
+            sizeof(icmpv6_phdr_t));
         
         uint16_t cs_all = inet_checksum_calc(cs_phdr, rdata, rsize);

uspace/srv/net/inetsrv/icmpv6_std.h

@@ -47 +47 @@
 #define INET6_HOP_LIMIT_MAX  255
 
+#define NDP_FLAG_ROUTER     0x80
+#define NDP_FLAG_OVERRIDE   0x40
+#define NDP_FLAG_SOLICITED  0x20
+
 /** ICMPv6 message type */
 enum icmpv6_type {
@@ -83 +87 @@
                         uint8_t flags;
                         /** Reserved bytes */
-                        uint8_t reserved [3];
+                        uint8_t reserved[3];
                 } ndp;
         } un;
@@ -91 +95 @@
 typedef struct {
         /** Source IPv6 address */
-        uint8_t src_addr [16];
+        uint8_t src_addr[16];
         /** Target IPv6 address */
-        uint8_t dest_addr [16];
+        uint8_t dest_addr[16];
         /** ICMPv6 length */
         uint32_t length;
         /** Zeroes */
-        uint8_t zeroes [3];
+        uint8_t zeroes[3];
         /** Next header */
         uint8_t next;
-} icmpv6_pseudo_header;
+} icmpv6_phdr_t;
 
 /** NDP neighbour body */
 typedef struct {
         /** Target IPv6 address */
-        uint8_t target_address [16];
+        uint8_t target_address[16];
         /** Option code */
         uint8_t option;
@@ -111 +115 @@
         uint8_t length;
         /** MAC address */
-        uint8_t mac [6];
+        uint8_t mac[6];
 } ndp_message_t;
 
@@ -131 +135 @@
         uint32_t reserved;
         /** Prefix */
-        uint8_t prefix [16];
+        uint8_t prefix[16];
 } ndp_prefix_t;
 

uspace/srv/net/inetsrv/inet_link.c

@@ -49 +49 @@
 #include "pdu.h"
 
+static bool first_link = true;
+static bool first_link6 = true;
+
+static FIBRIL_MUTEX_INITIALIZE(ip_ident_lock);
+static uint16_t ip_ident = 0;
+
 static int inet_link_open(service_id_t);
 static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
@@ -58 +64 @@
 static LIST_INITIALIZE(inet_link_list);
 static FIBRIL_MUTEX_INITIALIZE(inet_discovery_lock);
+
+static addr128_t link_local_node_ip =
+    {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xfe, 0, 0, 0};
+
+static void inet_link_local_node_ip(addr48_t mac_addr,
+    addr128_t ip_addr)
+{
+        memcpy(ip_addr, link_local_node_ip, 16);
+        
+        ip_addr[8] = mac_addr[0] ^ 0x02;
+        ip_addr[9] = mac_addr[1];
+        ip_addr[10] = mac_addr[2];
+        ip_addr[13] = mac_addr[3];
+        ip_addr[14] = mac_addr[4];
+        ip_addr[15] = mac_addr[5];
+}
 
 static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, uint16_t af)
@@ -159 +181 @@
         if (ilink->svc_name != NULL)
                 free(ilink->svc_name);
+        
         free(ilink);
 }
@@ -201 +224 @@
                 goto error;
         }
+        
+        /*
+         * Get the MAC address of the link. If the link has a MAC
+         * address, we assume that it supports NDP.
+         */
+        rc = iplink_get_mac48(ilink->iplink, &ilink->mac);
+        ilink->mac_valid = (rc == EOK);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name);
         list_append(&ilink->link_list, &inet_link_list);
 
-        inet_addrobj_t *addr;
-        inet_addrobj_t *addr6;
-
-        static int first = 1;
-        
-        addr = inet_addrobj_new();
-        addr6 = inet_addrobj_new();
-        
-        if (first) {
+        inet_addrobj_t *addr = NULL;
+        
+        if (first_link) {
+                addr = inet_addrobj_new();
+                
                 inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
-                inet_naddr6(&addr6->naddr, 0, 0, 0, 0, 0, 0, 0, 1, 128);
-                first = 0;
+                first_link = false;
         } else {
                 /*
                  * FIXME
-                 * Setting static IP addresses for testing purposes
+                 * Setting static IPv4 address for testing purposes:
                  * 10.0.2.15/24
-                 * fd19:1680::4/120
                  */
+                addr = inet_addrobj_new();
+                
                 inet_naddr(&addr->naddr, 10, 0, 2, 15, 24);
-                inet_naddr6(&addr6->naddr, 0xfd19, 0x1680, 0, 0, 0, 0, 0, 4, 120);
-        }
-        
-        addr->ilink = ilink;
-        addr6->ilink = ilink;
-        addr->name = str_dup("v4a");
-        addr6->name = str_dup("v6a");
-        
-        rc = inet_addrobj_add(addr);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding IPv4 address.");
-                inet_addrobj_delete(addr);
-                /* XXX Roll back */
-                return rc;
-        }
-        
-        rc = inet_addrobj_add(addr6);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding IPv6 address.");
-                inet_addrobj_delete(addr6);
-                /* XXX Roll back */
-                return rc;
-        }
-        
-        inet_naddr_addr(&addr->naddr, &iaddr);
-        rc = iplink_addr_add(ilink->iplink, &iaddr);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IPv4 address on internet link.");
-                inet_addrobj_remove(addr);
-                inet_addrobj_delete(addr);
-                /* XXX Roll back */
-                return rc;
-        }
-        
-        inet_naddr_addr(&addr6->naddr, &iaddr);
-        rc = iplink_addr_add(ilink->iplink, &iaddr);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IPv6 address on internet link.");
-                inet_addrobj_remove(addr6);
-                inet_addrobj_delete(addr6);
-                /* XXX Roll back */
-                return rc;
+        }
+        
+        if (addr != NULL) {
+                addr->ilink = ilink;
+                addr->name = str_dup("v4a");
+                
+                rc = inet_addrobj_add(addr);
+                if (rc == EOK) {
+                        inet_naddr_addr(&addr->naddr, &iaddr);
+                        rc = iplink_addr_add(ilink->iplink, &iaddr);
+                        if (rc != EOK) {
+                                log_msg(LOG_DEFAULT, LVL_ERROR,
+                                    "Failed setting IPv4 address on internet link.");
+                                inet_addrobj_remove(addr);
+                                inet_addrobj_delete(addr);
+                        }
+                } else {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding IPv4 address.");
+                        inet_addrobj_delete(addr);
+                }
+        }
+        
+        inet_addrobj_t *addr6 = NULL;
+        
+        if (first_link6) {
+                addr6 = inet_addrobj_new();
+                
+                inet_naddr6(&addr6->naddr, 0, 0, 0, 0, 0, 0, 0, 1, 128);
+                first_link6 = false;
+        } else if (ilink->mac_valid) {
+                addr6 = inet_addrobj_new();
+                
+                addr128_t link_local;
+                inet_link_local_node_ip(ilink->mac, link_local);
+                
+                inet_naddr_set6(link_local, 64, &addr6->naddr);
+        }
+        
+        if (addr6 != NULL) {
+                addr6->ilink = ilink;
+                addr6->name = str_dup("v6a");
+                
+                rc = inet_addrobj_add(addr6);
+                if (rc == EOK) {
+                        inet_naddr_addr(&addr6->naddr, &iaddr);
+                        rc = iplink_addr_add(ilink->iplink, &iaddr);
+                        if (rc != EOK) {
+                                log_msg(LOG_DEFAULT, LVL_ERROR,
+                                    "Failed setting IPv6 address on internet link.");
+                                inet_addrobj_remove(addr6);
+                                inet_addrobj_delete(addr6);
+                        }
+                } else {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding IPv6 address.");
+                        inet_addrobj_delete(addr6);
+                }
         }
         
@@ -298 +338 @@
 }
 
-/** Send datagram over Internet link */
-int inet_link_send_dgram(inet_link_t *ilink, inet_addr_t *lsrc,
-    inet_addr_t *ldest, inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
-{
+/** Send IPv4 datagram over Internet link
+ *
+ * @param ilink Internet link
+ * @param lsrc  Source IPv4 address
+ * @param ldest Destination IPv4 address
+ * @param dgram IPv4 datagram body
+ * @param proto Protocol
+ * @param ttl   Time-to-live
+ * @param df    Do-not-Fragment flag
+ *
+ * @return EOK on success
+ * @return ENOMEM when not enough memory to create the datagram
+ * @return ENOTSUP if networking mode is not supported
+ *
+ */
+int inet_link_send_dgram(inet_link_t *ilink, addr32_t lsrc, addr32_t ldest,
+    inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
+{
+        addr32_t src_v4;
+        uint16_t src_af = inet_addr_get(&dgram->src, &src_v4, NULL);
+        if (src_af != AF_INET)
+                return EINVAL;
+        
+        addr32_t dest_v4;
+        uint16_t dest_af = inet_addr_get(&dgram->dest, &dest_v4, NULL);
+        if (dest_af != AF_INET)
+                return EINVAL;
+        
         /*
          * Fill packet structure. Fragmentation is performed by
          * inet_pdu_encode().
          */
+        
+        iplink_sdu_t sdu;
+        
+        sdu.src = lsrc;
+        sdu.dest = ldest;
         
         inet_packet_t packet;
@@ -314 +383 @@
         packet.proto = proto;
         packet.ttl = ttl;
+        
+        /* Allocate identifier */
+        fibril_mutex_lock(&ip_ident_lock);
+        packet.ident = ++ip_ident;
+        fibril_mutex_unlock(&ip_ident_lock);
+        
         packet.df = df;
         packet.data = dgram->data;
         packet.size = dgram->size;
         
-        iplink_sdu_t sdu;
+        int rc;
         size_t offs = 0;
-        int rc;
-        
-        sdu.src = *lsrc;
-        sdu.dest = *ldest;
         
         do {
                 /* Encode one fragment */
+                
                 size_t roffs;
-                rc = inet_pdu_encode(&packet, offs, ilink->def_mtu, &sdu.data,
-                    &sdu.size, &roffs);
+                rc = inet_pdu_encode(&packet, src_v4, dest_v4, offs, ilink->def_mtu,
+                    &sdu.data, &sdu.size, &roffs);
                 if (rc != EOK)
                         return rc;
@@ -335 +407 @@
                 /* Send the PDU */
                 rc = iplink_send(ilink->iplink, &sdu);
+                
                 free(sdu.data);
-                
+                offs = roffs;
+        } while (offs < packet.size);
+        
+        return rc;
+}
+
+/** Send IPv6 datagram over Internet link
+ *
+ * @param ilink Internet link
+ * @param ldest Destination MAC address
+ * @param dgram IPv6 datagram body
+ * @param proto Next header
+ * @param ttl   Hop limit
+ * @param df    Do-not-Fragment flag (unused)
+ *
+ * @return EOK on success
+ * @return ENOMEM when not enough memory to create the datagram
+ *
+ */
+int inet_link_send_dgram6(inet_link_t *ilink, addr48_t ldest,
+    inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
+{
+        addr128_t src_v6;
+        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &src_v6);
+        if (src_af != AF_INET6)
+                return EINVAL;
+        
+        addr128_t dest_v6;
+        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &dest_v6);
+        if (dest_af != AF_INET6)
+                return EINVAL;
+        
+        iplink_sdu6_t sdu6;
+        addr48(ldest, sdu6.dest);
+        
+        /*
+         * Fill packet structure. Fragmentation is performed by
+         * inet_pdu_encode6().
+         */
+        
+        inet_packet_t packet;
+        
+        packet.src = dgram->src;
+        packet.dest = dgram->dest;
+        packet.tos = dgram->tos;
+        packet.proto = proto;
+        packet.ttl = ttl;
+        
+        /* Allocate identifier */
+        fibril_mutex_lock(&ip_ident_lock);
+        packet.ident = ++ip_ident;
+        fibril_mutex_unlock(&ip_ident_lock);
+        
+        packet.df = df;
+        packet.data = dgram->data;
+        packet.size = dgram->size;
+        
+        int rc;
+        size_t offs = 0;
+        
+        do {
+                /* Encode one fragment */
+                
+                size_t roffs;
+                rc = inet_pdu_encode6(&packet, src_v6, dest_v6, offs, ilink->def_mtu,
+                    &sdu6.data, &sdu6.size, &roffs);
+                if (rc != EOK)
+                        return rc;
+                
+                /* Send the PDU */
+                rc = iplink_send6(ilink->iplink, &sdu6);
+                
+                free(sdu6.data);
                 offs = roffs;
         } while (offs < packet.size);

uspace/srv/net/inetsrv/inet_link.h

@@ -42 +42 @@
 
 extern int inet_link_discovery_start(void);
-extern int inet_link_send_dgram(inet_link_t *, inet_addr_t *,
-    inet_addr_t *, inet_dgram_t *, uint8_t, uint8_t, int);
+extern int inet_link_send_dgram(inet_link_t *, addr32_t,
+    addr32_t, inet_dgram_t *, uint8_t, uint8_t, int);
+extern int inet_link_send_dgram6(inet_link_t *, addr48_t, inet_dgram_t *,
+    uint8_t, uint8_t, int);
 extern inet_link_t *inet_link_get_by_id(sysarg_t);
 

uspace/srv/net/inetsrv/inet_std.h

@@ -48 +48 @@
         /** Total Length */
         uint16_t tot_len;
-        /** Identification */
+        /** Identifier */
         uint16_t id;
         /** Flags, Fragment Offset */
@@ -90 +90 @@
 };
 
+/** Bits in ip6_frag_header_t.offsmf */
+enum flags_offsmt_bits {
+        /** More fragments */
+        OF_FLAG_M = 0,
+        /** Fragment offset, highest bit */
+        OF_FRAGOFF_h = 15,
+        /** Fragment offset, lowest bit */
+        OF_FRAGOFF_l = 3
+};
+
 /** IPv6 Datagram header (fixed part) */
 typedef struct {
@@ -114 +124 @@
         /** Reserved */
         uint8_t reserved;
-        /** Fragment Offset, Flags */
-        uint16_t foff_flags;
-        /** Identification */
+        /** Fragmentation offset, reserved and M flag */
+        uint16_t offsmf;
+        /** Identifier */
         uint32_t id;
 } ip6_header_fragment_t;

uspace/srv/net/inetsrv/inetping6.c

@@ -109 +109 @@
         aid_t req = async_send_1(exch, INETPING6_EV_RECV, sdu->seq_no, &answer);
         
-        int rc = async_data_write_start(exch, sdu->src, 16);
+        int rc = async_data_write_start(exch, sdu->src, sizeof(addr128_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -116 +116 @@
         }
         
-        rc = async_data_write_start(exch, sdu->dest, 16);
+        rc = async_data_write_start(exch, sdu->dest, sizeof(addr128_t));
         if (rc != EOK) {
                 async_exchange_end(exch);

uspace/srv/net/inetsrv/inetsrv.c

@@ -62 +62 @@
 #define NAME "inetsrv"
 
+static inet_naddr_t solicited_node_mask = {
+        .family = AF_INET6,
+        .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0},
+        .prefix = 104
+};
+
+static inet_addr_t multicast_all_nodes = {
+        .family = AF_INET,
+        .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}
+};
+
 static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
@@ -514 +525 @@
 
         addr = inet_addrobj_find(&packet->dest, iaf_addr);
-        if (addr != NULL) {
+        if ((addr != NULL) ||
+            (inet_naddr_compare_mask(&solicited_node_mask, &packet->dest)) ||
+            (inet_addr_compare(&multicast_all_nodes, &packet->dest))) {
                 /* Destined for one of the local addresses */
 

uspace/srv/net/inetsrv/inetsrv.h

@@ -113 +113 @@
         uint8_t ttl;
         /** Identifier */
-        uint16_t ident;
+        uint32_t ident;
         /** Do not fragment */
         bool df;
@@ -141 +141 @@
         iplink_t *iplink;
         size_t def_mtu;
+        addr48_t mac;
+        bool mac_valid;
 } inet_link_t;
 

uspace/srv/net/inetsrv/pdu.c

@@ -49 +49 @@
 #include "pdu.h"
 
-static FIBRIL_MUTEX_INITIALIZE(ip_ident_lock);
-static uint16_t ip_ident = 0;
-
 /** One's complement addition.
  *
@@ -88 +85 @@
 }
 
-/** Encode Internet PDU.
+/** Encode IPv4 PDU.
  *
  * Encode internet packet into PDU (serialized form). Will encode a
@@ -96 +93 @@
  * be set in the header, otherwise the offset will equal @a packet->size.
  *
- * @param packet        Packet to encode
- * @param offs          Offset into packet payload (in bytes)
- * @param mtu           MTU (Maximum Transmission Unit) in bytes
- * @param rdata         Place to store pointer to allocated data buffer
- * @param rsize         Place to store size of allocated data buffer
- * @param roffs         Place to store offset of remaning data
- */
-int inet_pdu_encode(inet_packet_t *packet, size_t offs, size_t mtu,
-    void **rdata, size_t *rsize, size_t *roffs)
-{
-        addr32_t src_v4;
-        addr128_t src_v6;
-        uint16_t src_af = inet_addr_get(&packet->src, &src_v4, &src_v6);
-        
-        addr32_t dest_v4;
-        addr128_t dest_v6;
-        uint16_t dest_af = inet_addr_get(&packet->dest, &dest_v4, &dest_v6);
-        
-        if (src_af != dest_af)
-                return EINVAL;
-        
+ * @param packet Packet to encode
+ * @param src    Source address
+ * @param dest   Destination address
+ * @param offs   Offset into packet payload (in bytes)
+ * @param mtu    MTU (Maximum Transmission Unit) in bytes
+ * @param rdata  Place to store pointer to allocated data buffer
+ * @param rsize  Place to store size of allocated data buffer
+ * @param roffs  Place to store offset of remaning data
+ *
+ */
+int inet_pdu_encode(inet_packet_t *packet, addr32_t src, addr32_t dest,
+    size_t offs, size_t mtu, void **rdata, size_t *rsize, size_t *roffs)
+{
         /* Upper bound for fragment offset field */
         size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l);
@@ -124 +113 @@
                 return ELIMIT;
         
-        size_t hdr_size;
-        
-        switch (src_af) {
-        case AF_INET:
-                hdr_size = sizeof(ip_header_t);
-                break;
-        case AF_INET6:
-                hdr_size = sizeof(ip6_header_t);
-                break;
-        default:
-                assert(false);
-        }
+        size_t hdr_size = sizeof(ip_header_t);
         
         size_t data_offs = ROUND_UP(hdr_size, 4);
@@ -171 +149 @@
                 return ENOMEM;
         
-        /* Allocate identifier */
-        fibril_mutex_lock(&ip_ident_lock);
-        uint16_t ident = ++ip_ident;
-        fibril_mutex_unlock(&ip_ident_lock);
-        
         /* Encode header fields */
-        ip_header_t *hdr;
-        ip6_header_t *hdr6;
-        
-        switch (src_af) {
-        case AF_INET:
-                hdr = (ip_header_t *) data;
-                
-                hdr->ver_ihl =
-                    (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t));
-                hdr->tos = packet->tos;
-                hdr->tot_len = host2uint16_t_be(size);
-                hdr->id = host2uint16_t_be(ident);
-                hdr->flags_foff = host2uint16_t_be(flags_foff);
-                hdr->ttl = packet->ttl;
-                hdr->proto = packet->proto;
-                hdr->chksum = 0;
-                hdr->src_addr = host2uint32_t_be(src_v4);
-                hdr->dest_addr = host2uint32_t_be(dest_v4);
-                
-                /* Compute checksum */
-                uint16_t chksum = inet_checksum_calc(INET_CHECKSUM_INIT,
-                    (void *) hdr, hdr_size);
-                hdr->chksum = host2uint16_t_be(chksum);
-                
-                break;
-        case AF_INET6:
-                // TODO FIXME: fragmentation
-                
-                hdr6 = (ip6_header_t *) data;
-                
-                hdr6->ver_tc = (6 << (VI_VERSION_l));
-                memset(hdr6->tc_fl, 0, 3);
-                hdr6->payload_len = host2uint16_t_be(packet->size);
-                hdr6->next = packet->proto;
-                hdr6->hop_limit = packet->ttl;
-                
-                host2addr128_t_be(src_v6, hdr6->src_addr);
-                host2addr128_t_be(dest_v6, hdr6->dest_addr);
-                
-                break;
-        default:
-                assert(false);
-        }
+        ip_header_t *hdr = (ip_header_t *) data;
+        
+        hdr->ver_ihl =
+            (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t));
+        hdr->tos = packet->tos;
+        hdr->tot_len = host2uint16_t_be(size);
+        hdr->id = host2uint16_t_be(packet->ident);
+        hdr->flags_foff = host2uint16_t_be(flags_foff);
+        hdr->ttl = packet->ttl;
+        hdr->proto = packet->proto;
+        hdr->chksum = 0;
+        hdr->src_addr = host2uint32_t_be(src);
+        hdr->dest_addr = host2uint32_t_be(dest);
+        
+        /* Compute checksum */
+        uint16_t chksum = inet_checksum_calc(INET_CHECKSUM_INIT,
+            (void *) hdr, hdr_size);
+        hdr->chksum = host2uint16_t_be(chksum);
         
         /* Copy payload */
@@ -231 +179 @@
 }
 
+/** Encode IPv6 PDU.
+ *
+ * Encode internet packet into PDU (serialized form). Will encode a
+ * fragment of the payload starting at offset @a offs. The resulting
+ * PDU will have at most @a mtu bytes. @a *roffs will be set to the offset
+ * of remaining payload. If some data is remaining, the MF flag will
+ * be set in the header, otherwise the offset will equal @a packet->size.
+ *
+ * @param packet Packet to encode
+ * @param src    Source address
+ * @param dest   Destination address
+ * @param offs   Offset into packet payload (in bytes)
+ * @param mtu    MTU (Maximum Transmission Unit) in bytes
+ * @param rdata  Place to store pointer to allocated data buffer
+ * @param rsize  Place to store size of allocated data buffer
+ * @param roffs Place to store offset of remaning data
+ *
+ */
+int inet_pdu_encode6(inet_packet_t *packet, addr128_t src, addr128_t dest,
+    size_t offs, size_t mtu, void **rdata, size_t *rsize, size_t *roffs)
+{
+        /* Upper bound for fragment offset field */
+        size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l);
+        
+        /* Verify that total size of datagram is within reasonable bounds */
+        if (offs + packet->size > FRAG_OFFS_UNIT * fragoff_limit)
+                return ELIMIT;
+        
+        size_t hdr_size = sizeof(ip6_header_t);
+        
+        size_t data_offs = ROUND_UP(hdr_size, 4);
+        
+        assert(offs % FRAG_OFFS_UNIT == 0);
+        assert(offs / FRAG_OFFS_UNIT < fragoff_limit);
+        
+#if 0
+        // FIXME TODO fragmentation
+        
+        /* Value for the fragment offset field */
+        uint16_t foff = offs / FRAG_OFFS_UNIT;
+#endif
+        
+        if (hdr_size >= mtu)
+                return EINVAL;
+        
+        /* Amount of space in the PDU available for payload */
+        size_t spc_avail = mtu - hdr_size;
+        spc_avail -= (spc_avail % FRAG_OFFS_UNIT);
+        
+        /* Amount of data (payload) to transfer */
+        size_t xfer_size = min(packet->size - offs, spc_avail);
+        
+        /* Total PDU size */
+        size_t size = hdr_size + xfer_size;
+        
+        /* Offset of remaining payload */
+        size_t rem_offs = offs + xfer_size;
+        
+#if 0
+        // FIXME TODO fragmentation
+        
+        /* Flags */
+        uint16_t flags_foff =
+            (packet->df ? BIT_V(uint16_t, FF_FLAG_DF) : 0) +
+            (rem_offs < packet->size ? BIT_V(uint16_t, FF_FLAG_MF) : 0) +
+            (foff << FF_FRAGOFF_l);
+#endif
+        
+        void *data = calloc(size, 1);
+        if (data == NULL)
+                return ENOMEM;
+        
+        /* Encode header fields */
+        ip6_header_t *hdr6 = (ip6_header_t *) data;
+        
+        hdr6->ver_tc = (6 << (VI_VERSION_l));
+        memset(hdr6->tc_fl, 0, 3);
+        hdr6->payload_len = host2uint16_t_be(packet->size);
+        hdr6->next = packet->proto;
+        hdr6->hop_limit = packet->ttl;
+        
+        host2addr128_t_be(src, hdr6->src_addr);
+        host2addr128_t_be(dest, hdr6->dest_addr);
+        
+        /* Copy payload */
+        memcpy((uint8_t *) data + data_offs, packet->data + offs, xfer_size);
+        
+        *rdata = data;
+        *rsize = size;
+        *roffs = rem_offs;
+        
+        return EOK;
+}
+
+/** Decode IPv4 datagram
+ *
+ * @param data   Serialized IPv4 datagram
+ * @param size   Length of serialized IPv4 datagram
+ * @param packet IP datagram structure to be filled
+ *
+ * @return EOK on success
+ * @return EINVAL if the datagram is invalid or damaged
+ * @return ENOMEM if not enough memory
+ *
+ */
 int inet_pdu_decode(void *data, size_t size, inet_packet_t *packet)
 {
@@ -257 +310 @@
         if (tot_len > size) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length = %zu > PDU size = %zu",
-                        tot_len, size);
+                    tot_len, size);
                 return EINVAL;
         }
@@ -294 +347 @@
 }
 
+/** Decode IPv6 datagram
+ *
+ * @param data   Serialized IPv6 datagram
+ * @param size   Length of serialized IPv6 datagram
+ * @param packet IP datagram structure to be filled
+ *
+ * @return EOK on success
+ * @return EINVAL if the datagram is invalid or damaged
+ * @return ENOMEM if not enough memory
+ *
+ */
 int inet_pdu_decode6(void *data, size_t size, inet_packet_t *packet)
 {
-        // FIXME TODO
-        return ENOTSUP;
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode6()");
+        
+        if (size < sizeof(ip6_header_t)) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size);
+                return EINVAL;
+        }
+        
+        ip6_header_t *hdr6 = (ip6_header_t *) data;
+        
+        uint8_t version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h,
+            VI_VERSION_l, hdr6->ver_tc);
+        if (version != 6) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Version (%d) != 6", version);
+                return EINVAL;
+        }
+        
+        size_t payload_len = uint16_t_be2host(hdr6->payload_len);
+        if (payload_len + sizeof(ip6_header_t) > size) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length = %zu > PDU size = %zu",
+                    payload_len + sizeof(ip6_header_t), size);
+                return EINVAL;
+        }
+        
+#if 0
+        // FIXME TODO fragmentation
+        
+        uint16_t ident = uint16_t_be2host(hdr->id);
+        uint16_t flags_foff = uint16_t_be2host(hdr->flags_foff);
+        uint16_t foff = BIT_RANGE_EXTRACT(uint16_t, FF_FRAGOFF_h, FF_FRAGOFF_l,
+            flags_foff);
+#endif
+        
+        /* XXX Checksum */
+        
+        addr128_t src;
+        addr128_t dest;
+        
+        addr128_t_be2host(hdr6->src_addr, src);
+        inet_addr_set6(src, &packet->src);
+        
+        addr128_t_be2host(hdr6->dest_addr, dest);
+        inet_addr_set6(dest, &packet->dest);
+        
+        packet->tos = 0;
+        packet->proto = hdr6->next;
+        packet->ttl = hdr6->hop_limit;
+        
+#if 0
+        // FIXME TODO fragmentation
+        
+        packet->ident = ident;
+        packet->df = (flags_foff & BIT_V(uint16_t, FF_FLAG_DF)) != 0;
+        packet->mf = (flags_foff & BIT_V(uint16_t, FF_FLAG_MF)) != 0;
+        packet->offs = foff * FRAG_OFFS_UNIT;
+        
+        /* XXX IP options */
+        size_t data_offs = sizeof(uint32_t) *
+            BIT_RANGE_EXTRACT(uint8_t, VI_IHL_h, VI_IHL_l, hdr->ver_ihl);
+#endif
+        
+        packet->ident = 0;
+        packet->df = 0;
+        packet->mf = 0;
+        packet->offs = 0;
+        
+        packet->size = payload_len;
+        packet->data = calloc(packet->size, 1);
+        if (packet->data == NULL) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Out of memory.");
+                return ENOMEM;
+        }
+        
+        memcpy(packet->data, (uint8_t *) data + sizeof(ip6_header_t), packet->size);
+        
+        return EOK;
+}
+
+/** Encode NDP packet
+ *
+ * @param ndp   NDP packet structure to be serialized
+ * @param dgram IPv6 datagram structure to be filled
+ *
+ * @return EOK on success
+ *
+ */
+int ndp_pdu_encode(ndp_packet_t *ndp, inet_dgram_t *dgram)
+{
+        inet_addr_set6(ndp->sender_proto_addr, &dgram->src);
+        inet_addr_set6(ndp->target_proto_addr, &dgram->dest);
+        dgram->tos = 0;
+        dgram->size = sizeof(icmpv6_message_t) + sizeof(ndp_message_t);
+        
+        dgram->data = calloc(1, dgram->size);
+        if (dgram->data == NULL)
+                return ENOMEM;
+        
+        icmpv6_message_t *icmpv6 = (icmpv6_message_t *) dgram->data;
+        
+        icmpv6->type = ndp->opcode;
+        icmpv6->code = 0;
+        memset(icmpv6->un.ndp.reserved, 0, 3);
+        
+        ndp_message_t *message = (ndp_message_t *) (icmpv6 + 1);
+        
+        if (ndp->opcode == ICMPV6_NEIGHBOUR_SOLICITATION) {
+                host2addr128_t_be(ndp->solicited_ip, message->target_address);
+                message->option = 1;
+                icmpv6->un.ndp.flags = 0;
+        } else {
+                host2addr128_t_be(ndp->sender_proto_addr, message->target_address);
+                message->option = 2;
+                icmpv6->un.ndp.flags = NDP_FLAG_OVERRIDE | NDP_FLAG_SOLICITED;
+        }
+        
+        message->length = 1;
+        addr48(ndp->sender_hw_addr, message->mac);
+        
+        icmpv6_phdr_t phdr;
+        
+        host2addr128_t_be(ndp->sender_proto_addr, phdr.src_addr);
+        host2addr128_t_be(ndp->target_proto_addr, phdr.dest_addr);
+        phdr.length = host2uint32_t_be(dgram->size);
+        memset(phdr.zeroes, 0, 3);
+        phdr.next = IP_PROTO_ICMPV6;
+        
+        uint16_t cs_phdr =
+            inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
+            sizeof(icmpv6_phdr_t));
+        
+        uint16_t cs_all = inet_checksum_calc(cs_phdr, dgram->data,
+            dgram->size);
+        
+        icmpv6->checksum = host2uint16_t_be(cs_all);
+        
+        return EOK;
+}
+
+/** Decode NDP packet
+ *
+ * @param dgram Incoming IPv6 datagram encapsulating NDP packet
+ * @param ndp   NDP packet structure to be filled
+ *
+ * @return EOK on success
+ * @return EINVAL if the Datagram is invalid
+ *
+ */
+int ndp_pdu_decode(inet_dgram_t *dgram, ndp_packet_t *ndp)
+{
+        uint16_t src_af = inet_addr_get(&dgram->src, NULL,
+            &ndp->sender_proto_addr);
+        if (src_af != AF_INET6)
+                return EINVAL;
+        
+        if (dgram->size < sizeof(icmpv6_message_t) + sizeof(ndp_message_t))
+                return EINVAL;
+        
+        icmpv6_message_t *icmpv6 = (icmpv6_message_t *) dgram->data;
+        
+        ndp->opcode = icmpv6->type;
+        
+        ndp_message_t *message = (ndp_message_t *) (icmpv6 + 1);
+        
+        addr128_t_be2host(message->target_address, ndp->target_proto_addr);
+        addr48(message->mac, ndp->sender_hw_addr);
+        
+        return EOK;
 }
 

uspace/srv/net/inetsrv/pdu.h

@@ -40 +40 @@
 #include <sys/types.h>
 #include "inetsrv.h"
+#include "ndp.h"
 
 #define INET_CHECKSUM_INIT 0xffff
@@ -45 +46 @@
 extern uint16_t inet_checksum_calc(uint16_t, void *, size_t);
 
-extern int inet_pdu_encode(inet_packet_t *, size_t, size_t, void **,
-    size_t *, size_t *);
+extern int inet_pdu_encode(inet_packet_t *, addr32_t, addr32_t, size_t, size_t,
+    void **, size_t *, size_t *);
+extern int inet_pdu_encode6(inet_packet_t *, addr128_t, addr128_t, size_t,
+    size_t, void **, size_t *, size_t *);
 extern int inet_pdu_decode(void *, size_t, inet_packet_t *);
 extern int inet_pdu_decode6(void *, size_t, inet_packet_t *);
+
+extern int ndp_pdu_decode(inet_dgram_t *, ndp_packet_t *);
+extern int ndp_pdu_encode(ndp_packet_t *, inet_dgram_t *);
 
 #endif

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;
 }
 

uspace/srv/net/slip/slip.c

@@ -58 +58 @@
 static int slip_close(iplink_srv_t *);
 static int slip_send(iplink_srv_t *, iplink_sdu_t *);
+static int slip_send6(iplink_srv_t *, iplink_sdu6_t *);
 static int slip_get_mtu(iplink_srv_t *, size_t *);
+static int slip_get_mac48(iplink_srv_t *, addr48_t *);
 static int slip_addr_add(iplink_srv_t *, inet_addr_t *);
 static int slip_addr_remove(iplink_srv_t *, inet_addr_t *);
@@ -68 +70 @@
         .close = slip_close,
         .send = slip_send,
+        .send6 = slip_send6,
         .get_mtu = slip_get_mtu,
+        .get_mac48 = slip_get_mac48,
         .addr_add = slip_addr_add,
         .addr_remove = slip_addr_remove
@@ -122 +126 @@
 int slip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()");
+        
         async_sess_t *sess = (async_sess_t *) srv->arg;
         uint8_t *data = sdu->data;
-        unsigned i;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()");
-
+        
         /*
-         * Strictly speaking, this is not prescribed by the RFC, but the RFC
-         * suggests to start with sending a SLIP_END byte as a synchronization
-         * measure for dealing with previous possible noise on the line.
-         */
+         * Strictly speaking, this is not prescribed by the RFC, but the RFC
+         * suggests to start with sending a SLIP_END byte as a synchronization
+         * measure for dealing with previous possible noise on the line.
+         */
         write_buffered(sess, SLIP_END);
-
-        for (i = 0; i < sdu->size; i++) {
+        
+        for (size_t i = 0; i < sdu->size; i++) {
                 switch (data[i]) {
                 case SLIP_END:
@@ -150 +153 @@
                 }
         }
+        
         write_buffered(sess, SLIP_END);
         write_flush(sess);
-
-        return EOK;
+        
+        return EOK;
+}
+
+int slip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send6()");
+        
+        return ENOTSUP;
 }
 
@@ -161 +172 @@
         *mtu = SLIP_MTU;
         return EOK;
+}
+
+int slip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mac48()");
+        return ENOTSUP;
 }
 

uspace/srv/net/tcp/conn.c

@@ -312 +312 @@
 static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG2,
+            "tcp_socket_match(sock=(%u), pat=(%u))", sock->port, patt->port);
+        
         if ((!inet_addr_is_any(&patt->addr)) &&
             (!inet_addr_compare(&patt->addr, &sock->addr)))
@@ -351 +354 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", sp);
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare conn (f:(%u), l:(%u))",
+            sp->foreign.port, sp->local.port);
         
         fibril_mutex_lock(&conn_list_lock);
@@ -357 +363 @@
                 tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link);
                 tcp_sockpair_t *csp = &conn->ident;
+                
+                log_msg(LOG_DEFAULT, LVL_DEBUG2, " - with (f:(%u), l:(%u))",
+                    csp->foreign.port, csp->local.port);
                 
                 if (tcp_sockpair_match(sp, csp)) {

uspace/srv/net/tcp/pdu.c

@@ -172 +172 @@
                 phdr6->tcp_length =
                     host2uint32_t_be(pdu->header_size + pdu->text_size);
-                memset(phdr6->zero, 0, 3);
+                memset(phdr6->zeroes, 0, 3);
                 phdr6->next = IP_PROTO_TCP;
                 break;

uspace/srv/net/tcp/sock.c

@@ -613 +613 @@
         ipc_callid_t wcallid;
         size_t length;
-        uint8_t buffer[TCP_SOCK_FRAGMENT_SIZE];
         tcp_error_t trc;
         int rc;
+        
+        uint8_t *buffer = calloc(TCP_SOCK_FRAGMENT_SIZE, 1);
+        if (buffer == NULL) {
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_send()");
@@ -625 +630 @@
         if (sock_core == NULL) {
                 async_answer_0(callid, ENOTSOCK);
-                return;
+                goto out;
         }
 
@@ -641 +646 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, EINVAL);
-                        return;
+                        goto out;
                 }
 
@@ -651 +656 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
 
@@ -676 +681 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
         }
@@ -685 +690 @@
             IPC_GET_ARG2(answer));
         fibril_mutex_unlock(&socket->lock);
+        
+out:
+        free(buffer);
 }
 

uspace/srv/net/tcp/std.h

@@ -75 +75 @@
 };
 
-/** TCP IPv4 pseudo header */
+/** TCP over IPv4 checksum pseudo header */
 typedef struct {
         /** Source address */
@@ -89 +89 @@
 } tcp_phdr_t;
 
-/** TCP IPv6 pseudo header */
+/** TCP over IPv6 checksum pseudo header */
 typedef struct {
         /** Source address */
@@ -98 +98 @@
         uint32_t tcp_length;
         /** Zeroes */
-        uint8_t zero[3];
+        uint8_t zeroes[3];
         /** Next header */
         uint8_t next;

uspace/srv/net/tcp/tcp.c

@@ -54 +54 @@
 #define NAME       "tcp"
 
-#define IP_PROTO_TCP 6
-
 static int tcp_inet_ev_recv(inet_dgram_t *dgram);
 static void tcp_received_pdu(tcp_pdu_t *pdu);

uspace/srv/net/tcp/tqueue.c

@@ -282 +282 @@
 void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
+            "tcp_transmit_segment(f:(%u),l:(%u), %p)",
+            sp->local.port, sp->foreign.port, seg);
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
             seg->seq, seg->wnd);

uspace/srv/net/tcp/ucall.c

@@ -298 +298 @@
         tcp_conn_t *conn;
 
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
+            "tcp_as_segment_arrived(f:(%u), l:(%u))",
+            sp->foreign.port, sp->local.port);
+
         conn = tcp_conn_find_ref(sp);
         if (conn == NULL) {

uspace/srv/net/udp/assoc.c

@@ -372 +372 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
+            "udp_socket_match(sock=(%u), pat=(%u))", sock->port, patt->port);
+        
         if ((!inet_addr_is_any(&patt->addr)) &&
             (!inet_addr_compare(&patt->addr, &sock->addr)))

uspace/srv/net/udp/pdu.c

@@ -110 +110 @@
                 host2addr128_t_be(dest_v6, phdr6->dest_addr);
                 phdr6->udp_length = host2uint32_t_be(pdu->data_size);
-                memset(phdr6->zero, 0, 3);
+                memset(phdr6->zeroes, 0, 3);
                 phdr6->next = IP_PROTO_UDP;
                 break;

uspace/srv/net/udp/sock.c

@@ -265 +265 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_send()");
         
+        uint8_t *buffer = calloc(UDP_FRAGMENT_SIZE, 1);
+        if (buffer == NULL) {
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
+        
         struct sockaddr_in6 *addr6 = NULL;
         struct sockaddr_in *addr;
@@ -276 +282 @@
                 if (rc != EOK) {
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
                 
@@ -357 +363 @@
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_sendto: Failed to "
                             "determine local address.");
-                        return;
+                        goto out;
                 }
                 
@@ -379 +385 @@
                         length = UDP_FRAGMENT_SIZE;
                 
-                uint8_t buffer[UDP_FRAGMENT_SIZE];
                 int rc = async_data_write_finalize(wcallid, buffer, length);
                 if (rc != EOK) {
@@ -425 +430 @@
         if (addr6 != NULL)
                 free(addr6);
+        
+        free(buffer);
 }
 

uspace/srv/net/udp/std.h

@@ -54 +54 @@
 } udp_header_t;
 
-/** UDP IPv4 pseudo header */
+/** UDP over IPv4 checksum pseudo header */
 typedef struct {
         /** Source address */
@@ -68 +68 @@
 } udp_phdr_t;
 
-/** UDP IPv6 pseudo header */
+/** UDP over IPv6 checksum pseudo header */
 typedef struct {
         /** Source address */
@@ -76 +76 @@
         /** UDP length */
         uint32_t udp_length;
-        /** Reserved */
-        uint8_t zero[3];
+        /** Zeroes */
+        uint8_t zeroes[3];
         /** Next header */
         uint8_t next;