Changeset bdae198 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (2 diffs)

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_INET6,
+        .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 */