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

Send dt directly instead of sending lat/latmin

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-12-01 11:11:43 +00:00
parent 79688de09e
commit ff0c10b66c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mud.c
View File

@@ -118,8 +118,7 @@ struct mud_packet {
struct mud_addr addr; struct mud_addr addr;
unsigned char pub[MUD_PUB_SIZE]; unsigned char pub[MUD_PUB_SIZE];
unsigned char aes; unsigned char aes;
unsigned char lat[MUD_U48_SIZE]; unsigned char dt[MUD_U48_SIZE];
unsigned char latmin[MUD_U48_SIZE];
unsigned char rate[MUD_U48_SIZE]; unsigned char rate[MUD_U48_SIZE];
unsigned char ratemax[MUD_U48_SIZE]; unsigned char ratemax[MUD_U48_SIZE];
}; };
@@ -1101,8 +1100,7 @@ mud_packet_send(struct mud *mud, struct mud_path *path,
packet->aes = (unsigned char)mud->crypto.aes; packet->aes = (unsigned char)mud->crypto.aes;
mud_write48(packet->lat, path->lat.val); mud_write48(packet->dt, path->dt);
mud_write48(packet->latmin, path->latmin);
mud_write48(packet->rate, path->rate.val); mud_write48(packet->rate, path->rate.val);
mud_write48(packet->ratemax, path->recv.ratemax); mud_write48(packet->ratemax, path->recv.ratemax);
@@ -1228,14 +1226,12 @@ mud_packet_recv(struct mud *mud, struct mud_path *path,
mud->crypto.use_next = 1; mud->crypto.use_next = 1;
} }
path->r_lat = mud_read48(packet->lat);
path->r_latmin = mud_read48(packet->latmin);
path->r_rate = mud_read48(packet->rate); path->r_rate = mud_read48(packet->rate);
path->r_ratemax = mud_read48(packet->ratemax); path->r_ratemax = mud_read48(packet->ratemax);
// TODO // TODO
const uint64_t dt = MUD_TIME_MASK(path->r_lat - path->r_latmin); const uint64_t dt = mud_read48(packet->dt);
const uint64_t target = 15 * MUD_ONE_MSEC; const uint64_t target = 15 * MUD_ONE_MSEC;
const uint64_t a = (path->r_ratemax * 1500) >> 1; const uint64_t a = (path->r_ratemax * 1500) >> 1;
const uint64_t b = (path->send.ratemax ?: 5000) * target; const uint64_t b = (path->send.ratemax ?: 5000) * target;
@@ -1362,6 +1358,12 @@ mud_recv(struct mud *mud, void *data, size_t size)
} }
} }
if (path->lat.val > path->latmin) {
path->dt = MUD_TIME_MASK(path->lat.val - path->latmin);
} else {
path->dt = 0;
}
if (!reply_size) if (!reply_size)
reply_size = path->mtu.ok; reply_size = path->mtu.ok;

4
mud.h
View File

@@ -30,9 +30,7 @@ struct mud_path {
enum mud_state state; enum mud_state state;
struct sockaddr_storage local_addr, addr, r_addr; struct sockaddr_storage local_addr, addr, r_addr;
struct mud_value rtt, lat, rate; struct mud_value rtt, lat, rate;
uint64_t latmin; uint64_t latmin, dt;
uint64_t r_lat;
uint64_t r_latmin;
uint64_t r_rate; uint64_t r_rate;
uint64_t r_ratemax; uint64_t r_ratemax;
uint64_t window; uint64_t window;