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

Clear deleted paths

Browse Source 
This should fix #5

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-11-04 13:49:50 +00:00
parent f647519e1c
commit 2e8a13f135
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mud.c
View File

@@ -563,7 +563,7 @@ mud_copy_port(struct sockaddr_storage *d, struct sockaddr_storage *s)
} }
static void static void
mud_reset_path(struct mud *mud, struct mud_path *path) mud_reset_path(struct mud_path *path)
{ {
path->window = 0; path->window = 0;
path->ok = 0; path->ok = 0;
@@ -571,6 +571,13 @@ mud_reset_path(struct mud *mud, struct mud_path *path)
path->loss_count = 0; path->loss_count = 0;
} }
static void
mud_remove_path(struct mud_path *path)
{
memset(path, 0, sizeof(struct mud_path));
path->state = MUD_EMPTY;
}
static struct mud_path * static struct mud_path *
mud_get_path(struct mud *mud, struct sockaddr_storage *local_addr, mud_get_path(struct mud *mud, struct sockaddr_storage *local_addr,
struct sockaddr_storage *addr, int create) struct sockaddr_storage *addr, int create)
@@ -635,7 +642,7 @@ mud_get_path(struct mud *mud, struct sockaddr_storage *local_addr,
path->mtu.max = MUD_MTU_MAX; path->mtu.max = MUD_MTU_MAX;
path->mtu.probe = MUD_MTU_MAX; path->mtu.probe = MUD_MTU_MAX;
mud_reset_path(mud, path); mud_reset_path(path);
return path; return path;
} }
@@ -818,7 +825,7 @@ mud_set_state(struct mud *mud, struct sockaddr *addr,
if (state && path->state != state) { if (state && path->state != state) {
path->state = state; path->state = state;
mud_reset_path(mud, path); // XXX mud_reset_path(path); // XXX
} }
return 0; return 0;
@@ -1486,19 +1493,19 @@ mud_update(struct mud *mud)
if (path->state <= MUD_DOWN) { if (path->state <= MUD_DOWN) {
if (path->state == MUD_DOWN && if (path->state == MUD_DOWN &&
mud_timeout(now, path->rx.time, 10 * MUD_ONE_SEC)) mud_timeout(now, path->rx.time, 10 * MUD_ONE_SEC))
path->state = MUD_EMPTY; mud_remove_path(path);
continue; continue;
} }
if (mud->peer.set) { if (mud->peer.set) {
if (path->msg_sent >= MUD_MSG_SENT_MAX) { if (path->msg_sent >= MUD_MSG_SENT_MAX) {
if (path->mtu.probe == MUD_MTU_MIN) { if (path->mtu.probe == MUD_MTU_MIN) {
mud_reset_path(mud, path); mud_reset_path(path);
} else { } else {
if (path->mtu.ok == path->mtu.probe) { if (path->mtu.ok == path->mtu.probe) {
path->mtu.min = MUD_MTU_MIN; path->mtu.min = MUD_MTU_MIN;
path->mtu.ok = MUD_MTU_MIN; path->mtu.ok = MUD_MTU_MIN;
mud_reset_path(mud, path); mud_reset_path(path);
} else { } else {
path->msg_sent = 0; path->msg_sent = 0;
} }
@@ -1510,13 +1517,13 @@ mud_update(struct mud *mud)
if ((path->msg_sent >= MUD_MSG_SENT_MAX) || if ((path->msg_sent >= MUD_MSG_SENT_MAX) ||
(path->rx.time && (path->rx.time &&
mud->last_recv_time > path->rx.time + MUD_ONE_SEC)) { mud->last_recv_time > path->rx.time + MUD_ONE_SEC)) {
path->state = MUD_EMPTY; mud_remove_path(path);
continue; continue;
} }
} }
if (path->loss_count == MUD_LOSS_COUNT) if (path->loss_count == MUD_LOSS_COUNT)
mud_reset_path(mud, path); mud_reset_path(path);
if (path->ok) { if (path->ok) {
if (!mtu || mtu > path->mtu.ok) { if (!mtu || mtu > path->mtu.ok) {