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

Code cleanup

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-04-25 20:52:39 +00:00
parent 9f38b7b6e0
commit c8b07c6edb
1 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
mud.c
View File

@@ -306,6 +306,60 @@ mud_unmapv4(struct sockaddr_storage *addr)
memcpy(addr, &sin, sizeof(sin)); memcpy(addr, &sin, sizeof(sin));
} }
static void
mud_update_mtu(struct mud *mud)
{
size_t mtu = MUD_PACKET_MAX_SIZE;
size_t count = 0;
for (unsigned i = 0; i < mud->count; i++) {
struct mud_path *path = &mud->paths[i];
if (path->state <= MUD_DOWN)
continue;
count++;
if (mtu > path->mtu.ok)
mtu = path->mtu.ok;
}
mud->mtu = count ? mtu : MUD_MTU;
}
static int
mud_update_map(struct mud *mud)
{
unsigned long long n = 0;
for (unsigned i = 0; i < mud->count; i++) {
struct mud_path *path = &mud->paths[i];
if (path->state <= MUD_DOWN)
continue;
n += mud->paths[i].r_ratemax + mud->paths[i].ratevar;
}
mud->ratemax = n;
if (!n) {
fprintf(stderr, "update map failed\n");
return 0;
}
unsigned w = 0;
for (unsigned i = 0; i < mud->count; i++) {
if (w < sizeof(mud->map))
memset(&mud->map[w], i, sizeof(mud->map) - w);
w += (((mud->paths[i].r_ratemax + mud->paths[i].ratevar) << 10) + (n >> 1)) / n;
}
return 0;
}
static ssize_t static ssize_t
mud_send_path(struct mud *mud, struct mud_path *path, uint64_t now, mud_send_path(struct mud *mud, struct mud_path *path, uint64_t now,
void *data, size_t size, int tc, int flags) void *data, size_t size, int tc, int flags)
@@ -538,10 +592,10 @@ mud_get_path(struct mud *mud, struct sockaddr_storage *local_addr,
if (!paths) if (!paths)
return NULL; return NULL;
path = &paths[mud->count];
mud->count++; mud->count++;
mud->paths = paths; mud->paths = paths;
path = &paths[mud->count - 1];
} }
memset(path, 0, sizeof(struct mud_path)); memset(path, 0, sizeof(struct mud_path));
@@ -552,7 +606,6 @@ mud_get_path(struct mud *mud, struct sockaddr_storage *local_addr,
path->state = MUD_UP; path->state = MUD_UP;
path->mtu.ok = MUD_MTU; path->mtu.ok = MUD_MTU;
path->mtu.probe = mud->mtu; path->mtu.probe = mud->mtu;
path->ratevar = 10000000; path->ratevar = 10000000;
return path; return path;
@@ -594,58 +647,6 @@ mud_peer(struct mud *mud, struct sockaddr *peer)
return 0; return 0;
} }
static void
mud_update_mtu(struct mud *mud)
{
size_t mtu = MUD_PACKET_MAX_SIZE;
size_t count = 0;
for (unsigned i = 0; i < mud->count; i++) {
struct mud_path *path = &mud->paths[i];
if (path->state <= MUD_DOWN)
continue;
count++;
if (mtu > path->mtu.ok)
mtu = path->mtu.ok;
}
mud->mtu = count ? mtu : MUD_MTU;
}
static int
mud_update_map(struct mud *mud)
{
unsigned long long n = 0;
for (unsigned i = 0; i < mud->count; i++) {
struct mud_path *path = &mud->paths[i];
if (path->state <= MUD_DOWN)
continue;
n += mud->paths[i].r_ratemax + mud->paths[i].ratevar;
}
mud->ratemax = n;
if (!n)
return 0;
unsigned w = 0;
for (unsigned i = 0; i < mud->count; i++) {
if (w < sizeof(mud->map))
memset(&mud->map[w], i, sizeof(mud->map) - w);
w += (((mud->paths[i].r_ratemax + mud->paths[i].ratevar) << 10) + (n >> 1)) / n;
}
return 0;
}
int int
mud_get_key(struct mud *mud, unsigned char *key, size_t *size) mud_get_key(struct mud *mud, unsigned char *key, size_t *size)
{ {
@@ -760,6 +761,7 @@ mud_set_state(struct mud *mud, struct sockaddr *addr, enum mud_state state)
return -1; return -1;
path->state = state; path->state = state;
mud_update_mtu(mud); mud_update_mtu(mud);
mud_update_map(mud); mud_update_map(mud);