X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.h;h=6184e6b77794639913731f14ec6a4b15b9e4952f;hb=6d0452896673c36226c24144d4bde824a49c3950;hp=0c0e99d0f5117aee6662bb90d20c887bee802c2f;hpb=248d300f1be0d5f2aae39202041699ab2b46c56b;p=tinc

diff --git a/src/subnet.h b/src/subnet.h
index 0c0e99d0..6184e6b7 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,6 +1,6 @@
 /*
     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
@@ -22,12 +22,13 @@
 #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: */
 
@@ -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 /* __TINC_SUBNET_H__ */