Merge branch 'master' into 1.1
Conflicts: have.h lib/dropin.c lib/fake-getaddrinfo.c lib/pidfile.c src/Makefile.am src/bsd/device.c src/conf.c src/connection.c src/connection.h src/graph.c src/mingw/device.c src/net.c src/net_setup.c src/node.c src/protocol_key.c src/protocol_misc.c src/tincd.c
This commit is contained in:
commit
075e6828a7
43 changed files with 1094 additions and 306 deletions
|
|
@ -46,7 +46,7 @@ bool send_key_changed() {
|
|||
if(!mykeyused)
|
||||
return true;
|
||||
|
||||
return send_request(broadcast, "%d %lx %s", KEY_CHANGED, random(), myself->name);
|
||||
return send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name);
|
||||
}
|
||||
|
||||
bool key_changed_h(connection_t *c, char *request) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue