X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=ae8d029e870b388a1190464e778059e0af3ad0db;hp=36d1627ed3425d115371345b15f316c8291326b1;hb=e3220cacb5bc79fc56167e61b7a342f88a33a479;hpb=fcbe29bc4cc67530581a36cf1a3a1445c741b8e5

diff --git a/src/subnet.c b/src/subnet.c
index 36d1627e..ae8d029e 100644
--- 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.
 
-    $Id: subnet.c,v 1.1.2.49 2003/07/30 11:50:45 guus Exp $
+    $Id: subnet.c,v 1.1.2.51 2003/11/17 15:30:18 guus Exp $
 */
 
 #include "system.h"
@@ -83,7 +83,7 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-static int subnet_compare(const subnet_t *a, const subnet_t *b)
+int subnet_compare(const subnet_t *a, const subnet_t *b)
 {
 	int result;
 
@@ -145,7 +145,7 @@ subnet_t *new_subnet(void)
 {
 	cp();
 
-	return (subnet_t *) xmalloc_and_zero(sizeof(subnet_t));
+	return xmalloc_and_zero(sizeof(subnet_t));
 }
 
 void free_subnet(subnet_t *subnet)
@@ -313,7 +313,7 @@ subnet_t *lookup_subnet_mac(const mac_t *address)
 	subnet.net.mac.address = *address;
 	subnet.owner = NULL;
 
-	p = (subnet_t *) avl_search(subnet_tree, &subnet);
+	p = avl_search(subnet_tree, &subnet);
 
 	return p;
 }
@@ -332,7 +332,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 	do {
 		/* Go find subnet */
 
-		p = (subnet_t *) avl_search_closest_smaller(subnet_tree, &subnet);
+		p = avl_search_closest_smaller(subnet_tree, &subnet);
 
 		/* Check if the found subnet REALLY matches */
 
@@ -370,7 +370,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 	do {
 		/* Go find subnet */
 
-		p = (subnet_t *) avl_search_closest_smaller(subnet_tree, &subnet);
+		p = avl_search_closest_smaller(subnet_tree, &subnet);
 
 		/* Check if the found subnet REALLY matches */
 
@@ -403,7 +403,7 @@ void dump_subnets(void)
 	logger(LOG_DEBUG, _("Subnet list:"));
 
 	for(node = subnet_tree->head; node; node = node->next) {
-		subnet = (subnet_t *) node->data;
+		subnet = node->data;
 		netstr = net2str(subnet);
 		logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
 		free(netstr);