michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: ipv4: Remove temporary interception of TCP, UDP for TCP2

Browse source 
Remove temporary interception of TCP, UDP for TTCN-3 based
TCP2 sanity check.

As a part of adding IPv6 support, TCP2 will register test
callbacks/inputs with net_conn_register().

Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
This commit is contained in:
Oleg Zhurakivskyy 2020-02-26 15:07:08 +02:00 • committed by Jukka Rissanen
commit 6be5935f17
1 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
subsys/net/ip/ipv4.c
View file

@ -23,10 +23,6 @@ LOG_MODULE_REGISTER(net_ipv4, CONFIG_NET_IPV4_LOG_LEVEL);
#include "udp_internal.h" #include "udp_internal.h"
#include "tcp_internal.h" #include "tcp_internal.h"
#include "ipv4.h" #include "ipv4.h"
#ifdef CONFIG_NET_TCP2
#include "tcp2.h"
#endif
#include "tp.h"
/* Timeout for various buffer allocations in this file. */ /* Timeout for various buffer allocations in this file. */
#define NET_BUF_TIMEOUT K_MSEC(50) #define NET_BUF_TIMEOUT K_MSEC(50)
@ -222,18 +218,6 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt)
goto drop; goto drop;
} }
#if defined(CONFIG_NET_TCP2) && defined(CONFIG_NET_TEST_PROTOCOL)
if (hdr->proto == IPPROTO_TCP) {
tcp_input(pkt);
goto drop;
}
#endif
#if defined(CONFIG_NET_TEST_PROTOCOL)
if (hdr->proto == IPPROTO_UDP) {
tp_input(pkt);
goto drop;
}
#endif
hdr_len = (hdr->vhl & NET_IPV4_IHL_MASK) * 4U; hdr_len = (hdr->vhl & NET_IPV4_IHL_MASK) * 4U;
if (hdr_len < sizeof(struct net_ipv4_hdr)) { if (hdr_len < sizeof(struct net_ipv4_hdr)) {
NET_DBG("DROP: Invalid hdr length"); NET_DBG("DROP: Invalid hdr length");