projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup:
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
0320957
..
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
4 2002/04/09 11:42:48
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"
@@
-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
@@
-271,7
+271,7
@@
cp
subnet->net.ipv6.prefixlength);
break;
default:
subnet->net.ipv6.prefixlength);
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);
}
@@
-323,14
+323,14
@@
cp
break;
}
break;
}
- if (!maskcmp(
(char *)address, (char *)
&p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
+ if (!maskcmp(
address,
&p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
- maskcpy(
(char *)&subnet.net.ipv4.address, (char *)
&p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
+ maskcpy(
&subnet.net.ipv4.address,
&p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
}
}
} while (p);
}
}
} while (p);
@@
-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.prefixlength, sizeof(ipv6_t)))
+ if (!maskcmp(
address,
&p->net.ipv6.address, p->net.ipv6.prefixlength, sizeof(ipv6_t)))
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
- maskcpy(
(char *)&subnet.net.ipv6.address, (char *)
&p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
+ maskcpy(
&subnet.net.ipv6.address,
&p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
}
}
} while (p);
}
}
} while (p);