miegl/mud
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update path->window directly

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-12-02 08:45:01 +00:00
parent b732cb1b69
commit 72019786eb
1 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
mud.c
View File

@@ -410,9 +410,14 @@ mud_send_path(struct mud *mud, struct mud_path *path, uint64_t now,
ssize_t ret = sendmsg(mud->fd, &msg, flags); ssize_t ret = sendmsg(mud->fd, &msg, flags);
path->send.total++; path->send.total++;
path->send.bytes += size;
path->send.time = now; path->send.time = now;
if (path->window > size) {
path->window -= size;
} else {
path->window = 0;
}
return ret; return ret;
} }
@@ -1430,8 +1435,6 @@ mud_update(struct mud *mud, uint64_t now)
if (path->state <= MUD_DOWN) if (path->state <= MUD_DOWN)
continue; continue;
path->window = 0;
if (path->ok) { if (path->ok) {
if (path->stat_count >= 10) { if (path->stat_count >= 10) {
mud_reset_path(mud, path); mud_reset_path(mud, path);
@@ -1441,36 +1444,24 @@ mud_update(struct mud *mud, uint64_t now)
} }
} }
int reset = mud_timeout(now, path->send.stat_time, MUD_SEND_TIMEOUT / 2); if (mud_timeout(now, path->send.stat_time, MUD_SEND_TIMEOUT / 2)) {
path->send.stat_time = now;
if (reset) { if (path->ok) {
if (path->send.bytes > path->send.ratemax) { path->window = path->send.ratemax;
path->send.bytes -= path->send.ratemax; path->stat_count++;
} else { }
path->send.bytes = 0;
if (mud->peer.set) {
if (path->ok)
mud_probe_mtu(mud, path, now);
if (mud_timeout(now, path->send.time, MUD_SEND_TIMEOUT))
mud_packet_send(mud, path, now, 0, 0); //path->mtu.ok);
} }
} }
if (path->ok && path->send.ratemax > path->send.bytes) { window += path->window;
path->window = path->send.ratemax - path->send.bytes;
window += path->window;
}
if (!reset)
continue;
path->send.stat_time = now;
if (mud->peer.set) {
if (path->ok)
mud_probe_mtu(mud, path, now);
if (mud_timeout(now, path->send.time, MUD_SEND_TIMEOUT))
mud_packet_send(mud, path, now, 0, 0); //path->mtu.ok);
}
if (path->ok)
path->stat_count++;
} }
mud->window = window; mud->window = window;