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
|
|
@ -35,6 +35,11 @@
|
|||
bool send_meta(connection_t *c, const char *buffer, int length) {
|
||||
cp();
|
||||
|
||||
if(!c) {
|
||||
logger(LOG_ERR, _("send_meta() called with NULL pointer!"));
|
||||
abort();
|
||||
}
|
||||
|
||||
ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
|
||||
c->name, c->hostname);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue