Allow weight to be assigned to Subnets.

[oweals/tinc.git] / src / subnet.h

diff --git a/src/subnet.h b/src/subnet.h
index 21b2a1e5ece102b1d20ec86c266ad256a8e63594..6d7c75995a9ac5f73a4fcc90bd3e58433093c012 100644 (file)
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,7 +1,7 @@
 /*
     subnet.h -- header for subnet.c
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.9 2001/01/07 17:09:07 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -25,67 +25,64 @@
 
 #include "net.h"
 
-enum
-{
-  SUBNET_MAC = 0,
-  SUBNET_IPV4,
-  SUBNET_IPV6,
-  SUBNET_TYPES                         /* Guardian */
-};
-
-typedef struct subnet_mac_t
-{
-  mac_t address;
+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;
 } subnet_mac_t;
 
-typedef struct subnet_ipv4_t
-{
-  ipv4_t address;
-  ipv4_t mask;
+typedef struct subnet_ipv4_t {
+       ipv4_t address;
+       int prefixlength;
 } subnet_ipv4_t;
 
-typedef struct subnet_ipv6_t
-{
-  ipv6_t address;
-  ipv6_t mask;
+typedef struct subnet_ipv6_t {
+       ipv6_t address;
+       int prefixlength;
 } subnet_ipv6_t;
 
-typedef struct subnet_t {
-  struct connection_t *owner;          /* the owner of this subnet */
-  struct connection_t *uplink;         /* the uplink which we should send packets to for this subnet */
-
-  struct subnet_t *prev;               /* previous subnet_t for this owner */
-  struct subnet_t *next;               /* next subnet_t for this owner */
+#include "node.h"
 
-  struct subnet_t *global_prev;                /* previous subnet_t for this subnet type */
-  struct subnet_t *global_next;                /* next subnet_t for this subnet type */
+typedef struct subnet_t {
+       struct node_t *owner;           /* the owner of this subnet */
 
-  int type;                            /* subnet type (IPv4? IPv6? MAC? something even weirder?) */
+       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: */
+       /* And now for the actual subnet: */
 
-  union net
-    {
-      subnet_mac_t mac;
-      subnet_ipv4_t ipv4;
-      subnet_ipv6_t ipv6;
-    } net;
-    
-} subnet_t;  
+       union net {
+               subnet_mac_t mac;
+               subnet_ipv4_t ipv4;
+               subnet_ipv6_t ipv6;
+       } net;
+} subnet_t;
 
-#include "connection.h"
+#define MAXNETSTR 64
 
-extern subnet_t *new_subnet(void);
+extern int subnet_compare(const struct subnet_t *, const struct subnet_t *);
+extern subnet_t *new_subnet(void) __attribute__ ((__malloc__));
 extern void free_subnet(subnet_t *);
 extern void init_subnets(void);
-extern void subnet_add(struct connection_t *, subnet_t *);
-extern void subnet_del(subnet_t *);
-extern char *net2str(subnet_t *);
-extern subnet_t *str2net(char *);
-extern int subnet_compare(subnet_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 void dump_subnet_list(void);
-
-#endif /* __TINC_SUBNET_H__ */
+extern void exit_subnets(void);
+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 void subnet_update(struct node_t *, subnet_t *, bool);
+extern bool net2str(char *, int, const subnet_t *);
+extern bool str2net(subnet_t *, 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);
+extern void subnet_cache_flush(void);
+
+#endif                                                 /* __TINC_SUBNET_H__ */