X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=06f51b50aac3e4b55dfe14ffa89d7c0321a83ee6;hb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;hp=408ef6c0fab827af40776a1cc67e74aa260e1fba;hpb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;p=tinc diff --git a/src/connection.c b/src/connection.c index 408ef6c0..06f51b50 100644 --- a/src/connection.c +++ b/src/connection.c @@ -56,19 +56,9 @@ void exit_connections(void) { } connection_t *new_connection(void) { - connection_t *c; - cp(); - c = xmalloc_and_zero(sizeof(connection_t)); - - if(!c) - return NULL; - - gettimeofday(&c->start, NULL); - event_set(&c->ev, -1, 0, NULL, NULL); - - return c; + return xmalloc_and_zero(sizeof(connection_t)); } void free_connection(connection_t *c) { @@ -95,7 +85,12 @@ void free_connection(connection_t *c) { if(c->hischallenge) free(c->hischallenge); - event_del(&c->ev); + if(c->buffer) + bufferevent_free(c->buffer); + + if(event_initialized(&c->inevent)) + event_del(&c->inevent); + free(c); } @@ -111,22 +106,22 @@ void connection_del(connection_t *c) { splay_delete(connection_tree, c); } -void dump_connections(void) { +int dump_connections(struct evbuffer *out) { splay_node_t *node; connection_t *c; cp(); - logger(LOG_DEBUG, _("Connections:")); - for(node = connection_tree->head; node; node = node->next) { c = node->data; - logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"), - c->name, c->hostname, c->options, c->socket, c->status.value, - c->outbufsize, c->outbufstart, c->outbuflen); + if(evbuffer_add_printf(out, + _(" %s at %s options %lx socket %d status %04x\n"), + c->name, c->hostname, c->options, c->socket, + c->status.value) == -1) + return errno; } - logger(LOG_DEBUG, _("End of connections.")); + return 0; } bool read_connection_config(connection_t *c) {