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

net: tcp: Add tcp options length

Browse source 
The tcphdr->offset was not set when tcp options were added.

Change-Id: I19fe97983ce81948a9a84893183e5c9000f12767
Signed-off-by: june li <junelizh@foxmail.com>
This commit is contained in:
june li 2017-03-03 17:50:35 +08:00 committed by Jukka Rissanen
parent eddd598323
commit 07b8e4cb01
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subsys/net/ip/tcp.c
View file

@ -218,7 +218,7 @@ int net_tcp_release(struct net_tcp *tcp)
return 0;
}
static inline int net_tcp_add_options(struct net_buf *header, size_t len,
static inline uint8_t net_tcp_add_options(struct net_buf *header, size_t len,
void *data)
{
uint8_t optlen;
@ -232,7 +232,7 @@ static inline int net_tcp_add_options(struct net_buf *header, size_t len,
optlen = len;
}
return 0;
return optlen;
}
static void finalize_segment(struct net_context *context, struct net_buf *buf)
@ -259,6 +259,7 @@ static struct net_buf *prepare_segment(struct net_tcp *tcp,
struct net_tcp_hdr *tcphdr;
struct net_context *context = tcp->context;
uint16_t dst_port, src_port;
uint8_t optlen = 0;
NET_ASSERT(context);
@ -309,11 +310,12 @@ static struct net_buf *prepare_segment(struct net_tcp *tcp,
tcphdr = (struct net_tcp_hdr *)net_buf_add(header, NET_TCPH_LEN);
if (segment->options && segment->optlen) {
net_tcp_add_options(header, segment->optlen, segment->options);
} else {
tcphdr->offset = NET_TCPH_LEN << 2;
optlen = net_tcp_add_options(header, segment->optlen,
segment->options);
}
tcphdr->offset = (NET_TCPH_LEN + optlen) << 2;
tcphdr->src_port = src_port;
tcphdr->dst_port = dst_port;
sys_put_be32(segment->seq, tcphdr->seq);