/*
netutl.c -- some supporting network utility code
- Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
You should have received a copy of the GNU General Public License
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.6 2000/06/29 17:09:06 guus Exp $
*/
#include "config.h"
#include <utils.h>
#include <xalloc.h>
+#include "conf.h"
#include "encr.h"
#include "net.h"
#include "netutl.h"
+#include "system.h"
+
/*
look for a connection associated with the given vpn ip,
- return its connection structure
+ return its connection structure.
+ Skips connections that are not activated!
*/
conn_list_t *lookup_conn(ip_t ip)
{
conn_list_t *p = conn_list;
-
+cp
/* Exact match suggested by James B. MacLean */
for(p = conn_list; p != NULL; p = p->next)
- if(ip == p->vpn_ip)
+ if((ip == p->vpn_ip) && p->status.active)
return p;
for(p = conn_list; p != NULL; p = p->next)
- if((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask))
+ if(((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask)) && p->status.active)
return p;
-
+cp
return NULL;
}
void destroy_queue(packet_queue_t *pq)
{
queue_element_t *p, *q;
-
+cp
for(p = pq->head; p != NULL; p = q)
{
q = p->next;
}
free(pq);
+cp
}
/*
*/
void free_conn_element(conn_list_t *p)
{
- if(p->hostname)
- free(p->hostname);
- if(p->pp)
- free(p->pp);
+cp
if(p->sq)
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);
+cp
}
/*
void prune_conn_list(void)
{
conn_list_t *p, *prev = NULL, *next = NULL;
-
+cp
for(p = conn_list; p != NULL; )
{
next = p->next;
p = next;
}
+cp
}
/*
*/
conn_list_t *new_conn_list(void)
{
- conn_list_t *p = xmalloc(sizeof(conn_list_t));
-
+ conn_list_t *p = xmalloc(sizeof(*p));
+cp
/* initialise all those stupid pointers at once */
- memset(p, '\0', sizeof(conn_list_t));
+ memset(p, '\0', sizeof(*p));
+ p->vpn_mask = (ip_t)(~0L); /* If this isn't done, it would be a
+ wastebucket for all packets with
+ unknown destination. */
p->nexthop = p;
+cp
return p;
}
{
conn_list_t *p, *next;
cp
-
for(p = conn_list; p != NULL; )
{
next = p->next;
free_conn_element(p);
p = next;
}
-cp
conn_list = NULL;
+cp
}
/*
look up the name associated with the ip
address `addr'
*/
+
char *hostlookup(unsigned long addr)
{
char *name;
struct hostent *host = NULL;
struct in_addr in;
-
+ config_t const *cfg;
+ int lookup_hostname;
+cp
in.s_addr = addr;
- host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
+ lookup_hostname = 0;
+ if((cfg = get_config_val(resolve_dns)) != NULL)
+ if(cfg->data.val == stupid_true)
+ lookup_hostname = 1;
+
+ if(lookup_hostname)
+ host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
- if(host)
+ if(!lookup_hostname || !host)
{
- name = xmalloc(strlen(host->h_name)+20);
- sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in));
+ name = xmalloc(20);
+ sprintf(name, "%s", inet_ntoa(in));
}
else
{
- name = xmalloc(20);
- sprintf(name, "%s", inet_ntoa(in));
+ name = xmalloc(strlen(host->h_name)+1);
+ sprintf(name, "%s", host->h_name);
}
-
+cp
return name;
}
int masker;
char *q, *p;
struct hostent *h;
-
+cp
p = str;
if((q = strchr(p, '/')))
{
if(!(h = gethostbyname(p)))
{
- fprintf(stderr, "Error looking up `%s': %s\n", p, sys_errlist[h_errno]);
+ fprintf(stderr, _("Error looking up `%s': %s\n"), p, sys_errlist[h_errno]);
return NULL;
}
return NULL;
}
- ip = xmalloc(sizeof(ip_mask_t));
+ ip = xmalloc(sizeof(*ip));
ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
-
+cp
return ip;
}
void dump_conn_list(void)
{
conn_list_t *p;
-
- syslog(LOG_DEBUG, "Connection list:");
+cp
+ syslog(LOG_DEBUG, _("Connection list:"));
for(p = conn_list; p != NULL; p = p->next)
{
- syslog(LOG_DEBUG, " " IP_ADDR_S "/" IP_ADDR_S ": %04x (%d|%d)",
- IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->status,
- p->socket, p->meta_socket);
+ 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
}