X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnlist.c;h=b3bb3c46f38d2bf17e5b30ed4fee5e8f01acb64b;hp=b1e3146bc6732a35dcbde34929368a49aa89ed5b;hb=9c2f805255fa36b05e8fe9391f639581d938b653;hpb=85adeef21275633b78a234b2660cbe3bc9dd2c33 diff --git a/src/connlist.c b/src/connlist.c index b1e3146b..b3bb3c46 100644 --- a/src/connlist.c +++ b/src/connlist.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: connlist.c,v 1.1.2.4 2000/10/15 00:59:34 guus Exp $ + $Id: connlist.c,v 1.1.2.8 2000/10/24 15:46:16 guus Exp $ */ #include @@ -57,8 +57,8 @@ cp free(p->name); if(p->hostname) free(p->hostname); - if(p->public_key) - RSA_free(p->public_key); + if(p->rsa_key) + RSA_free(p->rsa_key); if(p->cipher_pktkey) free(p->cipher_pktkey); if(p->buffer) @@ -120,7 +120,8 @@ void conn_list_add(conn_list_t *cl) cp cl->next = conn_list; cl->prev = NULL; - cl->next->prev = cl; + if(cl->next) + cl->next->prev = cl; conn_list = cl; cp } @@ -145,8 +146,9 @@ conn_list_t *lookup_id(char *name) conn_list_t *p; cp for(p = conn_list; p != NULL; p = p->next) - if(strcmp(name, p->name) == 0) - break; + if(p->status.active) + if(strcmp(name, p->name) == 0) + break; cp return p; } @@ -194,11 +196,23 @@ void dump_conn_list(void) cp syslog(LOG_DEBUG, _("Connection list:")); + syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"), + myself->name, myself->hostname, myself->port, myself->flags, + myself->socket, myself->meta_socket, myself->status); + + for(s = myself->subnets; s != NULL; s = s->next) + { + netstr = net2str(s); + syslog(LOG_DEBUG, ": %s", netstr); + free(netstr); + } + for(p = conn_list; p != NULL; p = p->next) { syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"), p->name, p->hostname, p->port, p->flags, p->socket, p->meta_socket, p->status); + for(s = p->subnets; s != NULL; s = s->next) { netstr = net2str(s);