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

Update mud

Browse Source
This commit is contained in:
angt
2016-05-02 09:18:44 +00:00
parent 2f290dbf85
commit 55d9dd9277
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mud

Submodule mud updated: 7e5c487951...244ad0f714

16
src/main.c
View File

@@ -189,9 +189,12 @@ static int gt_setup_secretkey (struct mud *mud, char *keyfile)
if (str_empty(keyfile)) { if (str_empty(keyfile)) {
char buf[2*sizeof(key)+1]; char buf[2*sizeof(key)+1];
size_t size = sizeof(key);
mud_get_key(mud, key, sizeof(key)); if (mud_get_key(mud, key, &size))
gt_tohex(buf, sizeof(buf), key, sizeof(key)); return -1;
gt_tohex(buf, sizeof(buf), key, size);
state_send(gt.state_fd, "SECRETKEY", buf); state_send(gt.state_fd, "SECRETKEY", buf);
return 0; return 0;
@@ -324,7 +327,7 @@ int main (int argc, char **argv)
if (time_tolerance > 0) if (time_tolerance > 0)
mud_set_time_tolerance_sec(mud, time_tolerance); mud_set_time_tolerance_sec(mud, time_tolerance);
if (bind_list) { if (host && port && bind_list) {
char tmp[1024]; char tmp[1024];
char *name = &tmp[0]; char *name = &tmp[0];
@@ -336,19 +339,16 @@ int main (int argc, char **argv)
tmp[i] = 0; tmp[i] = 0;
if (mud_bind(mud, name)) if (mud_peer(mud, name, host, port))
return 1; return 1;
name = &tmp[i+1]; name = &tmp[i+1];
} }
if (name[0] && mud_bind(mud, name)) if (name[0] && mud_peer(mud, name, host, port))
return 1; return 1;
} }
if (host && mud_peer(mud, host, port))
return 1;
int mud_fd = mud_get_fd(mud); int mud_fd = mud_get_fd(mud);
state_send(gt.state_fd, "INITIALIZED", tun_name); state_send(gt.state_fd, "INITIALIZED", tun_name);