X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.h;h=4ba10e985035e4c88144522452668143c390509e;hb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;hp=0c0e99d0f5117aee6662bb90d20c887bee802c2f;hpb=3c7003893fe2f82023d0d4f54b488bb7a16d0007;p=tinc

diff --git a/src/subnet.h b/src/subnet.h
index 0c0e99d0..4ba10e98 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,6 +1,9 @@
+#ifndef TINC_SUBNET_H
+#define TINC_SUBNET_H
+
 /*
     subnet.h -- header for subnet.c
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -18,16 +21,14 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_SUBNET_H__
-#define __TINC_SUBNET_H__
-
 #include "net.h"
+#include "node.h"
 
 typedef enum subnet_type_t {
 	SUBNET_MAC = 0,
 	SUBNET_IPV4,
 	SUBNET_IPV6,
-	SUBNET_TYPES				/* Guardian */
+	SUBNET_TYPES            /* Guardian */
 } subnet_type_t;
 
 typedef struct subnet_mac_t {
@@ -44,14 +45,12 @@ typedef struct subnet_ipv6_t {
 	int prefixlength;
 } subnet_ipv6_t;
 
-#include "node.h"
-
 typedef struct subnet_t {
-	struct node_t *owner;		/* the owner of this subnet */
+	struct node_t *owner;   /* the owner of this subnet */
 
-	subnet_type_t type;		/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
-	time_t expires;			/* expiry time */
-	int weight;			/* weight (higher value is higher priority) */
+	subnet_type_t type;     /* subnet type (IPv4? IPv6? MAC? something even weirder?) */
+	time_t expires;         /* expiry time */
+	int weight;             /* weight (higher value is higher priority) */
 
 	/* And now for the actual subnet: */
 
@@ -67,11 +66,11 @@ typedef struct subnet_t {
 extern splay_tree_t *subnet_tree;
 
 extern int subnet_compare(const struct subnet_t *, const struct 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 splay_tree_t *new_subnet_tree(void) __attribute__ ((__malloc__));
+extern splay_tree_t *new_subnet_tree(void) __attribute__((__malloc__));
 extern void free_subnet_tree(splay_tree_t *);
 extern void subnet_add(struct node_t *, subnet_t *);
 extern void subnet_del(struct node_t *, subnet_t *);
@@ -89,4 +88,4 @@ extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
 extern bool dump_subnets(struct connection_t *);
 extern void subnet_cache_flush(void);
 
-#endif							/* __TINC_SUBNET_H__ */
+#endif