X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=0ea218605af8571ee648807e1939eba4be9b8bc3;hp=45e9cc12dc72a489de6318b50849bba86df2480b;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=f1b20b3ded5b360e426e094cf79df3bf97f350b4

diff --git a/src/subnet.h b/src/subnet.h
index 45e9cc12..0ea21860 100644
--- 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,2001 Guus Sliepen <guus@sliepen.eu.org>,
+                  2000,2001 Ivo Timmermans <ivo@o2w.nl>
 
     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.14 2001/11/16 12:10:54 zarq Exp $
+    $Id: subnet.h,v 1.1.2.19 2002/06/21 10:11:34 guus Exp $
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -28,20 +28,28 @@
 enum
 {
   SUBNET_MAC = 0,
-  SUBNET_IP,
+  SUBNET_IPV4,
+  SUBNET_IPV6,
   SUBNET_TYPES				/* Guardian */
 };
 
 typedef struct subnet_mac_t
 {
   mac_t address;
+  time_t lastseen;
 } subnet_mac_t;
 
-typedef struct subnet_ip_t
+typedef struct subnet_ipv4_t
 {
-  struct addrinfo *address;
-  struct addrinfo *mask;
-} subnet_ip_t;
+  ipv4_t address;
+  int prefixlength;
+} subnet_ipv4_t;
+
+typedef struct subnet_ipv6_t
+{
+  ipv6_t address;
+  int prefixlength;
+} subnet_ipv6_t;
 
 #include "node.h"
 
@@ -56,9 +64,9 @@ typedef struct subnet_t {
   union net
     {
       subnet_mac_t mac;
-      subnet_ip_t ip;
+      subnet_ipv4_t ipv4;
+      subnet_ipv6_t ipv6;
     } net;
-    
 } subnet_t;
 
 extern subnet_t *new_subnet(void);
@@ -73,7 +81,8 @@ 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 subnet_t *lookup_subnet_ipv4(ipv4_t *);
+extern subnet_t *lookup_subnet_ipv6(ipv6_t *);
 extern void dump_subnets(void);
 
 #endif /* __TINC_SUBNET_H__ */