Merge branch 'dev' of github.com:AndreasAakesson/IncludeOS into dev

fwsGonzo · fwsGonzo · commit fea2aae6dd21 · 2017-08-16T11:56:36.000+02:00
diff --git a/src/net/tcp/connection.cpp b/src/net/tcp/connection.cpp
@@ -629,9 +629,14 @@ void Connection::take_rtt_measure(const Packet& packet)
   if(cb.SND.TS_OK)
   {
     auto* ts = parse_ts_option(packet);
-    rttm.rtt_measurement(RTTM::milliseconds{host_.get_ts_value() - ntohl(ts->ecr)});
+    if(ts)
+    {
+      rttm.rtt_measurement(RTTM::milliseconds{host_.get_ts_value() - ntohl(ts->ecr)});
+      return;
+    }
   }
-  else if(rttm.active())
+
+  if(rttm.active())
   {
     rttm.stop(RTTM::milliseconds{host_.get_ts_value()});
   }

Original file line number	Diff line number	Diff line change
`@@ -629,9 +629,14 @@ void Connection::take_rtt_measure(const Packet& packet)`
`629`	`629`	`if(cb.SND.TS_OK)`
`630`	`630`	`{`
`631`	`631`	`auto* ts = parse_ts_option(packet);`
`632`		`- rttm.rtt_measurement(RTTM::milliseconds{host_.get_ts_value() - ntohl(ts->ecr)});`
	`632`	`+ if(ts)`
	`633`	`+ {`
	`634`	`+ rttm.rtt_measurement(RTTM::milliseconds{host_.get_ts_value() - ntohl(ts->ecr)});`
	`635`	`+ return;`
	`636`	`+ }`
`633`	`637`	`}`
`634`		`- else if(rttm.active())`
	`638`	`+`
	`639`	`+ if(rttm.active())`
`635`	`640`	`{`
`636`	`641`	`rttm.stop(RTTM::milliseconds{host_.get_ts_value()});`
`637`	`642`	`}`