Changeset f94b24c8 in mainline

Timestamp:

2013-07-29T13:54:20Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

a1c95da

Parents:

09d6695 (diff), ccdc63e (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 branch.

Location:

uspace

Files:

• app/netecho/netecho.c (modified) (3 diffs)
• app/nettest1/nettest.c (modified) (8 diffs)
• app/nettest1/nettest.h (modified) (1 diff)
• app/nettest1/nettest1.c (modified) (2 diffs)
• app/nettest2/nettest2.c (modified) (2 diffs)
• app/ping/ping.c (modified) (14 diffs)
• app/ping6/ping6.c (modified) (14 diffs)
• lib/c/generic/inet/addr.c (modified) (2 diffs)
• lib/c/include/inet/addr.h (modified) (1 diff)
• srv/net/dnsrsrv/dns_msg.h (modified) (1 diff)
• srv/net/ethip/ethip.h (modified) (2 diffs)
• srv/net/ethip/ethip_nic.c (modified) (13 diffs)
• srv/net/inetsrv/inetsrv.c (modified) (1 diff)
• srv/net/inetsrv/ndp.c (modified) (2 diffs)

uspace/app/netecho/netecho.c

@@ -225 +225 @@
         uint8_t address_buf[sizeof(struct sockaddr_in6)];
 
-        socklen_t addrlen;
+        socklen_t addrlen = sizeof(struct sockaddr_in6);
         int socket_id;
         ssize_t rcv_size;
@@ -240 +240 @@
         if (type == SOCK_STREAM) {
                 /* Accept a socket if a stream socket is used */
-                addrlen = sizeof(address_buf);
                 if (verbose)
                         printf("accept()\n");
@@ -280 +279 @@
                                 case AF_INET6:
                                         port = ntohs(address_in6->sin6_port);
-                                        address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
+                                        address_start = (uint8_t *) address_in6->sin6_addr.s6_addr;
                                         break;
                                 default:

uspace/app/nettest1/nettest.c

@@ -41 +41 @@
 #include "print_error.h"
 
-
 /** Creates new sockets.
  *
@@ -52 +51 @@
  * @return Other error codes as defined for the socket() function.
  */
-int sockets_create(int verbose, int *socket_ids, int sockets, int family, sock_type_t type)
-{
-        int index;
-
+int sockets_create(int verbose, int *socket_ids, unsigned int sockets,
+    uint16_t family, sock_type_t type)
+{
         if (verbose)
                 printf("Create\t");
-                
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
                 socket_ids[index] = socket(family, type, 0);
                 if (socket_ids[index] < 0) {
-                        printf("Socket %d (%d) error:\n", index, socket_ids[index]);
+                        printf("Socket %u (%d) error:\n", index, socket_ids[index]);
                         socket_print_error(stderr, socket_ids[index], "Socket create: ", "\n");
                         return socket_ids[index];
                 }
+                
                 if (verbose)
                         print_mark(index);
@@ -83 +82 @@
  * @return Other error codes as defined for the closesocket() function.
  */
-int sockets_close(int verbose, int *socket_ids, int sockets)
-{
-        int index;
-        int rc;
-
+int sockets_close(int verbose, int *socket_ids, unsigned int sockets)
+{
         if (verbose)
                 printf("\tClose\t");
-
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
-                rc = closesocket(socket_ids[index]);
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
+                int rc = closesocket(socket_ids[index]);
                 if (rc != EOK) {
-                        printf("Socket %d (%d) error:\n", index, socket_ids[index]);
+                        printf("Socket %u (%d) error:\n", index, socket_ids[index]);
                         socket_print_error(stderr, rc, "Socket close: ", "\n");
                         return rc;
                 }
+                
                 if (verbose)
                         print_mark(index);
@@ -117 +114 @@
  * @return Other error codes as defined for the connect() function.
  */
-int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
-{
-        int index;
-        int rc;
-
+int sockets_connect(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t addrlen)
+{
         if (verbose)
                 printf("\tConnect\t");
@@ -127 +122 @@
         fflush(stdout);
         
-        for (index = 0; index < sockets; index++) {
-                rc = connect(socket_ids[index], address, addrlen);
+        for (unsigned int index = 0; index < sockets; index++) {
+                int rc = connect(socket_ids[index], address, addrlen);
                 if (rc != EOK) {
                         socket_print_error(stderr, rc, "Socket connect: ", "\n");
                         return rc;
                 }
-                if (verbose)
-                        print_mark(index);
-        }
-        
-        return EOK;
-}
-
-/** Sends data via sockets.
- *
- * @param[in] verbose A value indicating whether to print out verbose information.
- * @param[in] socket_ids A field of stored socket identifiers.
- * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @param[in] address The destination host address to send data to.
- * @param[in] addrlen The length of the destination address in bytes.
- * @param[in] data The data to be sent.
- * @param[in] size The data size in bytes.
- * @param[in] messages The number of datagrams per socket to be sent.
+                
+                if (verbose)
+                        print_mark(index);
+        }
+        
+        return EOK;
+}
+
+/** Send data via sockets.
+ *
+ * @param[in] verbose    Print out verbose information.
+ * @param[in] socket_ids Stored socket identifiers.
+ * @param[in] sockets    Number of sockets.
+ * @param[in] address    Destination host address to send data to.
+ * @param[in] addrlen    Length of the destination address in bytes.
+ * @param[in] data       Data to be sent.
+ * @param[in] size       Size of the data in bytes.
+ * @param[in] messages   Number of datagrams per socket to be sent.
+ * @param[in] type       Socket type.
+ *
  * @return EOK on success.
  * @return Other error codes as defined for the sendto() function.
- */
-int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages)
-{
-        int index;
-        int message;
-        int rc;
-
+ *
+ */
+int sockets_sendto(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t addrlen, char *data, size_t size,
+    unsigned int messages, sock_type_t type)
+{
         if (verbose)
                 printf("\tSendto\t");
-
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
-                for (message = 0; message < messages; message++) {
-                        rc = sendto(socket_ids[index], data, size, 0, address, addrlen);
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
+                for (unsigned int message = 0; message < messages; message++) {
+                        int rc;
+                        
+                        switch (type) {
+                        case SOCK_STREAM:
+                                rc = send(socket_ids[index], data, size, 0);
+                                break;
+                        case SOCK_DGRAM:
+                                rc = sendto(socket_ids[index], data, size, 0, address, addrlen);
+                                break;
+                        default:
+                                rc = EINVAL;
+                        }
+                        
                         if (rc != EOK) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
                                 socket_print_error(stderr, rc, "Socket send: ", "\n");
                                 return rc;
                         }
                 }
-                if (verbose)
-                        print_mark(index);
-        }
-        
-        return EOK;
-}
-
-/** Receives data via sockets.
- *
- * @param[in] verbose A value indicating whether to print out verbose information.
- * @param[in] socket_ids A field of stored socket identifiers.
- * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @param[in] address The source host address of received datagrams.
- * @param[in,out] addrlen The maximum length of the source address in bytes. The actual size of the source address is set instead.
- * @param[out] data The received data.
- * @param[in] size The maximum data size in bytes.
- * @param[in] messages The number of datagrams per socket to be received.
+                
+                if (verbose)
+                        print_mark(index);
+        }
+        
+        return EOK;
+}
+
+/** Receive data via sockets.
+ *
+ * @param[in]     verbose    Print out verbose information.
+ * @param[in]     socket_ids Stored socket identifiers.
+ * @param[in]     sockets    Number of sockets.
+ * @param[in]     address    Source host address of received datagrams.
+ * @param[in,out] addrlen    Maximum length of the source address in bytes.
+ *                           The actual size of the source address is set.
+ * @param[out]    data       Received data.
+ * @param[in]     size       Maximum data size in bytes.
+ * @param[in]     messages   Number of datagrams per socket to be received.
+ *
  * @return EOK on success.
  * @return Other error codes as defined for the recvfrom() function.
- */
-int sockets_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
-{
-        int value;
-        int index;
-        int message;
-
+ *
+ */
+int sockets_recvfrom(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t *addrlen, char *data, size_t size,
+    unsigned int messages)
+{
         if (verbose)
                 printf("\tRecvfrom\t");
@@ -204 +216 @@
         fflush(stdout);
         
-        for (index = 0; index < sockets; index++) {
-                for (message = 0; message < messages; message++) {
-                        value = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
-                        if (value < 0) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
-                                socket_print_error(stderr, value, "Socket receive: ", "\n");
-                                return value;
-                        }
-                }
-                if (verbose)
-                        print_mark(index);
-        }
-        return EOK;
-}
-
-/** Sends and receives data via sockets.
+        for (unsigned int index = 0; index < sockets; index++) {
+                for (unsigned int message = 0; message < messages; message++) {
+                        int rc = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
+                        if (rc < 0) {
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
+                                socket_print_error(stderr, rc, "Socket receive: ", "\n");
+                                return rc;
+                        }
+                }
+                
+                if (verbose)
+                        print_mark(index);
+        }
+        
+        return EOK;
+}
+
+/** Send and receive data via sockets.
  *
  * Each datagram is sent and a reply read consequently.
  * The next datagram is sent after the reply is received.
  *
- * @param[in] verbose A value indicating whether to print out verbose information.
- * @param[in] socket_ids A field of stored socket identifiers.
- * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @param[in,out] address The destination host address to send data to. The source host address of received datagrams is set instead.
- * @param[in] addrlen The length of the destination address in bytes.
- * @param[in,out] data The data to be sent. The received data are set instead.
- * @param[in] size The data size in bytes.
- * @param[in] messages The number of datagrams per socket to be received.
+ * @param[in]     verbose    Print out verbose information.
+ * @param[in]     socket_ids Stored socket identifiers.
+ * @param[in]     sockets    Number of sockets.
+ * @param[in,out] address    Destination host address to send data to.
+ *                           The source host address of received datagrams is set.
+ * @param[in]     addrlen    Length of the destination address in bytes.
+ * @param[in,out] data       Data to be sent. The received data are set.
+ * @param[in]     size       Size of the data in bytes.
+ * @param[in]     messages   Number of datagrams per socket to be received.
+ * @param[in]     type       Socket type.
+ *
  * @return EOK on success.
  * @return Other error codes as defined for the recvfrom() function.
- */
-int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
-{
-        int value;
-        int index;
-        int message;
-        int rc;
-
+ *
+ */
+int sockets_sendto_recvfrom(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t *addrlen, char *data,
+    size_t size, unsigned int messages, sock_type_t type)
+{
         if (verbose)
                 printf("\tSendto and recvfrom\t");
-
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
-                for (message = 0; message < messages; message++) {
-                        rc = sendto(socket_ids[index], data, size, 0, address, *addrlen);
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
+                for (unsigned int message = 0; message < messages; message++) {
+                        int rc;
+                        
+                        switch (type) {
+                        case SOCK_STREAM:
+                                rc = send(socket_ids[index], data, size, 0);
+                                break;
+                        case SOCK_DGRAM:
+                                rc = sendto(socket_ids[index], data, size, 0, address, *addrlen);
+                                break;
+                        default:
+                                rc = EINVAL;
+                        }
+                        
                         if (rc != EOK) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
                                 socket_print_error(stderr, rc, "Socket send: ", "\n");
                                 return rc;
                         }
-                        value = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
-                        if (value < 0) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
-                                socket_print_error(stderr, value, "Socket receive: ", "\n");
-                                return value;
-                        }
-                }
+                        
+                        rc = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
+                        if (rc < 0) {
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
+                                socket_print_error(stderr, rc, "Socket receive: ", "\n");
+                                return rc;
+                        }
+                }
+                
                 if (verbose)
                         print_mark(index);
@@ -274 +306 @@
  *
  * @param[in] index The index of the mark to be printed.
- */
-void print_mark(int index)
+ *
+ */
+void print_mark(unsigned int index)
 {
         if ((index + 1) % 10)
@@ -281 +314 @@
         else
                 printf("|");
+        
         fflush(stdout);
 }

uspace/app/nettest1/nettest.h

@@ -40 +40 @@
 #include <net/socket.h>
 
-extern void print_mark(int);
-extern int sockets_create(int, int *, int, int, sock_type_t);
-extern int sockets_close(int, int *, int);
-extern int sockets_connect(int, int *, int, struct sockaddr *, socklen_t);
-extern int sockets_sendto(int, int *, int, struct sockaddr *, socklen_t, char *, int, int);
-extern int sockets_recvfrom(int, int *, int, struct sockaddr *, socklen_t *, char *, int, int);
-extern int sockets_sendto_recvfrom(int, int *, int, struct sockaddr *, socklen_t *, char *, int, int);
+extern void print_mark(unsigned int);
+extern int sockets_create(int, int *, unsigned int, uint16_t, sock_type_t);
+extern int sockets_close(int, int *, unsigned int);
+extern int sockets_connect(int, int *, unsigned int, struct sockaddr *,
+    socklen_t);
+extern int sockets_sendto(int, int *, unsigned int, struct sockaddr *,
+    socklen_t, char *, size_t, unsigned int, sock_type_t);
+extern int sockets_recvfrom(int, int *, unsigned int, struct sockaddr *,
+    socklen_t *, char *, size_t, unsigned int);
+extern int sockets_sendto_recvfrom(int, int *, unsigned int, struct sockaddr *,
+    socklen_t *, char *, size_t, unsigned int, sock_type_t);
 
 #endif

uspace/app/nettest1/nettest1.c

@@ -253 +253 @@
         
         rc = sockets_sendto_recvfrom(verbose, socket_ids, nsockets, address,
-            &addrlen, data, size, nmessages);
+            &addrlen, data, size, nmessages, type);
         if (rc != EOK)
                 return rc;
@@ -278 +278 @@
         
         rc = sockets_sendto(verbose, socket_ids, nsockets, address, addrlen,
-            data, size, nmessages);
+            data, size, nmessages, type);
         if (rc != EOK)
                 return rc;

uspace/app/nettest2/nettest2.c

@@ -375 +375 @@
         
         rc = sockets_sendto_recvfrom(verbose, socket_ids, sockets, address,
-            &addrlen, data, size, messages);
+            &addrlen, data, size, messages, type);
         if (rc != EOK)
                 return rc;
@@ -399 +399 @@
         
         rc = sockets_sendto(verbose, socket_ids, sockets, address, addrlen,
-            data, size, messages);
+            data, size, messages, type);
         if (rc != EOK)
                 return rc;

uspace/app/ping/ping.c

@@ -42 +42 @@
 #include <inet/inetping.h>
 #include <io/console.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
+#include <str_error.h>
 #include <sys/types.h>
 
@@ -54 +57 @@
 #define PING_TIMEOUT (1000 * 1000)
 
+typedef enum {
+        RECEIVED_NONE,
+        RECEIVED_SUCCESS,
+        RECEIVED_INTERRUPT
+} received_t;
+
+static received_t received;
+static FIBRIL_CONDVAR_INITIALIZE(received_cv);
+static FIBRIL_MUTEX_INITIALIZE(received_lock);
+
+static bool quit = false;
+static FIBRIL_CONDVAR_INITIALIZE(quit_cv);
+static FIBRIL_MUTEX_INITIALIZE(quit_lock);
+
 static int ping_ev_recv(inetping_sdu_t *);
-
-static bool done = false;
-static FIBRIL_CONDVAR_INITIALIZE(done_cv);
-static FIBRIL_MUTEX_INITIALIZE(done_lock);
 
 static inetping_ev_ops_t ev_ops = {
@@ -67 +80 @@
 static addr32_t dest;
 
-static bool ping_repeat = false;
+static bool repeat_forever = false;
+static size_t repeat_count = 1;
+
+static const char *short_options = "rn:";
 
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <host>\n");
-}
-
-static void ping_signal_done(void)
-{
-        fibril_mutex_lock(&done_lock);
-        done = true;
-        fibril_mutex_unlock(&done_lock);
-        fibril_condvar_broadcast(&done_cv);
+        printf("Syntax: %s [-n <count>|-r] <host>\n", NAME);
+}
+
+static void ping_signal_received(received_t value)
+{
+        fibril_mutex_lock(&received_lock);
+        received = value;
+        fibril_mutex_unlock(&received_lock);
+        fibril_condvar_broadcast(&received_cv);
+}
+
+static void ping_signal_quit(void)
+{
+        fibril_mutex_lock(&quit_lock);
+        quit = true;
+        fibril_mutex_unlock(&quit_lock);
+        fibril_condvar_broadcast(&quit_cv);
 }
 
@@ -105 +129 @@
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
         
-        if (!ping_repeat)
-                ping_signal_done();
+        ping_signal_received(RECEIVED_SUCCESS);
         
         free(asrc);
@@ -116 +139 @@
 {
         inetping_sdu_t sdu;
-        int rc;
-
+        
         sdu.src = src;
         sdu.dest = dest;
@@ -123 +145 @@
         sdu.data = (void *) "foo";
         sdu.size = 3;
-
-        rc = inetping_send(&sdu);
-        if (rc != EOK) {
-                printf(NAME ": Failed sending echo request (%d).\n", rc);
-                return rc;
-        }
-
-        return EOK;
+        
+        int rc = inetping_send(&sdu);
+        if (rc != EOK)
+                printf("Failed sending echo request: %s (%d).\n",
+                    str_error(rc), rc);
+        
+        return rc;
 }
 
@@ -136 +157 @@
 {
         uint16_t seq_no = 0;
-
+        
+        while ((repeat_count--) || (repeat_forever)) {
+                fibril_mutex_lock(&received_lock);
+                received = RECEIVED_NONE;
+                fibril_mutex_unlock(&received_lock);
+                
+                (void) ping_send(++seq_no);
+                
+                fibril_mutex_lock(&received_lock);
+                int rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                    PING_TIMEOUT);
+                received_t recv = received;
+                fibril_mutex_unlock(&received_lock);
+                
+                if ((rc == ETIMEOUT) || (recv == RECEIVED_NONE))
+                        printf("Echo request timed out (seq. no %u)\n", seq_no);
+                
+                if (recv == RECEIVED_INTERRUPT)
+                        break;
+                
+                if ((repeat_count > 0) || (repeat_forever)) {
+                        fibril_mutex_lock(&received_lock);
+                        rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                            PING_DELAY);
+                        recv = received;
+                        fibril_mutex_unlock(&received_lock);
+                        
+                        if (recv == RECEIVED_INTERRUPT)
+                                break;
+                }
+        }
+        
+        ping_signal_quit();
+        return 0;
+}
+
+static int input_fibril(void *arg)
+{
+        console_ctrl_t *con = console_init(stdin, stdout);
+        
         while (true) {
-                fibril_mutex_lock(&done_lock);
-                if (done) {
-                        fibril_mutex_unlock(&done_lock);
-                        return 0;
-                }
-                fibril_mutex_unlock(&done_lock);
-
-                (void) ping_send(++seq_no);
-                async_usleep(PING_DELAY);
-        }
-
-        return 0;
-}
-
-static int input_fibril(void *arg)
-{
-        console_ctrl_t *con;
-        cons_event_t ev;
-
-        con = console_init(stdin, stdout);
-        printf("[Press Ctrl-Q to quit]\n");
-
-        while (true) {
+                cons_event_t ev;
                 if (!console_get_event(con, &ev))
                         break;
-
-                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
-                    (ev.ev.key.mods & (KM_ALT | KM_SHIFT)) ==
-                    0 && (ev.ev.key.mods & KM_CTRL) != 0) {
+                
+                if ((ev.type == CEV_KEY) && (ev.ev.key.type == KEY_PRESS) &&
+                    ((ev.ev.key.mods & (KM_ALT | KM_SHIFT)) == 0) &&
+                    ((ev.ev.key.mods & KM_CTRL) != 0)) {
                         /* Ctrl+key */
                         if (ev.ev.key.key == KC_Q) {
-                                ping_signal_done();
-                                return 0;
+                                ping_signal_received(RECEIVED_INTERRUPT);
+                                break;
                         }
                 }
         }
-
+        
         return 0;
 }
@@ -184 +222 @@
         char *adest = NULL;
         char *sdest = NULL;
-        int rc;
-        int argi;
-
-        rc = inetping_init(&ev_ops);
-        if (rc != EOK) {
-                printf(NAME ": Failed connecting to internet ping service "
-                    "(%d).\n", rc);
-                goto error;
-        }
-
-        argi = 1;
-        if (argi < argc && str_cmp(argv[argi], "-r") == 0) {
-                ping_repeat = true;
-                ++argi;
-        } else {
-                ping_repeat = false;
-        }
-
-        if (argc - argi != 1) {
+        
+        int rc = inetping_init(&ev_ops);
+        if (rc != EOK) {
+                printf("Failed connecting to internet ping service: "
+                    "%s (%d).\n", str_error(rc), rc);
+                goto error;
+        }
+        
+        int c;
+        while ((c = getopt(argc, argv, short_options)) != -1) {
+                switch (c) {
+                case 'r':
+                        repeat_forever = true;
+                        break;
+                case 'n':
+                        rc = str_size_t(optarg, NULL, 10, true, &repeat_count);
+                        if (rc != EOK) {
+                                printf("Invalid repeat count.\n");
+                                print_syntax();
+                                goto error;
+                        }
+                        break;
+                default:
+                        printf("Unknown option passed.\n");
+                        print_syntax();
+                        goto error;
+                }
+        }
+        
+        if (optind >= argc) {
+                printf("IP address or host name not supplied.\n");
                 print_syntax();
                 goto error;
         }
-
+        
         /* Parse destination address */
         inet_addr_t dest_addr;
-        rc = inet_addr_parse(argv[argi], &dest_addr);
+        rc = inet_addr_parse(argv[optind], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argi], &hinfo, AF_INET);
+                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
                 if (rc != EOK) {
-                        printf(NAME ": Error resolving host '%s'.\n", argv[argi]);
+                        printf("Error resolving host '%s'.\n", argv[optind]);
                         goto error;
                 }
@@ -223 +273 @@
         uint16_t af = inet_addr_get(&dest_addr, &dest, NULL);
         if (af != AF_INET) {
-                printf(NAME ": Destination '%s' is not an IPv4 address.\n",
-                    argv[argi]);
+                printf("Destination '%s' is not an IPv4 address.\n",
+                    argv[optind]);
                 goto error;
         }
@@ -231 +281 @@
         rc = inetping_get_srcaddr(dest, &src);
         if (rc != EOK) {
-                printf(NAME ": Failed determining source address.\n");
+                printf("Failed determining source address.\n");
                 goto error;
         }
@@ -240 +290 @@
         rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -246 +296 @@
         rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -253 +303 @@
                 rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
                 if (rc < 0) {
-                        printf(NAME ": Out of memory.\n");
+                        printf("Out of memory.\n");
                         goto error;
                 }
@@ -260 +310 @@
                 adest = NULL;
         }
-
-        printf("Sending ICMP echo request from %s to %s.\n",
+        
+        printf("Sending ICMP echo request from %s to %s (Ctrl+Q to quit)\n",
             asrc, sdest);
-
-        fid_t fid;
-
-        if (ping_repeat) {
-                fid = fibril_create(transmit_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating transmit fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-
-                fid = fibril_create(input_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating input fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-        } else {
-                ping_send(1);
-        }
-
-        fibril_mutex_lock(&done_lock);
-        rc = EOK;
-        while (!done && rc != ETIMEOUT) {
-                rc = fibril_condvar_wait_timeout(&done_cv, &done_lock,
-                        ping_repeat ? 0 : PING_TIMEOUT);
-        }
-        fibril_mutex_unlock(&done_lock);
-
-        if (rc == ETIMEOUT) {
-                printf(NAME ": Echo request timed out.\n");
-                goto error;
-        }
-
+        
+        fid_t fid = fibril_create(transmit_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating transmit fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fid = fibril_create(input_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating input fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fibril_mutex_lock(&quit_lock);
+        while (!quit)
+                fibril_condvar_wait(&quit_cv, &quit_lock);
+        fibril_mutex_unlock(&quit_lock);
+        
         free(asrc);
         free(adest);

uspace/app/ping6/ping6.c

@@ -42 +42 @@
 #include <inet/inetping6.h>
 #include <io/console.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
+#include <str_error.h>
 #include <sys/types.h>
 
@@ -54 +57 @@
 #define PING_TIMEOUT (1000 * 1000)
 
+typedef enum {
+        RECEIVED_NONE,
+        RECEIVED_SUCCESS,
+        RECEIVED_INTERRUPT
+} received_t;
+
+static received_t received;
+static FIBRIL_CONDVAR_INITIALIZE(received_cv);
+static FIBRIL_MUTEX_INITIALIZE(received_lock);
+
+static bool quit = false;
+static FIBRIL_CONDVAR_INITIALIZE(quit_cv);
+static FIBRIL_MUTEX_INITIALIZE(quit_lock);
+
 static int ping_ev_recv(inetping6_sdu_t *);
-
-static bool done = false;
-static FIBRIL_CONDVAR_INITIALIZE(done_cv);
-static FIBRIL_MUTEX_INITIALIZE(done_lock);
 
 static inetping6_ev_ops_t ev_ops = {
@@ -67 +80 @@
 static addr128_t dest;
 
-static bool ping_repeat = false;
+static bool repeat_forever = false;
+static size_t repeat_count = 1;
+
+static const char *short_options = "rn:";
 
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <host>\n");
-}
-
-static void ping_signal_done(void)
-{
-        fibril_mutex_lock(&done_lock);
-        done = true;
-        fibril_mutex_unlock(&done_lock);
-        fibril_condvar_broadcast(&done_cv);
+        printf("Syntax: %s [-n <count>|-r] <host>\n", NAME);
+}
+
+static void ping_signal_received(received_t value)
+{
+        fibril_mutex_lock(&received_lock);
+        received = value;
+        fibril_mutex_unlock(&received_lock);
+        fibril_condvar_broadcast(&received_cv);
+}
+
+static void ping_signal_quit(void)
+{
+        fibril_mutex_lock(&quit_lock);
+        quit = true;
+        fibril_mutex_unlock(&quit_lock);
+        fibril_condvar_broadcast(&quit_cv);
 }
 
@@ -105 +129 @@
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
         
-        if (!ping_repeat)
-                ping_signal_done();
+        ping_signal_received(RECEIVED_SUCCESS);
         
         free(asrc);
@@ -116 +139 @@
 {
         inetping6_sdu_t sdu;
-        int rc;
-
+        
         addr128(src, sdu.src);
         addr128(dest, sdu.dest);
@@ -123 +145 @@
         sdu.data = (void *) "foo";
         sdu.size = 3;
-
-        rc = inetping6_send(&sdu);
-        if (rc != EOK) {
-                printf(NAME ": Failed sending echo request (%d).\n", rc);
-                return rc;
-        }
-
-        return EOK;
+        
+        int rc = inetping6_send(&sdu);
+        if (rc != EOK)
+                printf("Failed sending echo request: %s (%d).\n",
+                    str_error(rc), rc);
+        
+        return rc;
 }
 
@@ -136 +157 @@
 {
         uint16_t seq_no = 0;
-
+        
+        while ((repeat_count--) || (repeat_forever)) {
+                fibril_mutex_lock(&received_lock);
+                received = RECEIVED_NONE;
+                fibril_mutex_unlock(&received_lock);
+                
+                (void) ping_send(++seq_no);
+                
+                fibril_mutex_lock(&received_lock);
+                int rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                    PING_TIMEOUT);
+                received_t recv = received;
+                fibril_mutex_unlock(&received_lock);
+                
+                if ((rc == ETIMEOUT) || (recv == RECEIVED_NONE))
+                        printf("Echo request timed out (seq. no %u)\n", seq_no);
+                
+                if (recv == RECEIVED_INTERRUPT)
+                        break;
+                
+                if ((repeat_count > 0) || (repeat_forever)) {
+                        fibril_mutex_lock(&received_lock);
+                        rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                            PING_DELAY);
+                        recv = received;
+                        fibril_mutex_unlock(&received_lock);
+                        
+                        if (recv == RECEIVED_INTERRUPT)
+                                break;
+                }
+        }
+        
+        ping_signal_quit();
+        return 0;
+}
+
+static int input_fibril(void *arg)
+{
+        console_ctrl_t *con = console_init(stdin, stdout);
+        
         while (true) {
-                fibril_mutex_lock(&done_lock);
-                if (done) {
-                        fibril_mutex_unlock(&done_lock);
-                        return 0;
-                }
-                fibril_mutex_unlock(&done_lock);
-
-                (void) ping_send(++seq_no);
-                async_usleep(PING_DELAY);
-        }
-
-        return 0;
-}
-
-static int input_fibril(void *arg)
-{
-        console_ctrl_t *con;
-        cons_event_t ev;
-
-        con = console_init(stdin, stdout);
-        printf("[Press Ctrl-Q to quit]\n");
-
-        while (true) {
+                cons_event_t ev;
                 if (!console_get_event(con, &ev))
                         break;
-
-                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
-                    (ev.ev.key.mods & (KM_ALT | KM_SHIFT)) ==
-                    0 && (ev.ev.key.mods & KM_CTRL) != 0) {
+                
+                if ((ev.type == CEV_KEY) && (ev.ev.key.type == KEY_PRESS) &&
+                    ((ev.ev.key.mods & (KM_ALT | KM_SHIFT)) == 0) &&
+                    ((ev.ev.key.mods & KM_CTRL) != 0)) {
                         /* Ctrl+key */
                         if (ev.ev.key.key == KC_Q) {
-                                ping_signal_done();
-                                return 0;
+                                ping_signal_received(RECEIVED_INTERRUPT);
+                                break;
                         }
                 }
         }
-
+        
         return 0;
 }
@@ -184 +222 @@
         char *adest = NULL;
         char *sdest = NULL;
-        int rc;
-        int argi;
-
-        rc = inetping6_init(&ev_ops);
-        if (rc != EOK) {
-                printf(NAME ": Failed connecting to internet ping service "
-                    "(%d).\n", rc);
-                goto error;
-        }
-
-        argi = 1;
-        if (argi < argc && str_cmp(argv[argi], "-r") == 0) {
-                ping_repeat = true;
-                ++argi;
-        } else {
-                ping_repeat = false;
-        }
-
-        if (argc - argi != 1) {
+        
+        int rc = inetping6_init(&ev_ops);
+        if (rc != EOK) {
+                printf("Failed connecting to internet ping service: "
+                    "%s (%d).\n", str_error(rc), rc);
+                goto error;
+        }
+        
+        int c;
+        while ((c = getopt(argc, argv, short_options)) != -1) {
+                switch (c) {
+                case 'r':
+                        repeat_forever = true;
+                        break;
+                case 'n':
+                        rc = str_size_t(optarg, NULL, 10, true, &repeat_count);
+                        if (rc != EOK) {
+                                printf("Invalid repeat count.\n");
+                                print_syntax();
+                                goto error;
+                        }
+                        break;
+                default:
+                        printf("Unknown option passed.\n");
+                        print_syntax();
+                        goto error;
+                }
+        }
+        
+        if (optind >= argc) {
+                printf("IP address or host name not supplied.\n");
                 print_syntax();
                 goto error;
         }
-
+        
         /* Parse destination address */
         inet_addr_t dest_addr;
-        rc = inet_addr_parse(argv[argi], &dest_addr);
+        rc = inet_addr_parse(argv[optind], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argi], &hinfo, AF_INET6);
+                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
                 if (rc != EOK) {
-                        printf(NAME ": Error resolving host '%s'.\n", argv[argi]);
+                        printf("Error resolving host '%s'.\n", argv[optind]);
                         goto error;
                 }
@@ -223 +273 @@
         uint16_t af = inet_addr_get(&dest_addr, NULL, &dest);
         if (af != AF_INET6) {
-                printf(NAME ": Destination '%s' is not an IPv6 address.\n",
-                    argv[argi]);
+                printf("Destination '%s' is not an IPv6 address.\n",
+                    argv[optind]);
                 goto error;
         }
@@ -231 +281 @@
         rc = inetping6_get_srcaddr(dest, src);
         if (rc != EOK) {
-                printf(NAME ": Failed determining source address.\n");
+                printf("Failed determining source address.\n");
                 goto error;
         }
@@ -240 +290 @@
         rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -246 +296 @@
         rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -253 +303 @@
                 rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
                 if (rc < 0) {
-                        printf(NAME ": Out of memory.\n");
+                        printf("Out of memory.\n");
                         goto error;
                 }
@@ -260 +310 @@
                 adest = NULL;
         }
-
-        printf("Sending ICMP echo request from %s to %s.\n",
+        
+        printf("Sending ICMP echo request from %s to %s (Ctrl+Q to quit)\n",
             asrc, sdest);
-
-        fid_t fid;
-
-        if (ping_repeat) {
-                fid = fibril_create(transmit_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating transmit fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-
-                fid = fibril_create(input_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating input fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-        } else {
-                ping_send(1);
-        }
-
-        fibril_mutex_lock(&done_lock);
-        rc = EOK;
-        while (!done && rc != ETIMEOUT) {
-                rc = fibril_condvar_wait_timeout(&done_cv, &done_lock,
-                        ping_repeat ? 0 : PING_TIMEOUT);
-        }
-        fibril_mutex_unlock(&done_lock);
-
-        if (rc == ETIMEOUT) {
-                printf(NAME ": Echo request timed out.\n");
-                goto error;
-        }
-
+        
+        fid_t fid = fibril_create(transmit_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating transmit fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fid = fibril_create(input_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating input fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fibril_mutex_lock(&quit_lock);
+        while (!quit)
+                fibril_condvar_wait(&quit_cv, &quit_lock);
+        fibril_mutex_unlock(&quit_lock);
+        
         free(asrc);
         free(adest);

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

@@ -52 +52 @@
 };
 
+static const addr48_t inet_addr48_solicited_node = {
+        0x33, 0x33, 0xff, 0, 0, 0
+};
+
 static const inet_addr_t inet_addr_any_addr = {
         .family = AF_INET,
@@ -72 +76 @@
 }
 
+int addr48_compare(const addr48_t a, const addr48_t b)
+{
+        return memcmp(a, b, 6);
+}
+
 int addr128_compare(const addr128_t a, const addr128_t b)
 {
         return memcmp(a, b, 16);
+}
+
+/** Compute solicited node MAC multicast address from target IPv6 address
+ *
+ * @param ip  Target IPv6 address
+ * @param mac Solicited MAC address to be assigned
+ *
+ */
+void addr48_solicited_node(const addr128_t ip, addr48_t mac)
+{
+        memcpy(mac, inet_addr48_solicited_node, 3);
+        memcpy(mac + 3, ip + 13, 3);
 }
 

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

@@ -73 +73 @@
 extern void addr128(const addr128_t, addr128_t);
 
+extern int addr48_compare(const addr48_t, const addr48_t);
 extern int addr128_compare(const addr128_t, const addr128_t);
+
+extern void addr48_solicited_node(const addr128_t, addr48_t);
 
 extern void host2addr128_t_be(const addr128_t, addr128_t);

uspace/srv/net/dnsrsrv/dns_msg.h

@@ -52 +52 @@
 extern void dns_addr128_t_decode(uint8_t *, size_t, addr128_t);
 
-
 #endif
 

uspace/srv/net/ethip/ethip.h

@@ -46 +46 @@
 
 typedef struct {
-        link_t addr_list;
+        link_t link;
         inet_addr_t addr;
 } ethip_link_addr_t;
 
 typedef struct ethip_nic {
-        link_t nic_list;
+        link_t link;
         service_id_t svc_id;
         char *svc_name;
@@ -61 +61 @@
         /** MAC address */
         addr48_t mac_addr;
-        /** List of IP addresses configured on this link */
-        list_t addr_list; /* of ethip_link_addr_t */
+        
+        /**
+         * List of IP addresses configured on this link
+         * (of the type ethip_link_addr_t)
+         */
+        list_t addr_list;
 } ethip_nic_t;
 

uspace/srv/net/ethip/ethip_nic.c

@@ -45 +45 @@
 #include <device/nic.h>
 #include <stdlib.h>
-
+#include <net/socket_codes.h>
+#include <mem.h>
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -83 +84 @@
                 already_known = false;
 
-                list_foreach(ethip_nic_list, nic_link) {
-                        ethip_nic_t *nic = list_get_instance(nic_link,
-                            ethip_nic_t, nic_list);
+                list_foreach(ethip_nic_list, link) {
+                        ethip_nic_t *nic = list_get_instance(link,
+                            ethip_nic_t, link);
                         if (nic->svc_id == svcs[i]) {
                                 already_known = true;
@@ -108 +109 @@
 {
         ethip_nic_t *nic = calloc(1, sizeof(ethip_nic_t));
-
         if (nic == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating NIC structure. "
@@ -114 +114 @@
                 return NULL;
         }
-
-        link_initialize(&nic->nic_list);
+        
+        link_initialize(&nic->link);
         list_initialize(&nic->addr_list);
-
+        
         return nic;
 }
@@ -130 +130 @@
         }
         
-        link_initialize(&laddr->addr_list);
+        link_initialize(&laddr->link);
         laddr->addr = *addr;
         
@@ -140 +140 @@
         if (nic->svc_name != NULL)
                 free(nic->svc_name);
+        
         free(nic);
 }
@@ -180 +181 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened NIC '%s'", nic->svc_name);
-        list_append(&nic->nic_list, &ethip_nic_list);
+        list_append(&nic->link, &ethip_nic_list);
         in_list = true;
 
@@ -209 +210 @@
 error:
         if (in_list)
-                list_remove(&nic->nic_list);
+                list_remove(&nic->link);
+        
         if (nic->sess != NULL)
                 async_hangup(nic->sess);
+        
         ethip_nic_delete(nic);
         return rc;
@@ -312 +315 @@
         list_foreach(ethip_nic_list, link) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element");
-                ethip_nic_t *nic = list_get_instance(link, ethip_nic_t,
-                    nic_list);
+                ethip_nic_t *nic = list_get_instance(link, ethip_nic_t, link);
 
                 if (nic->iplink_sid == iplink_sid) {
@@ -334 +336 @@
 }
 
+/** Setup accepted multicast addresses
+ *
+ * Currently the set of accepted multicast addresses is
+ * determined only based on IPv6 addresses.
+ *
+ */
+static int ethip_nic_setup_multicast(ethip_nic_t *nic)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_setup_multicast()");
+        
+        /* Count the number of multicast addresses */
+        
+        size_t count = 0;
+        
+        list_foreach(nic->addr_list, link) {
+                ethip_link_addr_t *laddr = list_get_instance(link,
+                    ethip_link_addr_t, link);
+                
+                uint16_t af = inet_addr_get(&laddr->addr, NULL, NULL);
+                if (af == AF_INET6)
+                        count++;
+        }
+        
+        if (count == 0)
+                return nic_multicast_set_mode(nic->sess, NIC_MULTICAST_BLOCKED,
+                    NULL, 0);
+        
+        nic_address_t *mac_list = calloc(count, sizeof(nic_address_t));
+        if (mac_list == NULL)
+                return ENOMEM;
+        
+        /* Create the multicast MAC list */
+        
+        size_t i = 0;
+        
+        list_foreach(nic->addr_list, link) {
+                assert(i < count);
+                
+                ethip_link_addr_t *laddr = list_get_instance(link,
+                    ethip_link_addr_t, link);
+                
+                addr128_t v6;
+                uint16_t af = inet_addr_get(&laddr->addr, NULL, &v6);
+                if (af != AF_INET6)
+                        continue;
+                
+                addr48_t mac;
+                addr48_solicited_node(v6, mac);
+                
+                /* Avoid duplicate addresses in the list */
+                
+                bool found = false;
+                
+                for (size_t j = 0; j < i; j++) {
+                        if (addr48_compare(mac_list[j].address, mac)) {
+                                found = true;
+                                break;
+                        }
+                }
+                
+                if (!found) {
+                        addr48(mac, mac_list[i].address);
+                        i++;
+                } else
+                        count--;
+        }
+        
+        /* Setup the multicast MAC list */
+        
+        int rc = nic_multicast_set_mode(nic->sess, NIC_MULTICAST_LIST,
+            mac_list, count);
+        
+        free(mac_list);
+        return rc;
+}
+
 int ethip_nic_addr_add(ethip_nic_t *nic, inet_addr_t *addr)
 {
@@ -342 +420 @@
                 return ENOMEM;
         
-        list_append(&laddr->addr_list, &nic->addr_list);
-        return EOK;
+        list_append(&laddr->link, &nic->addr_list);
+        
+        return ethip_nic_setup_multicast(nic);
 }
 
@@ -354 +433 @@
                 return ENOENT;
         
-        list_remove(&laddr->addr_list);
+        list_remove(&laddr->link);
         ethip_link_addr_delete(laddr);
-        return EOK;
+        
+        return ethip_nic_setup_multicast(nic);
 }
 
@@ -366 +446 @@
         list_foreach(nic->addr_list, link) {
                 ethip_link_addr_t *laddr = list_get_instance(link,
-                    ethip_link_addr_t, addr_list);
+                    ethip_link_addr_t, link);
                 
                 if (inet_addr_compare(addr, &laddr->addr))

uspace/srv/net/inetsrv/inetsrv.c

@@ -69 +69 @@
 
 static inet_addr_t multicast_all_nodes = {
-        .family = AF_INET,
+        .family = AF_INET6,
         .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}
 };

uspace/srv/net/inetsrv/ndp.c

@@ -49 +49 @@
 #define NDP_REQUEST_TIMEOUT  (3 * 1000 * 1000)
 
-static addr48_t solicited_node_mac =
-    {0x33, 0x33, 0xff, 0, 0, 0};
-
 static addr128_t solicited_node_ip =
     {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0};
-
-/** Compute solicited node MAC multicast address from target IPv6 address
- *
- * @param ip_addr  Target IPv6 address
- * @param mac_addr Solicited MAC address to be assigned
- *
- */
-static void ndp_solicited_node_mac(addr128_t ip_addr, addr48_t mac_addr)
-{
-        memcpy(mac_addr, solicited_node_mac, 3);
-        memcpy(mac_addr + 3, ip_addr + 13, 3);
-}
 
 /** Compute solicited node IPv6 multicast address from target IPv6 address
@@ -186 +171 @@
         addr128(src_addr, packet.sender_proto_addr);
         addr128(ip_addr, packet.solicited_ip);
-        ndp_solicited_node_mac(ip_addr, packet.target_hw_addr);
+        addr48_solicited_node(ip_addr, packet.target_hw_addr);
         ndp_solicited_node_ip(ip_addr, packet.target_proto_addr);