From 41eb29521f259a7d20170d9b56672bda4a476c2e Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Wed, 10 May 2017 20:53:02 +0200
Subject: [PATCH] tests: adapt lwip tests for v2.0.2's API

---
 tests/lwip_sock_ip/main.c   | 6 ++----
 tests/lwip_sock_ip/stack.c  | 7 +++++--
 tests/lwip_sock_udp/main.c  | 6 ++----
 tests/lwip_sock_udp/stack.c | 5 ++++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tests/lwip_sock_ip/main.c b/tests/lwip_sock_ip/main.c
index abe9887bf..3b64aed55 100644
--- a/tests/lwip_sock_ip/main.c
+++ b/tests/lwip_sock_ip/main.c
@@ -868,10 +868,8 @@ static void test_sock_ip_send6__EHOSTUNREACH(void)
     static const sock_ip_ep_t remote = { .addr = { .ipv6 = _TEST_ADDR6_WRONG },
                                          .family = AF_INET6 };
 
-    /* lwIP returns ENOMEM on failed neighbor cache lookup, since it "tries" to
-     * create one so we have to live with this weird behavior */
-    assert(-ENOMEM == sock_ip_send(NULL, "ABCD", sizeof("ABCD"), _TEST_PROTO,
-                                   &remote));
+    assert(-EHOSTUNREACH == sock_ip_send(NULL, "ABCD", sizeof("ABCD"), _TEST_PROTO,
+                                         &remote));
 }
 
 static void test_sock_ip_send6__ENOTCONN(void)
diff --git a/tests/lwip_sock_ip/stack.c b/tests/lwip_sock_ip/stack.c
index d30ceeca3..52e58a3f5 100644
--- a/tests/lwip_sock_ip/stack.c
+++ b/tests/lwip_sock_ip/stack.c
@@ -27,6 +27,7 @@
 #include "lwip/ip4.h"
 #include "lwip/inet_chksum.h"
 #include "lwip/nd6.h"
+#include "lwip/priv/nd6_priv.h"
 #include "lwip/netif.h"
 #include "lwip/netif/netdev.h"
 #include "lwip/tcpip.h"
@@ -35,7 +36,7 @@
 #include "constants.h"
 #include "stack.h"
 
-#define _MSG_QUEUE_SIZE     (1)
+#define _MSG_QUEUE_SIZE     (4)
 #define _SEND_DONE  (0x92d7)
 #define _NETDEV_BUFFER_SIZE     (128)
 
@@ -197,7 +198,9 @@ void _net_init(void)
     static const uint8_t local6[] = _TEST_ADDR6_LOCAL;
     s8_t idx;
     netif_add_ip6_address(&netif, (ip6_addr_t *)&local6, &idx);
-    netif_ip6_addr_set_state(&netif, idx, IP6_ADDR_VALID);
+    for (int i = 0; i <= idx; i++) {
+        netif.ip6_addr_state[i] |= IP6_ADDR_VALID;
+    }
 #endif
     netif_set_default(&netif);
     lwip_bootstrap();
diff --git a/tests/lwip_sock_udp/main.c b/tests/lwip_sock_udp/main.c
index fe8dd5341..77416057b 100644
--- a/tests/lwip_sock_udp/main.c
+++ b/tests/lwip_sock_udp/main.c
@@ -995,10 +995,8 @@ static void test_sock_udp_send6__EHOSTUNREACH(void)
                                           .family = AF_INET6,
                                           .port = _TEST_PORT_REMOTE };
 
-    /* lwIP returns ENOMEM on failed neighbor cache lookup, since it "tries" to
-     * create one so we have to live with this weird behavior */
-    assert(-ENOMEM == sock_udp_send(NULL, "ABCD", sizeof("ABCD"),
-                                    &remote));
+    assert(-EHOSTUNREACH == sock_udp_send(NULL, "ABCD", sizeof("ABCD"),
+                                          &remote));
 }
 
 static void test_sock_udp_send6__EINVAL_port(void)
diff --git a/tests/lwip_sock_udp/stack.c b/tests/lwip_sock_udp/stack.c
index a186e2e42..45539cb47 100644
--- a/tests/lwip_sock_udp/stack.c
+++ b/tests/lwip_sock_udp/stack.c
@@ -28,6 +28,7 @@
 #include "lwip/ip4.h"
 #include "lwip/inet_chksum.h"
 #include "lwip/nd6.h"
+#include "lwip/priv/nd6_priv.h"
 #include "lwip/netif.h"
 #include "lwip/netif/netdev.h"
 #include "lwip/opt.h"
@@ -200,7 +201,9 @@ void _net_init(void)
     static const uint8_t local6[] = _TEST_ADDR6_LOCAL;
     s8_t idx;
     netif_add_ip6_address(&netif, (ip6_addr_t *)&local6, &idx);
-    netif_ip6_addr_set_state(&netif, idx, IP6_ADDR_VALID);
+    for (int i = 0; i <= idx; i++) {
+        netif.ip6_addr_state[i] |= IP6_ADDR_VALID;
+    }
 #endif
     netif_set_default(&netif);
     lwip_bootstrap();