projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Alessandro Gatti
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
5e09625
..
d971a4d
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.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.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: subnet.c,v 1.1.2.3
3 2002/03/12 14:20:44
guus Exp $
+ $Id: subnet.c,v 1.1.2.3
6 2002/06/08 12:57:10
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-63,7
+63,7
@@
cp
if(result)
return result;
if(result)
return result;
- return a->net.ipv4.
masklength - b->net.ipv4.mask
length;
+ return a->net.ipv4.
prefixlength - b->net.ipv4.prefix
length;
}
int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
}
int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
@@
-75,7
+75,7
@@
cp
if(result)
return result;
if(result)
return result;
- return a->net.ipv6.
masklength - b->net.ipv6.mask
length;
+ return a->net.ipv6.
prefixlength - b->net.ipv6.prefix
length;
}
int subnet_compare(subnet_t *a, subnet_t *b)
}
int subnet_compare(subnet_t *a, subnet_t *b)
@@
-176,7
+176,7
@@
subnet_t *str2net(char *subnetstr)
{
int i, l;
subnet_t *subnet;
{
int i, l;
subnet_t *subnet;
- u
nsigned short in
t x[8];
+ u
int16_
t x[8];
cp
subnet = new_subnet();
cp
cp
subnet = new_subnet();
cp
@@
-185,7
+185,7
@@
cp
&l) == 5)
{
subnet->type = SUBNET_IPV4;
&l) == 5)
{
subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.
mask
length = l;
+ subnet->net.ipv4.
prefix
length = l;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
@@
-196,7
+196,7
@@
cp
&l) == 9)
{
subnet->type = SUBNET_IPV6;
&l) == 9)
{
subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.
mask
length = l;
+ subnet->net.ipv6.
prefix
length = l;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
@@
-206,7
+206,7
@@
cp
&x[0], &x[1], &x[2], &x[3]) == 4)
{
subnet->type = SUBNET_IPV4;
&x[0], &x[1], &x[2], &x[3]) == 4)
{
subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.
mask
length = 32;
+ subnet->net.ipv4.
prefix
length = 32;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
for(i = 0; i < 4; i++)
subnet->net.ipv4.address.x[i] = x[i];
return subnet;
@@
-216,7
+216,7
@@
cp
&x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8)
{
subnet->type = SUBNET_IPV6;
&x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8)
{
subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.
mask
length = 128;
+ subnet->net.ipv6.
prefix
length = 128;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
for(i = 0; i < 8; i++)
subnet->net.ipv6.address.x[i] = htons(x[i]);
return subnet;
@@
-256,7
+256,7
@@
cp
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
subnet->net.ipv4.address.x[3],
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],
subnet->net.ipv4.address.x[3],
- subnet->net.ipv4.
mask
length);
+ subnet->net.ipv4.
prefix
length);
break;
case SUBNET_IPV6:
asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
break;
case SUBNET_IPV6:
asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
@@
-268,10
+268,10
@@
cp
ntohs(subnet->net.ipv6.address.x[5]),
ntohs(subnet->net.ipv6.address.x[6]),
ntohs(subnet->net.ipv6.address.x[7]),
ntohs(subnet->net.ipv6.address.x[5]),
ntohs(subnet->net.ipv6.address.x[6]),
ntohs(subnet->net.ipv6.address.x[7]),
- subnet->net.ipv6.
mask
length);
+ subnet->net.ipv6.
prefix
length);
break;
default:
break;
default:
- syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exit
t
ing!"), subnet->type);
+ syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exiting!"), subnet->type);
cp_trace();
exit(0);
}
cp_trace();
exit(0);
}
@@
-305,7
+305,7
@@
subnet_t *lookup_subnet_ipv4(ipv4_t *address)
cp
subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
cp
subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
- subnet.net.ipv4.
mask
length = 32;
+ subnet.net.ipv4.
prefix
length = 32;
do
{
do
{
@@
-323,14
+323,14
@@
cp
break;
}
break;
}
- if (!maskcmp(
(char *)address, (char *)&p->net.ipv4.address, p->net.ipv4.mask
length, sizeof(ipv4_t)))
+ if (!maskcmp(
address, &p->net.ipv4.address, p->net.ipv4.prefix
length, sizeof(ipv4_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
- subnet.net.ipv4.
masklength = p->net.ipv4.mask
length - 1;
- maskcpy(
(char *)&subnet.net.ipv4.address, (char *)&p->net.ipv4.address, subnet.net.ipv4.mask
length, sizeof(ipv4_t));
+ subnet.net.ipv4.
prefixlength = p->net.ipv4.prefix
length - 1;
+ maskcpy(
&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefix
length, sizeof(ipv4_t));
}
}
} while (p);
}
}
} while (p);
@@
-344,7
+344,7
@@
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
cp
subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
cp
subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
- subnet.net.ipv6.
mask
length = 128;
+ subnet.net.ipv6.
prefix
length = 128;
do
{
do
{
@@
-360,14
+360,14
@@
cp
if(p->type != SUBNET_IPV6)
return NULL;
if(p->type != SUBNET_IPV6)
return NULL;
- if (!maskcmp(
(char *)address, (char *)&p->net.ipv6.address, p->net.ipv6.mask
length, sizeof(ipv6_t)))
+ if (!maskcmp(
address, &p->net.ipv6.address, p->net.ipv6.prefix
length, sizeof(ipv6_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
- subnet.net.ipv6.
masklength = p->net.ipv6.mask
length - 1;
- maskcpy(
(char *)&subnet.net.ipv6.address, (char *)&p->net.ipv6.address, subnet.net.ipv6.mask
length, sizeof(ipv6_t));
+ subnet.net.ipv6.
prefixlength = p->net.ipv6.prefix
length - 1;
+ maskcpy(
&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefix
length, sizeof(ipv6_t));
}
}
} while (p);
}
}
} while (p);