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

Use siphash to select path

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-09-29 16:13:01 +00:00
parent 6719b19681
commit 56a3a751db
2 changed files with 86 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/bind.c
View File

@@ -12,6 +12,8 @@
#include "../argz/argz.h"
#include "../mud/mud.h"
#include <sodium.h>
#ifndef O_CLOEXEC
#define O_CLOEXEC 0
#endif
@@ -151,6 +153,14 @@ gt_bind(int argc, char **argv)
int chacha = argz_is_set(bindz, "chacha");
int persist = argz_is_set(bindz, "persist");
if (sodium_init() == -1) {
gt_log("couldn't init sodium\n");
return 1;
}
unsigned char hashkey[crypto_shorthash_KEYBYTES];
crypto_shorthash_keygen(hashkey);
struct mud *mud = mud_create((struct sockaddr *)&bind_addr);
if (!mud) {
@@ -314,15 +324,21 @@ gt_bind(int argc, char **argv)
struct ip_common ic;
const int r = tun_read(tun_fd, buf, bufsize);
if (!ip_get_common(&ic, buf, r))
mud_send(mud, buf, r, ic.tc);
if (!ip_get_common(&ic, buf, r)) {
unsigned char hash[crypto_shorthash_BYTES];
crypto_shorthash(hash, (const unsigned char *)&ic, sizeof(ic), hashkey);
unsigned h;
memcpy(&h, hash, sizeof(h));
mud_send(mud, buf, r, (h << 8) | ic.tc);
}
}
if (FD_ISSET(mud_fd, &rfds)) {
struct ip_common ic;
const int r = mud_recv(mud, buf, bufsize);
if (!ip_get_common(&ic, buf, r))
if (ip_is_valid(buf, r))
tun_write(tun_fd, buf, r);
}