X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=0bf3b91cf6928a8781ce861aa3298c0275d358ca;hp=a7acbae0cf7cfb88626142014f44e8bd2c5d2f2e;hb=0842998c0bd46855d198923acc2c13cff7430ffe;hpb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93

diff --git a/src/subnet.h b/src/subnet.h
index a7acbae0..0bf3b91c 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -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.h,v 1.1.2.21 2003/07/06 23:16:29 guus Exp $
+    $Id: subnet.h,v 1.1.2.25 2003/10/06 14:33:04 guus Exp $
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -25,12 +25,12 @@
 
 #include "net.h"
 
-enum {
+typedef enum subnet_type_t {
 	SUBNET_MAC = 0,
 	SUBNET_IPV4,
 	SUBNET_IPV6,
 	SUBNET_TYPES				/* Guardian */
-};
+} subnet_type_t;
 
 typedef struct subnet_mac_t {
 	mac_t address;
@@ -51,9 +51,8 @@ typedef struct subnet_ipv6_t {
 
 typedef struct subnet_t {
 	struct node_t *owner;		/* the owner of this subnet */
-	struct node_t *uplink;		/* the uplink which we should send packets to for this subnet */
 
-	int type;					/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
+	subnet_type_t type;		/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
 
 	/* And now for the actual subnet: */
 
@@ -64,20 +63,20 @@ typedef struct subnet_t {
 	} net;
 } subnet_t;
 
-extern subnet_t *new_subnet(void) __attribute__ ((malloc));
+extern subnet_t *new_subnet(void) __attribute__ ((__malloc__));
 extern void free_subnet(subnet_t *);
 extern void init_subnets(void);
 extern void exit_subnets(void);
-extern avl_tree_t *new_subnet_tree(void) __attribute__ ((malloc));
+extern avl_tree_t *new_subnet_tree(void) __attribute__ ((__malloc__));
 extern void free_subnet_tree(avl_tree_t *);
 extern void subnet_add(struct node_t *, subnet_t *);
 extern void subnet_del(struct node_t *, subnet_t *);
-extern char *net2str(subnet_t *);
-extern subnet_t *str2net(char *);
-extern subnet_t *lookup_subnet(struct node_t *, subnet_t *);
-extern subnet_t *lookup_subnet_mac(mac_t *);
-extern subnet_t *lookup_subnet_ipv4(ipv4_t *);
-extern subnet_t *lookup_subnet_ipv6(ipv6_t *);
+extern char *net2str(const subnet_t *);
+extern subnet_t *str2net(const char *);
+extern subnet_t *lookup_subnet(const struct node_t *, const subnet_t *);
+extern subnet_t *lookup_subnet_mac(const mac_t *);
+extern subnet_t *lookup_subnet_ipv4(const ipv4_t *);
+extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
 extern void dump_subnets(void);
 
 #endif							/* __TINC_SUBNET_H__ */