commit 07b8e4cb01dcb364752b83e63e371b648e200aba
author june li <junelizh@foxmail.com> Fri Mar 03 17:50:35 2017 +0800
committer Jukka Rissanen <jukka.rissanen@linux.intel.com> Thu Mar 09 20:33:47 2017 +0200
tree 7109ed829469032457d29f4e6b7a45baa35552ea
parent eddd598323f10365801cc7995821402764c39598

net: tcp: Add tcp options length

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

Change-Id: I19fe97983ce81948a9a84893183e5c9000f12767
Signed-off-by: june li <junelizh@foxmail.com>

subsys/net/ip/tcp.c

diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c
index 2c12cc1..3226b02 100644
--- a/subsys/net/ip/tcp.c
+++ b/subsys/net/ip/tcp.c
@@ -218,7 +218,7 @@
 	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 @@
 		optlen = len;
 	}
 
-	return 0;
+	return optlen;
 }
 
 static void finalize_segment(struct net_context *context, struct net_buf *buf)
@@ -259,6 +259,7 @@
 	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 @@
 	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);