/*
netutl.c -- some supporting network utility code
- Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>
+ 2000-2002 Guus Sliepen <guus@sliepen.warande.net>
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.29 2002/03/17 15:59:29 guus Exp $
*/
#include "config.h"
-#include <arpa/inet.h>
+#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <signal.h>
#include <sys/socket.h>
#include <syslog.h>
+#include <arpa/inet.h>
#include <utils.h>
#include <xalloc.h>
-#include "encr.h"
+#include "errno.h"
+#include "conf.h"
#include "net.h"
#include "netutl.h"
-/*
- look for a connection associated with the given vpn ip,
- return its connection structure
-*/
-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)
- return p;
- for(p = conn_list; p != NULL; p = p->next)
- if((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask))
- return p;
-cp
- return NULL;
-}
+#include "system.h"
+
+int hostnames = 0;
/*
- free a queue and all of its elements
+ Turn a string into a struct addrinfo.
+ Return NULL on failure.
*/
-void destroy_queue(packet_queue_t *pq)
+struct addrinfo *str2addrinfo(char *address, char *service, int socktype)
{
- queue_element_t *p, *q;
+ struct addrinfo hint, *ai;
+ int err;
cp
- for(p = pq->head; p != NULL; p = q)
+ memset(&hint, 0, sizeof(hint));
+
+ hint.ai_family = addressfamily;
+ hint.ai_socktype = socktype;
+
+ if((err = getaddrinfo(address, service, &hint, &ai)))
{
- q = p->next;
- if(p->packet)
- free(p->packet);
- free(p);
+ if(debug_lvl >= DEBUG_ERROR)
+ syslog(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address, service, gai_strerror(err));
+ cp_trace();
+ return NULL;
}
- free(pq);
cp
+ return ai;
}
-/*
- free a conn_list_t element and all its pointers
-*/
-void free_conn_element(conn_list_t *p)
+sockaddr_t str2sockaddr(char *address, char *port)
{
+ struct addrinfo hint, *ai;
+ sockaddr_t result;
+ int err;
cp
- if(p->hostname)
- free(p->hostname);
- if(p->pp)
- free(p->pp);
- if(p->sq)
- destroy_queue(p->sq);
- if(p->rq)
- destroy_queue(p->rq);
- free_key(p->public_key);
- free_key(p->key);
- free(p);
-cp
-}
-
-/*
- remove all marked connections
-*/
-void prune_conn_list(void)
-{
- conn_list_t *p, *prev = NULL, *next = NULL;
-cp
- for(p = conn_list; p != NULL; )
- {
- next = p->next;
-
- if(p->status.remove)
- {
- if(prev)
- prev->next = next;
- else
- conn_list = next;
+ memset(&hint, 0, sizeof(hint));
- free_conn_element(p);
- }
- else
- prev = p;
+ hint.ai_family = AF_UNSPEC;
+ hint.ai_flags = AI_NUMERICHOST;
+ hint.ai_socktype = SOCK_STREAM;
- p = next;
+ if((err = getaddrinfo(address, port, &hint, &ai) || !ai))
+ {
+ syslog(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port, gai_strerror(err));
+ cp_trace();
+ raise(SIGFPE);
+ exit(0);
}
+
+ result = *(sockaddr_t *)ai->ai_addr;
+ freeaddrinfo(ai);
cp
+ return result;
}
-/*
- creates new conn_list element, and initializes it
-*/
-conn_list_t *new_conn_list(void)
+void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
{
- conn_list_t *p = xmalloc(sizeof(*p));
+ char address[NI_MAXHOST];
+ char port[NI_MAXSERV];
+ char *scopeid;
+ int err;
cp
- /* initialise all those stupid pointers at once */
- 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;
+ if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
+ {
+ syslog(LOG_ERR, _("Error while translating addresses: %s"), gai_strerror(err));
+ cp_trace();
+ raise(SIGFPE);
+ exit(0);
+ }
+
+#ifdef HAVE_LINUX
+ if((scopeid = strchr(address, '%')))
+ *scopeid = '\0'; /* Descope. */
+#endif
+
+ *addrstr = xstrdup(address);
+ *portstr = xstrdup(port);
cp
- return p;
}
-/*
- free all elements of conn_list
-*/
-void destroy_conn_list(void)
+char *sockaddr2hostname(sockaddr_t *sa)
{
- conn_list_t *p, *next;
+ char *str;
+ char address[NI_MAXHOST] = "unknown";
+ char port[NI_MAXSERV] = "unknown";
+ int err;
cp
- for(p = conn_list; p != NULL; )
+ if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV))))
{
- next = p->next;
- free_conn_element(p);
- p = next;
+ syslog(LOG_ERR, _("Error while looking up hostname: %s"), gai_strerror(err));
}
- conn_list = NULL;
+ asprintf(&str, _("%s port %s"), address, port);
cp
+ return str;
}
-/*
- look up the name associated with the ip
- address `addr'
-*/
-char *hostlookup(unsigned long addr)
+int sockaddrcmp(sockaddr_t *a, sockaddr_t *b)
{
- char *name;
- struct hostent *host = NULL;
- struct in_addr in;
-cp
- in.s_addr = addr;
-
- host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
-
- if(host)
+ int result;
+cp
+ result = a->sa.sa_family - b->sa.sa_family;
+
+ if(result)
+ return result;
+
+ switch(a->sa.sa_family)
{
- name = xmalloc(strlen(host->h_name)+20);
- sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in));
- }
- else
- {
- name = xmalloc(20);
- sprintf(name, "%s", inet_ntoa(in));
+ case AF_UNSPEC:
+ return 0;
+ case AF_INET:
+ result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+ if(result)
+ return result;
+ return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof(a->in.sin_port));
+ case AF_INET6:
+ result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
+ if(result)
+ return result;
+ return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
+ default:
+ syslog(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"), a->sa.sa_family);
+ cp_trace();
+ raise(SIGFPE);
+ exit(0);
}
cp
- return name;
}
-/*
- Turn a string into an IP addy with netmask
- return NULL on failure
-*/
-ip_mask_t *strtoip(char *str)
+void sockaddrunmap(sockaddr_t *sa)
{
- ip_mask_t *ip;
- int masker;
- char *q, *p;
- struct hostent *h;
-cp
- p = str;
- if((q = strchr(p, '/')))
+ if(IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr))
{
- *q = '\0';
- q++; /* q now points to netmask part, or NULL if no mask */
+ sa->in.sin_addr.s_addr = sa->in6.sin6_addr.s6_addr32[3];
+ sa->in.sin_family = AF_INET;
}
+}
- if(!(h = gethostbyname(p)))
- {
- fprintf(stderr, "Error looking up `%s': %s\n", p, sys_errlist[h_errno]);
- return NULL;
- }
+/* Subnet mask handling */
- masker = 0;
- if(q)
- {
- masker = strtol(q, &p, 10);
- if(q == p || (*p))
- return NULL;
- }
+int maskcmp(char *a, char *b, int masklen, int len)
+{
+ int i, m, result;
+cp
+ for(m = masklen, i = 0; m >= 8; m -= 8, i++)
+ if((result = a[i] - b[i]))
+ return result;
- ip = xmalloc(sizeof(*ip));
- ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
+ if(m)
+ return (a[i] & (0x100 - (m << 1))) - (b[i] & (0x100 - (m << 1)));
- ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
-cp
- return ip;
+ return 0;
}
-void dump_conn_list(void)
+void mask(char *a, int masklen, int len)
{
- conn_list_t *p;
+ int i;
+cp
+ i = masklen / 8;
+ masklen %= 8;
+
+ if(masklen)
+ a[i++] &= (0x100 - (masklen << 1));
+
+ for(; i < len; i++)
+ a[i] = 0;
+}
+
+void maskcpy(char *a, char *b, int masklen, int len)
+{
+ int i, m;
cp
- syslog(LOG_DEBUG, "Connection list:");
+ for(m = masklen, i = 0; m >= 8; m -= 8, i++)
+ a[i] = b[i];
- for(p = conn_list; p != NULL; p = p->next)
+ if(m)
{
- 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);
+ a[i] = b[i] & (0x100 - (m << 1));
+ i++;
}
-cp
+
+ for(; i < len; i++)
+ a[i] = 0;
+}
+
+int maskcheck(char *a, int masklen, int len)
+{
+ int i;
+cp
+ i = masklen / 8;
+ masklen %= 8;
+
+ if(masklen)
+ if(a[i++] & ~(0x100 - (masklen << 1)))
+ return -1;
+
+ for(; i < len; i++)
+ if(a[i] != 0)
+ return -1;
+
+ return 0;
}
projects / tinc / blobdiff