X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=45e9cc12dc72a489de6318b50849bba86df2480b;hp=ceb67102fe79296094fd69bbf618e60bb1281a2b;hb=f1b20b3ded5b360e426e094cf79df3bf97f350b4;hpb=2228b16159a7aff64e6559ee1635716154e67fe6

diff --git a/src/subnet.h b/src/subnet.h
index ceb67102..45e9cc12 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,7 +1,7 @@
 /*
     subnet.h -- header for subnet.c
-    Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
 
     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,32 +17,63 @@
     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.1 2000/10/01 03:21:49 guus Exp $
+    $Id: subnet.h,v 1.1.2.14 2001/11/16 12:10:54 zarq Exp $
 */
 
 #ifndef __TINC_SUBNET_H__
 #define __TINC_SUBNET_H__
 
-enum{
+#include "net.h"
+
+enum
+{
   SUBNET_MAC = 0,
-  SUBNET_IPv4,
-  SUBNET_IPv6,
+  SUBNET_IP,
+  SUBNET_TYPES				/* Guardian */
 };
 
-typedef struct subnet_t {
-  struct conn_list_t *owner;		/* the owner of this subnet */
-  struct conn_list_t *uplink;		/* the uplink which we should send packets to for this subnet */
+typedef struct subnet_mac_t
+{
+  mac_t address;
+} subnet_mac_t;
+
+typedef struct subnet_ip_t
+{
+  struct addrinfo *address;
+  struct addrinfo *mask;
+} subnet_ip_t;
 
-  struct subnet_t *prev;		/* previous subnet_t for this owner */
-  struct subnet_t *next;		/* next subnet_t for this owner */
+#include "node.h"
+
+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?) */
 
-  /* Okay this is IPv4 specific because we are lazy and don't want to implement
-     other types just now. Type should always be SUBNET_IPv4 for now. */
+  /* And now for the actual subnet: */
+
+  union net
+    {
+      subnet_mac_t mac;
+      subnet_ip_t ip;
+    } net;
+    
+} subnet_t;
 
-  ip_t netaddr;
-  ip_t netmask;
-} subnet_t;  
+extern subnet_t *new_subnet(void);
+extern void free_subnet(subnet_t *);
+extern void init_subnets(void);
+extern void exit_subnets(void);
+extern avl_tree_t *new_subnet_tree(void);
+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_ip(struct addrinfo *);
+extern void dump_subnets(void);
 
 #endif /* __TINC_SUBNET_H__ */