patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

tests/net: Fix IPv6 and UDP test as UDP got stricter on checking header

Browse source 
Now length of the UDP header is checked, and obviously these test were
avoiding setting it properly.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2019-05-29 13:24:08 +02:00 committed by Jukka Rissanen
parent a5b90a4aad
commit c3c6dfaaeb
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
tests/net/ipv6/src/main.c
View file

@ -27,6 +27,8 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
#include "icmpv6.h"
#include "ipv6.h"
#include "udp_internal.h"
#define NET_LOG_ENABLED 1
#include "net_private.h"
@ -1088,28 +1090,23 @@ static struct net_pkt *setup_ipv6_udp(struct net_if *iface,
return NULL;
}
NET_IPV6_HDR(pkt)->vtc = 0x60;
NET_IPV6_HDR(pkt)->tcflow = 0U;
NET_IPV6_HDR(pkt)->flow = 0U;
NET_IPV6_HDR(pkt)->len = htons(NET_UDPH_LEN + strlen(payload));
if (net_ipv6_create(pkt, local_addr, remote_addr)) {
printk("Cannot create IPv6 pkt %p", pkt);
zassert_true(0, "exiting");
}
NET_IPV6_HDR(pkt)->nexthdr = IPPROTO_UDP;
NET_IPV6_HDR(pkt)->hop_limit = 255U;
if (net_udp_create(pkt, htons(local_port), htons(remote_port))) {
printk("Cannot create IPv6 pkt %p", pkt);
zassert_true(0, "exiting");
}
net_ipaddr_copy(&NET_IPV6_HDR(pkt)->src, local_addr);
net_ipaddr_copy(&NET_IPV6_HDR(pkt)->dst, remote_addr);
net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr));
net_pkt_set_ipv6_ext_len(pkt, 0);
net_buf_add(pkt->buffer, net_pkt_ip_hdr_len(pkt) +
sizeof(struct net_udp_hdr));
NET_UDP_HDR(pkt)->src_port = htons(local_port);
NET_UDP_HDR(pkt)->dst_port = htons(remote_port);
net_buf_add_mem(pkt->buffer, payload, strlen(payload));
if (net_pkt_write(pkt, (u8_t *)payload, strlen(payload))) {
printk("Cannot write IPv6 ext header pkt %p", pkt);
zassert_true(0, "exiting");
}
net_pkt_cursor_init(pkt);
net_ipv6_finalize(pkt, IPPROTO_UDP);
net_pkt_cursor_init(pkt);
return pkt;

5
tests/net/udp/src/main.c
View file

@ -303,6 +303,9 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface,
zassert_true(0, "exiting");
}
net_pkt_set_ipv6_ext_len(pkt, sizeof(ipv6_hop_by_hop_ext_hdr));
net_pkt_set_ipv6_next_hdr(pkt, NET_IPV6_NEXTHDR_HBHO);
if (net_udp_create(pkt, htons(src_port), htons(dst_port))) {
printk("Cannot create IPv6 pkt %p", pkt);
zassert_true(0, "exiting");
@ -314,7 +317,7 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface,
}
net_pkt_cursor_init(pkt);
net_ipv6_finalize(pkt, 0);
net_ipv6_finalize(pkt, IPPROTO_UDP);
ret = net_recv_data(iface, pkt);
if (ret < 0) {