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

Add number of packets per path

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-04-02 09:30:36 +00:00
parent 6d5738b931
commit 0c11ce5785
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mud.c
View File

@@ -359,7 +359,8 @@ 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_time = now; path->send.total++;
path->send.time = now;
if (path->send_max <= size) { if (path->send_max <= size) {
path->send_max = size; path->send_max = size;
@@ -1307,7 +1308,9 @@ mud_recv(struct mud *mud, void *data, size_t size)
return 0; return 0;
path->rst = send_time; path->rst = send_time;
path->recv_time = now;
path->recv.total++;
path->recv.time = now;
if (path->recv_max <= packet_size) { if (path->recv_max <= packet_size) {
path->recv_max = packet_size; path->recv_max = packet_size;
@@ -1373,7 +1376,7 @@ mud_update(struct mud *mud, uint64_t now)
if (path->state < MUD_DOWN) if (path->state < MUD_DOWN)
continue; continue;
if (update_keyx || mud_timeout(now, path->recv_time, mud->send_timeout + MUD_ONE_SEC)) if (update_keyx || mud_timeout(now, path->recv.time, mud->send_timeout + MUD_ONE_SEC))
path->conf.remote = 0; path->conf.remote = 0;
if ((!path->conf.remote) && if ((!path->conf.remote) &&
@@ -1424,7 +1427,7 @@ mud_send(struct mud *mud, const void *data, size_t size, int tc)
} }
int64_t limit = path->limit; int64_t limit = path->limit;
uint64_t elapsed = now - path->send_time; uint64_t elapsed = now - path->send.time;
if (limit > elapsed) { if (limit > elapsed) {
limit += path->rtt / 2 - elapsed; limit += path->rtt / 2 - elapsed;
@@ -1432,8 +1435,8 @@ mud_send(struct mud *mud, const void *data, size_t size, int tc)
limit = path->rtt / 2; limit = path->rtt / 2;
} }
if (mud_timeout(now, path->recv_time, mud->send_timeout + MUD_ONE_SEC)) { if (mud_timeout(now, path->recv.time, mud->send_timeout + MUD_ONE_SEC)) {
if (mud_timeout(now, path->send_time, mud->send_timeout)) { if (mud_timeout(now, path->send.time, mud->send_timeout)) {
mud_send_path(mud, path, now, packet, packet_size, tc, 0); mud_send_path(mud, path, now, packet, packet_size, tc, 0);
path->limit = limit; path->limit = limit;
} }

6
mud.h
View File

@@ -33,14 +33,16 @@ struct mud_path {
uint64_t r_rms; uint64_t r_rms;
uint64_t r_rmt; uint64_t r_rmt;
uint64_t limit; uint64_t limit;
uint64_t recv_time;
uint64_t send_time;
uint64_t stat_time; uint64_t stat_time;
struct { struct {
size_t ok; size_t ok;
size_t probe; size_t probe;
uint64_t time; uint64_t time;
} mtu; } mtu;
struct {
uint64_t total;
uint64_t time;
} send, recv;
}; };
struct mud *mud_create (struct sockaddr *); struct mud *mud_create (struct sockaddr *);