X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=utcp.c;h=fd507f91abecc9d674ab99c0cb47ef1d94b1f96e;hb=adbd21ef2be13e8d6ca329be012f702f2ba43c40;hp=383e27f341b8e2c85a61da86013ac30184a24542;hpb=a7d31e61566f0d2e6cb0821fcdaf74ccfc1f8f64;p=utcp

diff --git a/utcp.c b/utcp.c
index 383e27f..fd507f9 100644
--- a/utcp.c
+++ b/utcp.c
@@ -61,8 +61,7 @@ static void timespec_sub(const struct timespec *a, const struct timespec *b, str
 }
 
 static int32_t timespec_diff_usec(const struct timespec *a, const struct timespec *b) {
-	int64_t diff = (a->tv_sec - b->tv_sec) * 1000000000 + a->tv_sec - b->tv_sec;
-	return diff / 1000;
+	return (a->tv_sec - b->tv_sec) * 1000000 + (a->tv_nsec - b->tv_nsec) / 1000;
 }
 
 static bool timespec_lt(const struct timespec *a, const struct timespec *b) {
@@ -75,6 +74,7 @@ static bool timespec_lt(const struct timespec *a, const struct timespec *b) {
 
 static void timespec_clear(struct timespec *a) {
 	a->tv_sec = 0;
+	a->tv_nsec = 0;
 }
 
 static bool timespec_isset(const struct timespec *a) {
@@ -525,6 +525,9 @@ static struct utcp_connection *allocate_connection(struct utcp *utcp, uint16_t s
 	c->snd.cwnd = (utcp->mss > 2190 ? 2 : utcp->mss > 1095 ? 3 : 4) * utcp->mss;
 	c->snd.ssthresh = ~0;
 	debug_cwnd(c);
+	c->srtt = 0;
+	c->rttvar = 0;
+	c->rto = START_RTO;
 	c->utcp = utcp;
 
 	// Add it to the sorted list of connections
@@ -550,36 +553,34 @@ static void update_rtt(struct utcp_connection *c, uint32_t rtt) {
 		return;
 	}
 
-	struct utcp *utcp = c->utcp;
-
-	if(!utcp->srtt) {
-		utcp->srtt = rtt;
-		utcp->rttvar = rtt / 2;
+	if(!c->srtt) {
+		c->srtt = rtt;
+		c->rttvar = rtt / 2;
 	} else {
-		utcp->rttvar = (utcp->rttvar * 3 + absdiff(utcp->srtt, rtt)) / 4;
-		utcp->srtt = (utcp->srtt * 7 + rtt) / 8;
+		c->rttvar = (c->rttvar * 3 + absdiff(c->srtt, rtt)) / 4;
+		c->srtt = (c->srtt * 7 + rtt) / 8;
 	}
 
-	utcp->rto = utcp->srtt + max(4 * utcp->rttvar, CLOCK_GRANULARITY);
+	c->rto = c->srtt + max(4 * c->rttvar, CLOCK_GRANULARITY);
 
-	if(utcp->rto > MAX_RTO) {
-		utcp->rto = MAX_RTO;
+	if(c->rto > MAX_RTO) {
+		c->rto = MAX_RTO;
 	}
 
-	debug(c, "rtt %u srtt %u rttvar %u rto %u\n", rtt, utcp->srtt, utcp->rttvar, utcp->rto);
+	debug(c, "rtt %u srtt %u rttvar %u rto %u\n", rtt, c->srtt, c->rttvar, c->rto);
 }
 
 static void start_retransmit_timer(struct utcp_connection *c) {
 	clock_gettime(UTCP_CLOCK, &c->rtrx_timeout);
 
-	uint32_t rto = c->utcp->rto;
+	uint32_t rto = c->rto;
 
 	while(rto > USEC_PER_SEC) {
 		c->rtrx_timeout.tv_sec++;
 		rto -= USEC_PER_SEC;
 	}
 
-	c->rtrx_timeout.tv_nsec += c->utcp->rto * 1000;
+	c->rtrx_timeout.tv_nsec += rto * 1000;
 
 	if(c->rtrx_timeout.tv_nsec >= NSEC_PER_SEC) {
 		c->rtrx_timeout.tv_nsec -= NSEC_PER_SEC;
@@ -974,10 +975,10 @@ static void retransmit(struct utcp_connection *c) {
 	}
 
 	start_retransmit_timer(c);
-	utcp->rto *= 2;
+	c->rto *= 2;
 
-	if(utcp->rto > MAX_RTO) {
-		utcp->rto = MAX_RTO;
+	if(c->rto > MAX_RTO) {
+		c->rto = MAX_RTO;
 	}
 
 	c->rtt_start.tv_sec = 0; // invalidate RTT timer
@@ -2174,7 +2175,6 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
 	utcp->priv = priv;
 	utcp_set_mtu(utcp, DEFAULT_MTU);
 	utcp->timeout = DEFAULT_USER_TIMEOUT; // sec
-	utcp->rto = START_RTO; // usec
 
 	return utcp;
 }
@@ -2267,10 +2267,10 @@ void utcp_reset_timers(struct utcp *utcp) {
 		}
 
 		c->rtt_start.tv_sec = 0;
-	}
 
-	if(utcp->rto > START_RTO) {
-		utcp->rto = START_RTO;
+		if(c->rto > START_RTO) {
+			c->rto = START_RTO;
+		}
 	}
 }
 
@@ -2437,11 +2437,11 @@ void utcp_offline(struct utcp *utcp, bool offline) {
 			}
 
 			utcp->connections[i]->rtt_start.tv_sec = 0;
-		}
-	}
 
-	if(!offline && utcp->rto > START_RTO) {
-		utcp->rto = START_RTO;
+			if(c->rto > START_RTO) {
+				c->rto = START_RTO;
+			}
+		}
 	}
 }