projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A reachable node is always more preferable to an unreachable one...
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
ca3ea2d
..
1cf03c3
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-1,7
+1,7
@@
/*
netutl.c -- some supporting network utility code
/*
netutl.c -- some supporting network utility code
- Copyright (C) 1998-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>
- 2000-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ Copyright (C) 1998-2002 Ivo Timmermans <i
vo@o2w.nl
>
+ 2000-2002 Guus Sliepen <guus@sliepen.
eu.org
>
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
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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
27 2002/02/20 22:37:3
8 guus Exp $
+ $Id: netutl.c,v 1.12.4.
41 2002/06/21 17:49:4
8 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-27,6
+27,9
@@
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+#endif
#include <string.h>
#include <signal.h>
#include <sys/socket.h>
#include <string.h>
#include <signal.h>
#include <sys/socket.h>
@@
-101,6
+104,7
@@
void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
{
char address[NI_MAXHOST];
char port[NI_MAXSERV];
{
char address[NI_MAXHOST];
char port[NI_MAXSERV];
+ char *scopeid;
int err;
cp
if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
int err;
cp
if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
@@
-111,6
+115,9
@@
cp
exit(0);
}
exit(0);
}
+ if((scopeid = strchr(address, '%')))
+ *scopeid = '\0'; /* Descope. */
+
*addrstr = xstrdup(address);
*portstr = xstrdup(port);
cp
*addrstr = xstrdup(address);
*portstr = xstrdup(port);
cp
@@
-147,9
+154,15
@@
cp
case AF_UNSPEC:
return 0;
case AF_INET:
case AF_UNSPEC:
return 0;
case AF_INET:
- return memcmp(&a->in, &b->in, sizeof(a->in));
+ 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:
case AF_INET6:
- return memcmp(&a->in6, &b->in6, sizeof(a->in6));
+ 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();
default:
syslog(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"), a->sa.sa_family);
cp_trace();
@@
-159,46
+172,60
@@
cp
cp
}
cp
}
+void sockaddrunmap(sockaddr_t *sa)
+{
+ if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr))
+ {
+ sa->in.sin_addr.s_addr = ((uint32_t *)&sa->in6.sin6_addr)[3];
+ sa->in.sin_family = AF_INET;
+ }
+}
+
/* Subnet mask handling */
/* Subnet mask handling */
-int maskcmp(
char *a, char *
b, int masklen, int len)
+int maskcmp(
void *va, void *v
b, int masklen, int len)
{
int i, m, result;
{
int i, m, result;
+ char *a = va;
+ char *b = vb;
cp
for(m = masklen, i = 0; m >= 8; m -= 8, i++)
if((result = a[i] - b[i]))
return result;
if(m)
cp
for(m = masklen, i = 0; m >= 8; m -= 8, i++)
if((result = a[i] - b[i]))
return result;
if(m)
- return (a[i] & (0x100 - (
m << 1))) - (b[i] & (0x100 - (m << 1
)));
+ return (a[i] & (0x100 - (
1 << (8 - m)))) - (b[i] & (0x100 - (1 << (8 - m)
)));
return 0;
}
return 0;
}
-void mask(
char *
a, int masklen, int len)
+void mask(
void *v
a, int masklen, int len)
{
int i;
{
int i;
+ char *a = va;
cp
i = masklen / 8;
masklen %= 8;
if(masklen)
cp
i = masklen / 8;
masklen %= 8;
if(masklen)
- a[i++] &= (0x100 - (
masklen << 1
));
+ a[i++] &= (0x100 - (
1 << masklen
));
for(; i < len; i++)
a[i] = 0;
}
for(; i < len; i++)
a[i] = 0;
}
-void maskcpy(
char *a, char *
b, int masklen, int len)
+void maskcpy(
void *va, void *v
b, int masklen, int len)
{
int i, m;
{
int i, m;
+ char *a = va;
+ char *b = vb;
cp
for(m = masklen, i = 0; m >= 8; m -= 8, i++)
a[i] = b[i];
if(m)
{
cp
for(m = masklen, i = 0; m >= 8; m -= 8, i++)
a[i] = b[i];
if(m)
{
- a[i] = b[i] & (0x100 - (
m << 1
));
+ a[i] = b[i] & (0x100 - (
1 << m
));
i++;
}
i++;
}
@@
-206,20
+233,20
@@
cp
a[i] = 0;
}
a[i] = 0;
}
-int maskcheck(
char *
a, int masklen, int len)
+int maskcheck(
void *v
a, int masklen, int len)
{
int i;
{
int i;
+ char *a = va;
cp
i = masklen / 8;
masklen %= 8;
cp
i = masklen / 8;
masklen %= 8;
-
- if(masklen)
- if(a[i++] & ~(0x100 - (masklen << 1)))
- return -1;
-
+
+ if(masklen && a[i++] & (0xff >> masklen))
+ return -1;
+
for(; i < len; i++)
if(a[i] != 0)
for(; i < len; i++)
if(a[i] != 0)
- return -
1
;
+ return -
2
;
return 0;
}
return 0;
}