X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=f3ef1341246b9a8f6f0ce963f902161bfe6cd225;hp=5beb4a1848e27481dfbd39ee33e3b0f1ea680492;hb=3831f51a53088bfcc1d148fd54b3083afe7fde32;hpb=783c8298610d5670f6e118f49bd3d1fdfa61ae1d diff --git a/src/netutl.c b/src/netutl.c index 5beb4a18..f3ef1341 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: netutl.c,v 1.12.4.4 2000/06/26 19:39:34 guus Exp $ + $Id: netutl.c,v 1.12.4.7 2000/08/17 16:51:07 guus Exp $ */ #include "config.h" @@ -89,6 +89,10 @@ cp destroy_queue(p->sq); if(p->rq) destroy_queue(p->rq); + if(p->vpn_hostname) + free(p->vpn_hostname); + if(p->real_hostname) + free(p->real_hostname); free_key(p->public_key); free_key(p->key); free(p); @@ -183,13 +187,11 @@ cp if(!lookup_hostname || !host) { - name = xmalloc(20); - sprintf(name, "%s", inet_ntoa(in)); + asprintf(&name, "%s", inet_ntoa(in)); } else { - name = xmalloc(strlen(host->h_name)+20); - sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in)); + asprintf(&name, "%s", host->h_name); } cp return name; @@ -243,8 +245,8 @@ cp for(p = conn_list; p != NULL; p = p->next) { - syslog(LOG_DEBUG, _(" " IP_ADDR_S "/" IP_ADDR_S " at %s flags %d sockets %d, %d status %04x"), - IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->hostname, p->flags, + syslog(LOG_DEBUG, _("%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"), + p->vpn_hostname, IP_ADDR_V(p->vpn_mask), p->real_hostname, p->port, p->flags, p->socket, p->meta_socket, p->status); } cp