3 files changed, 13 insertions, 7 deletions

diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index 335a0927a..fcec8c15a 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -121,7 +121,8 @@ int FAST_FUNC d6_send_raw_packet(
 int FAST_FUNC d6_send_kernel_packet(
                 struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                 struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port
+                struct in6_addr *dst_ipv6, int dest_port,
+                int ifindex
 );
 
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index a0cdded11..95de74f9b 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -623,7 +623,8 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st
                 return d6_send_kernel_packet(
                         &packet, (opt_ptr - (uint8_t*) &packet),
                         our_cur_ipv6, CLIENT_PORT6,
-                        server_ipv6, SERVER_PORT6
+                        server_ipv6, SERVER_PORT6,
+                        client_config.ifindex
                 );
         return d6_mcast_from_client_config_ifindex(&packet, opt_ptr);
 }
@@ -645,15 +646,14 @@ static int send_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cu
         return d6_send_kernel_packet(
                 &packet, (opt_ptr - (uint8_t*) &packet),
                 our_cur_ipv6, CLIENT_PORT6,
-                server_ipv6, SERVER_PORT6
+                server_ipv6, SERVER_PORT6,
+                client_config.ifindex
         );
 }
 
 /* Returns -1 on errors that are fatal for the socket, -2 for those that aren't */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6
-        UNUSED_PARAM
-        , struct d6_packet *d6_pkt, int fd)
+static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6, struct d6_packet *d6_pkt, int fd)
 {
         int bytes;
         struct ip6_udp_d6_packet packet;
@@ -702,6 +702,9 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6
 //              return -2;
 //      }
 
+        if (peer_ipv6)
+                *peer_ipv6 = packet.ip6.ip6_src; /* struct copy */
+
         log1("received %s", "a packet");
         d6_dump_packet(&packet.data);
 
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index e166f520d..79a0ac8a8 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -127,7 +127,8 @@ int FAST_FUNC d6_send_raw_packet(
 int FAST_FUNC d6_send_kernel_packet(
                 struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                 struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port)
+                struct in6_addr *dst_ipv6, int dest_port,
+                int ifindex)
 {
         struct sockaddr_in6 sa;
         int fd;
@@ -154,6 +155,7 @@ int FAST_FUNC d6_send_kernel_packet(
         sa.sin6_family = AF_INET6;
         sa.sin6_port = htons(dest_port);
         sa.sin6_addr = *dst_ipv6; /* struct copy */
+        sa.sin6_scope_id = ifindex;
         if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
                 msg = "connect";
                 goto ret_close;