projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright notices.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
b52dfa5
..
a4ec2b3
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-1,7
+1,7
@@
/*
subnet.c -- handle subnet lookups and lists
/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-200
4
Guus Sliepen <guus@tinc-vpn.org>,
- 2000-200
4 Ivo Timmermans <ivo@tinc-vpn.org>
+ Copyright (C) 2000-200
6
Guus Sliepen <guus@tinc-vpn.org>,
+ 2000-200
5 Ivo Timmermans
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
@@
-247,6
+247,11
@@
bool net2str(char *netstr, int len, const subnet_t *subnet)
{
cp();
{
cp();
+ if(!netstr || !subnet) {
+ logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet);
+ return false;
+ }
+
switch (subnet->type) {
case SUBNET_MAC:
snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx",
switch (subnet->type) {
case SUBNET_MAC:
snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx",
@@
-337,7
+342,7
@@
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
break;
}
break;
}
- if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength
, sizeof(ipv4_t)
))
+ if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength))
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
@@
-373,7
+378,7
@@
subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
if(p->type != SUBNET_IPV6)
return NULL;
if(p->type != SUBNET_IPV6)
return NULL;
- if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength
, sizeof(ipv6_t)
))
+ if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength))
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
@@
-424,9
+429,6
@@
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
execute_script(name, envp);
}
execute_script(name, envp);
}
- net2str(netstr, sizeof netstr, subnet);
- envp[6] = envp[7] = NULL;
-
for(i = 0; i < (owner != myself ? 6 : 4); i++)
free(envp[i]);
for(i = 0; i < (owner != myself ? 6 : 4); i++)
free(envp[i]);