Skip to content

Commit fd14014

Browse files
Tomasz Bursztykanashif
Tomasz Bursztyka
authored and
nashif
committed
net/tcp: Move net_tcp_set_hdr() away from net core
Only the unit test needs it now, so let's move it there. Signed-off-by: Tomasz Bursztyka <[email protected]>
1 parent 869427c commit fd14014

File tree

14 files changed

+35
-106
lines changed

14 files changed

+35
-106
lines changed

‎include/net/tcp.h

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎subsys/net/ip/connection.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ LOG_MODULE_REGISTER(net_conn, CONFIG_NET_CONN_LOG_LEVEL);
1717
#include <net/net_core.h>
1818
#include <net/net_pkt.h>
1919
#include <net/udp.h>
20-
#include <net/tcp.h>
2120
#include <net/ethernet.h>
2221
#include <net/socket_can.h>
2322

‎subsys/net/ip/ipv4.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LOG_MODULE_REGISTER(net_ipv4, CONFIG_NET_IPV4_LOG_LEVEL);
1616
#include <net/net_pkt.h>
1717
#include <net/net_stats.h>
1818
#include <net/net_context.h>
19-
#include <net/tcp.h>
2019
#include "net_private.h"
2120
#include "connection.h"
2221
#include "net_stats.h"

‎subsys/net/ip/ipv6.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ LOG_MODULE_REGISTER(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
2323
#include <net/net_stats.h>
2424
#include <net/net_context.h>
2525
#include <net/net_mgmt.h>
26-
#include <net/tcp.h>
2726
#include "net_private.h"
2827
#include "connection.h"
2928
#include "icmpv6.h"

‎subsys/net/ip/ipv6_fragment.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
1717
#include <net/net_stats.h>
1818
#include <net/net_context.h>
1919
#include <net/net_mgmt.h>
20-
#include <net/tcp.h>
2120
#include "net_private.h"
2221
#include "connection.h"
2322
#include "icmpv6.h"

‎subsys/net/ip/ipv6_mld.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
1717
#include <net/net_stats.h>
1818
#include <net/net_context.h>
1919
#include <net/net_mgmt.h>
20-
#include <net/tcp.h>
2120
#include "net_private.h"
2221
#include "connection.h"
2322
#include "icmpv6.h"

‎subsys/net/ip/ipv6_nbr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
2323
#include <net/net_stats.h>
2424
#include <net/net_context.h>
2525
#include <net/net_mgmt.h>
26-
#include <net/tcp.h>
2726
#include "net_private.h"
2827
#include "connection.h"
2928
#include "icmpv6.h"

‎subsys/net/ip/net_context.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ LOG_MODULE_REGISTER(net_ctx, CONFIG_NET_CONTEXT_LOG_LEVEL);
2222
#include <net/net_ip.h>
2323
#include <net/net_context.h>
2424
#include <net/net_offload.h>
25-
#include <net/tcp.h>
2625
#include <net/ethernet.h>
2726
#include <net/socket_can.h>
2827

‎subsys/net/ip/net_core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ LOG_MODULE_REGISTER(net_core, CONFIG_NET_CORE_LOG_LEVEL);
2626
#include <net/net_pkt.h>
2727
#include <net/net_core.h>
2828
#include <net/dns_resolve.h>
29-
#include <net/tcp.h>
3029
#include <net/gptp.h>
3130
#include <net/lldp.h>
3231

‎subsys/net/ip/net_pkt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ LOG_MODULE_REGISTER(net_pkt, CONFIG_NET_PKT_LOG_LEVEL);
3737
#include <net/net_pkt.h>
3838
#include <net/ethernet.h>
3939
#include <net/udp.h>
40-
#include <net/tcp.h>
4140

4241
#include "net_private.h"
4342
#include "tcp_internal.h"

‎subsys/net/ip/net_shell.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
2929
#include "connection.h"
3030

3131
#if defined(CONFIG_NET_TCP)
32-
#include <net/tcp.h>
3332
#include "tcp_internal.h"
3433
#endif
3534

‎subsys/net/ip/tcp.c

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ LOG_MODULE_REGISTER(net_tcp, CONFIG_NET_TCP_LOG_LEVEL);
2424
#include <net/net_pkt.h>
2525
#include <net/net_ip.h>
2626
#include <net/net_context.h>
27-
#include <net/tcp.h>
2827
#include <misc/byteorder.h>
2928

3029
#include "connection.h"
@@ -1266,41 +1265,6 @@ bool net_tcp_validate_seq(struct net_tcp *tcp, struct net_tcp_hdr *tcp_hdr)
12661265
+ net_tcp_get_recv_wnd(tcp)) < 0);
12671266
}
12681267

1269-
struct net_tcp_hdr *net_tcp_set_hdr(struct net_pkt *pkt,
1270-
struct net_tcp_hdr *hdr)
1271-
{
1272-
NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
1273-
struct net_pkt_cursor backup;
1274-
struct net_tcp_hdr *tcp_hdr;
1275-
bool overwrite;
1276-
1277-
overwrite = net_pkt_is_being_overwritten(pkt);
1278-
net_pkt_set_overwrite(pkt, true);
1279-
1280-
net_pkt_cursor_backup(pkt, &backup);
1281-
net_pkt_cursor_init(pkt);
1282-
1283-
if (net_pkt_skip(pkt, net_pkt_ip_hdr_len(pkt) +
1284-
net_pkt_ipv6_ext_len(pkt))) {
1285-
tcp_hdr = NULL;
1286-
goto out;
1287-
}
1288-
1289-
tcp_hdr = (struct net_tcp_hdr *)net_pkt_get_data_new(pkt, &tcp_access);
1290-
if (!tcp_hdr) {
1291-
goto out;
1292-
}
1293-
1294-
memcpy(tcp_hdr, hdr, sizeof(struct net_tcp_hdr));
1295-
1296-
net_pkt_set_data(pkt, &tcp_access);
1297-
out:
1298-
net_pkt_cursor_restore(pkt, &backup);
1299-
net_pkt_set_overwrite(pkt, overwrite);
1300-
1301-
return tcp_hdr == NULL ? NULL : hdr;
1302-
}
1303-
13041268
int net_tcp_finalize(struct net_pkt *pkt)
13051269
{
13061270
NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);

‎subsys/net/ip/tcp_internal.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -659,14 +659,6 @@ static inline int net_tcp_finalize(struct net_pkt *pkt)
659659
return 0;
660660
}
661661

662-
static inline struct net_tcp_hdr *net_tcp_set_hdr(struct net_pkt *pkt,
663-
struct net_tcp_hdr *hdr)
664-
{
665-
ARG_UNUSED(pkt);
666-
ARG_UNUSED(hdr);
667-
return NULL;
668-
}
669-
670662
static inline int tcp_hdr_len(struct net_pkt *pkt)
671663
{
672664
ARG_UNUSED(pkt);

‎tests/net/tcp/src/main.c

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TCP_LOG_LEVEL);
2323
#include <net/net_core.h>
2424
#include <net/net_pkt.h>
2525
#include <net/net_ip.h>
26-
#include <net/tcp.h>
2726
#include <net/dummy.h>
2827

2928
#include <tc_util.h>
@@ -247,6 +246,41 @@ struct net_tcp_hdr *net_tcp_get_hdr(struct net_pkt *pkt,
247246
return tcp_hdr;
248247
}
249248

249+
struct net_tcp_hdr *net_tcp_set_hdr(struct net_pkt *pkt,
250+
struct net_tcp_hdr *hdr)
251+
{
252+
NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
253+
struct net_pkt_cursor backup;
254+
struct net_tcp_hdr *tcp_hdr;
255+
bool overwrite;
256+
257+
overwrite = net_pkt_is_being_overwritten(pkt);
258+
net_pkt_set_overwrite(pkt, true);
259+
260+
net_pkt_cursor_backup(pkt, &backup);
261+
net_pkt_cursor_init(pkt);
262+
263+
if (net_pkt_skip(pkt, net_pkt_ip_hdr_len(pkt) +
264+
net_pkt_ipv6_ext_len(pkt))) {
265+
tcp_hdr = NULL;
266+
goto out;
267+
}
268+
269+
tcp_hdr = (struct net_tcp_hdr *)net_pkt_get_data_new(pkt, &tcp_access);
270+
if (!tcp_hdr) {
271+
goto out;
272+
}
273+
274+
memcpy(tcp_hdr, hdr, sizeof(struct net_tcp_hdr));
275+
276+
net_pkt_set_data(pkt, &tcp_access);
277+
out:
278+
net_pkt_cursor_restore(pkt, &backup);
279+
net_pkt_set_overwrite(pkt, overwrite);
280+
281+
return tcp_hdr == NULL ? NULL : hdr;
282+
}
283+
250284
struct ud {
251285
const struct sockaddr *remote_addr;
252286
const struct sockaddr *local_addr;

0 commit comments

Comments
 (0)