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

Force send_path() on bad path

Browse Source
This commit is contained in:
Adrien Gallouët
2016-11-25 16:39:59 +00:00
parent 672e2ba2b5
commit 72d0573c95
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mud.c
View File

@@ -841,8 +841,6 @@ void mud_ctrl_path (struct mud *mud, enum mud_msg msg, struct path *path,
mud_write48(ctrl.data, (uint64_t)mud->mtu.local); mud_write48(ctrl.data, (uint64_t)mud->mtu.local);
size = MUD_U48_SIZE; size = MUD_U48_SIZE;
break; break;
default:
return;
} }
struct crypto_opt opt = { struct crypto_opt opt = {
@@ -1077,6 +1075,14 @@ int mud_send (struct mud *mud, const void *data, size_t size, int tc)
} }
uint64_t now = mud_now(mud); uint64_t now = mud_now(mud);
unsigned char packet[2048];
int packet_size = mud_encrypt(mud, now, packet, sizeof(packet), data, size);
if (!packet_size) {
errno = EINVAL;
return -1;
}
struct path *path; struct path *path;
struct path *path_min = NULL; struct path *path_min = NULL;
@@ -1092,25 +1098,21 @@ int mud_send (struct mud *mud, const void *data, size_t size, int tc)
limit = path->rtt/2; limit = path->rtt/2;
} }
if ((path->r_rst) &&
(now > path->r_rst+MUD_ONE_SEC)) {
mud_send_path(mud, path, now, packet, packet_size, tc);
path->limit = limit;
continue;
}
if (limit_min > limit) { if (limit_min > limit) {
limit_min = limit; limit_min = limit;
path_min = path; path_min = path;
} }
} }
if (!path_min) { if (!path_min)
errno = ENOTCONN; return 0;
return -1;
}
unsigned char packet[2048];
int packet_size = mud_encrypt(mud, now, packet, sizeof(packet), data, size);
if (!packet_size) {
errno = EINVAL;
return -1;
}
ssize_t ret = mud_send_path(mud, path_min, now, packet, packet_size, tc); ssize_t ret = mud_send_path(mud, path_min, now, packet, packet_size, tc);