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

Decrease rate instead of degrading the path

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-11-05 17:52:18 +00:00
parent 67a660117e
commit 79dc61e7dc
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mud.c
View File

@@ -1242,14 +1242,18 @@ mud_update_window(struct mud *mud, struct mud_path *path,
uint64_t send_dt, uint64_t send_bytes, uint64_t send_dt, uint64_t send_bytes,
uint64_t recv_dt, uint64_t recv_bytes) uint64_t recv_dt, uint64_t recv_bytes)
{ {
if (send_bytes && send_bytes >= recv_bytes) { if (recv_bytes && send_bytes >= recv_bytes) {
path->tx.loss = (send_bytes - recv_bytes) * 100 / send_bytes; uint64_t loss = send_bytes - recv_bytes;
if (path->tx.loss < mud->loss_limit) { path->tx.loss = loss * 100 / send_bytes;
if (path->loss_count > -MUD_LOSS_COUNT) if (path->tx.loss > mud->loss_limit) {
path->loss_count--; if (path->loss_count < MUD_LOSS_COUNT) {
} else {
if (path->loss_count < MUD_LOSS_COUNT)
path->loss_count++; path->loss_count++;
} else {
path->loss_count = 0;
path->tx.rate -= loss * path->tx.rate / send_bytes;
}
} else {
path->loss_count = 0;
} }
} }
@@ -1288,8 +1292,6 @@ mud_recv_msg(struct mud *mud, struct mud_path *path,
path->rx.loss = (uint64_t)msg->loss; path->rx.loss = (uint64_t)msg->loss;
path->msg_sent = 0; path->msg_sent = 0;
if (path->loss_count == -MUD_LOSS_COUNT) // tmp hack
path->ok = 1; path->ok = 1;
} else { } else {
mud_keyx_init(mud, now); mud_keyx_init(mud, now);
@@ -1484,9 +1486,6 @@ mud_update(struct mud *mud)
} }
} }
if (path->loss_count == MUD_LOSS_COUNT)
mud_reset_path(path);
if (path->ok) { if (path->ok) {
if (!mtu || mtu > path->mtu.ok) { if (!mtu || mtu > path->mtu.ok) {
mtu = path->mtu.ok; mtu = path->mtu.ok;