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

Get loss_rx from peer

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-10-07 14:01:27 +00:00
parent 9a378aea99
commit ee4b484a38
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mud.c
View File

@@ -128,6 +128,7 @@ struct mud_msg {
unsigned char recv[MUD_U48_SIZE]; unsigned char recv[MUD_U48_SIZE];
// unsigned char delay[MUD_U48_SIZE]; // unsigned char delay[MUD_U48_SIZE];
unsigned char rate[MUD_U48_SIZE]; unsigned char rate[MUD_U48_SIZE];
unsigned char loss;
}; };
struct mud { struct mud {
@@ -1177,6 +1178,7 @@ mud_send_msg(struct mud *mud, struct mud_path *path, uint64_t now,
mud_write48(msg->fwd_dt, fwd_dt); mud_write48(msg->fwd_dt, fwd_dt);
mud_write48(msg->fwd_send, fwd_send); mud_write48(msg->fwd_send, fwd_send);
mud_write48(msg->rate, path->rate_rx); mud_write48(msg->rate, path->rate_rx);
msg->loss = (unsigned char)path->loss_tx;
const struct mud_crypto_opt opt = { const struct mud_crypto_opt opt = {
.dst = dst, .dst = dst,
@@ -1247,7 +1249,7 @@ mud_update_window(struct mud *mud, struct mud_path *path,
uint64_t recv_dt, uint64_t recv_bytes) uint64_t recv_dt, uint64_t recv_bytes)
{ {
if (send_bytes && send_bytes >= recv_bytes) if (send_bytes && send_bytes >= recv_bytes)
path->loss = (send_bytes - recv_bytes) * 100 / send_bytes; path->loss_tx = (send_bytes - recv_bytes) * 100 / send_bytes;
// TODO // TODO
} }
@@ -1275,12 +1277,14 @@ mud_recv_msg(struct mud *mud, struct mud_path *path,
} }
mud_update_stat(&path->rtt, MUD_TIME_MASK(now - peer_sent)); mud_update_stat(&path->rtt, MUD_TIME_MASK(now - peer_sent));
mud_update_window(mud, path, now, sent, mud_update_window(mud, path, now, sent,
mud_read48(msg->fwd_dt), mud_read48(msg->fwd_dt),
mud_read48(msg->fwd_send), mud_read48(msg->fwd_send),
mud_read48(msg->dt), mud_read48(msg->dt),
mud_read48(msg->recv)); mud_read48(msg->recv));
path->loss_rx = (uint64_t)msg->loss;
path->msg_sent = 0; path->msg_sent = 0;
path->ok = 1; path->ok = 1;
} else { } else {

3
mud.h
View File

@@ -36,7 +36,8 @@ struct mud_path {
uint64_t window; uint64_t window;
uint64_t window_time; uint64_t window_time;
uint64_t window_size; uint64_t window_size;
uint64_t loss; uint64_t loss_tx;
uint64_t loss_rx;
struct { struct {
size_t min; size_t min;
size_t max; size_t max;