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

Prepare the way before you run away

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2020-01-04 12:08:54 +00:00
parent e3689d29b7
commit 1f18b731c4
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mud.c
View File

@@ -1419,7 +1419,7 @@ int
mud_update(struct mud *mud) mud_update(struct mud *mud)
{ {
int count = 0; int count = 0;
int mtu_probe = 0; int probe = 0;
uint64_t rate = 0; uint64_t rate = 0;
size_t mtu = 0; size_t mtu = 0;
@@ -1437,11 +1437,16 @@ mud_update(struct mud *mud)
path->ok = 0; path->ok = 0;
count++; count++;
if (path->mtu.probe) int mtu_ok = path->mtu.ok && !path->mtu.probe;
mtu_probe = 1;
if (!mud->backup && path->state == MUD_BACKUP) if (mtu_ok) {
continue; if (!mtu || mtu > path->mtu.ok)
mtu = path->mtu.ok;
if (!mud->backup && path->state == MUD_BACKUP)
continue;
} else {
probe = 1;
}
if (path->msg.sent >= MUD_MSG_SENT_MAX) { if (path->msg.sent >= MUD_MSG_SENT_MAX) {
if (path->mtu.probe) { if (path->mtu.probe) {
@@ -1450,11 +1455,9 @@ mud_update(struct mud *mud)
} else { } else {
path->msg.sent = MUD_MSG_SENT_MAX; path->msg.sent = MUD_MSG_SENT_MAX;
} }
} else if (!path->mtu.probe && path->mtu.ok && (mud->peer.set || } else if (mtu_ok && (mud->peer.set ||
!mud_timeout(mud->last_recv_time, path->rx.time, !mud_timeout(mud->last_recv_time, path->rx.time,
MUD_MSG_SENT_MAX * path->conf.msg_timeout))) { MUD_MSG_SENT_MAX * path->conf.msg_timeout))) {
if (!mtu || mtu > path->mtu.ok)
mtu = path->mtu.ok;
if (path->state != MUD_BACKUP) if (path->state != MUD_BACKUP)
mud->backup = 0; mud->backup = 0;
rate += path->tx.rate; rate += path->tx.rate;
@@ -1489,7 +1492,7 @@ mud_update(struct mud *mud)
if (!count) if (!count)
return -1; return -1;
return (mtu_probe << 1) | (mud->window < 1500); return (probe << 1) | (mud->window < 1500);
} }
int int