From 4e1da2381736adc2a37690261f2d6bfbc2e2ef8d Mon Sep 17 00:00:00 2001
From: Martin Lenders <mail@martin-lenders.de>
Date: Sat, 1 Mar 2014 19:14:14 +0100
Subject: [PATCH] Fix test_pnet

fixes #829
---
 sys/net/network_layer/sixlowpan/icmp.c |  2 +-
 tests/test_pnet/Makefile               | 11 +++++
 tests/test_pnet/main.c                 | 61 +++++++++++++-------------
 3 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/sys/net/network_layer/sixlowpan/icmp.c b/sys/net/network_layer/sixlowpan/icmp.c
index 798717edb6..1ca7ff4d93 100644
--- a/sys/net/network_layer/sixlowpan/icmp.c
+++ b/sys/net/network_layer/sixlowpan/icmp.c
@@ -618,7 +618,7 @@ void icmpv6_send_router_adv(ipv6_addr_t *addr, uint8_t sllao, uint8_t mtu, uint8
                 }
             }
 
-            contexts = (lowpan_context_t *)calloc(contexts_len, sizeof(lowpan_context_t));
+            contexts = (lowpan_context_t *)malloc(contexts_len * sizeof(lowpan_context_t));
             memcpy(contexts, c_tmp, contexts_len);
         }
 
diff --git a/tests/test_pnet/Makefile b/tests/test_pnet/Makefile
index 8ca3400f81..a9cd5cee9b 100644
--- a/tests/test_pnet/Makefile
+++ b/tests/test_pnet/Makefile
@@ -1,6 +1,17 @@
 export PROJECT = test_pnet
 include ../Makefile.tests_common
 
+BOARD_BLACKLIST := chronos mbed_lpc1768 msb-430 msb-430h redbee-econotag \
+                   telosb wsn430-v1_3b wsn430-v1_4
+# chronos:          not enough RAM
+# mbed_lpc1768:     see https://github.com/RIOT-OS/RIOT/issues/675
+# msb-430:          see https://github.com/RIOT-OS/RIOT/issues/658
+# msb-430h:         not enough RAM
+# redbee-econotag:  not enough RAM
+# telosb:           not enough RAM
+# wsn430-v1_3b:     not enough RAM
+# wsn430-v1_4:      not enough RAM
+
 USEMODULE += posix
 USEMODULE += pnet
 USEMODULE += vtimer
diff --git a/tests/test_pnet/main.c b/tests/test_pnet/main.c
index eef717b896..18ad2aba84 100644
--- a/tests/test_pnet/main.c
+++ b/tests/test_pnet/main.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "net_if.h"
+#include "sixlowpan.h"
 #include "ipv6.h"
 
 #ifndef R_ADDR
@@ -36,47 +37,45 @@
 
 #define PORT    (1234)
 
+#define ERROR(...)  printf("ERROR: " __VA_ARGS__)
+
 int init_local_address(uint16_t r_addr)
 {
     ipv6_addr_t std_addr;
     ipv6_addr_init(&std_addr, 0xabcd, 0xef12, 0, 0, 0x1034, 0x00ff, 0xfe00,
                    0);
-    return net_if_set_hardware_address(r_addr) &&
-           sixlowpan_lowpan_adhoc_init(0, &std_addr);
+    net_if_set_src_address_mode(0, NET_IF_TRANS_ADDR_M_SHORT);
+    return net_if_set_hardware_address(0, r_addr) &&
+           sixlowpan_lowpan_init_adhoc_interface(0, &std_addr);
 }
 
 int main(void)
 {
     int sockfd, res;
-    struct sockaddr_in6 my_addr, their_addr = {
-        .sin6_family = AF_INET6,
-#if R_ADDR == 1
-        .sin6_port = PORT,
-#else
-        .sin6_port = 0,
-#endif
-        .sin6_flowinfo = 0,
-#if R_ADDR == 1
-        .sin6_addr = {{{
-                    0xab, 0xcd, 0xef, 0x12, 0x00, 0x00, 0x00, 0x00,
-                    0x10, 0x34, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x02
-                }
-            }
-        },
-#else
-        .sin6_addr = {{{
-                    0xab, 0xcd, 0xef, 0x12, 0x00, 0x00, 0x00, 0x00,
-                    0x10, 0x34, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01
-                }
-            }
-        },
-#endif
-        .sin6_scope_id = 0,
-    };
+    struct sockaddr_in6 my_addr, their_addr;
     char buffer[14];
 
+    their_addr.sin6_family = AF_INET6;
+#if R_ADDR == 1
+    their_addr.sin6_port = PORT;
+#else
+    their_addr.sin6_port = 0;
+#endif
+    their_addr.sin6_flowinfo = 0;
+    memset(&(their_addr.sin6_addr), 0, sizeof(their_addr.sin6_addr));
+    their_addr.sin6_addr.uint16[0] = htons(0xabcd);
+    their_addr.sin6_addr.uint16[1] = htons(0xef12);
+    their_addr.sin6_addr.uint16[5] = htons(0x00ff);
+    their_addr.sin6_addr.uint16[6] = htons(0xfe00);
+#if R_ADDR == 1
+    their_addr.sin6_addr.uint16[7] = htons(2);
+#else
+    their_addr.sin6_addr.uint16[7] = htons(1);
+#endif
+    their_addr.sin6_scope_id = 0;
+
     if (!init_local_address(R_ADDR)) {
-        fprintf(stderr, "Can not initialize IP for hardware address %d.", R_ADDR);
+        ERROR("Can not initialize IP for hardware address %d.", R_ADDR);
         return 1;
     }
 
@@ -89,7 +88,7 @@ int main(void)
     res = bind(sockfd, (struct sockaddr *)&my_addr, sizeof(my_addr));
 
     if (res < 0) {
-        perror("Socket could not be bind");
+        ERROR("Socket could not be bind");
         return 1;
     }
 
@@ -104,7 +103,7 @@ int main(void)
                    &their_len);
 
     if (their_addr.sin6_addr.uint8[15] != 1) {
-        fprintf(stderr, "Wrong sender address: %d\n", their_addr.sin6_addr.uint8[11]);
+        ERROR("Wrong sender address: %d\n", their_addr.sin6_addr.uint8[11]);
         return 1;
     }
 
@@ -112,7 +111,7 @@ int main(void)
 #endif
 
     if (res < 0) {
-        perror("Message error");
+        ERROR("Message error");
         return 1;
     }