s/sliepen.warande.net/sliepen.eu.org/g

[tinc] / src / subnet.h

diff --git a/src/subnet.h b/src/subnet.h
index d1dd965..0ea2186 100644 (file)
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,7 +1,7 @@
 /*
     subnet.h -- header for subnet.c
 /*
     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
 
     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.
 
     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.13 2001/10/28 22:42:49 guus Exp $
+    $Id: subnet.h,v 1.1.2.19 2002/06/21 10:11:34 guus Exp $

 */
 
 #ifndef __TINC_SUBNET_H__
 */
 
 #ifndef __TINC_SUBNET_H__


@@ -36,18 +36,19 @@ enum
 typedef struct subnet_mac_t
 {
   mac_t address;
 typedef struct subnet_mac_t
 {
   mac_t address;

+  time_t lastseen;

 } subnet_mac_t;
 
 typedef struct subnet_ipv4_t
 {
   ipv4_t address;
 } subnet_mac_t;
 
 typedef struct subnet_ipv4_t
 {
   ipv4_t address;

-  ipv4_t mask;
+  int prefixlength;

 } subnet_ipv4_t;
 
 typedef struct subnet_ipv6_t
 {
   ipv6_t address;
 } subnet_ipv4_t;
 
 typedef struct subnet_ipv6_t
 {
   ipv6_t address;

-  ipv6_t mask;
+  int prefixlength;

 } subnet_ipv6_t;
 
 #include "node.h"
 } subnet_ipv6_t;
 
 #include "node.h"


@@ -66,7 +67,6 @@ typedef struct subnet_t {
       subnet_ipv4_t ipv4;
       subnet_ipv6_t ipv6;
     } net;
       subnet_ipv4_t ipv4;
       subnet_ipv6_t ipv6;
     } net;

-    

 } subnet_t;
 
 extern subnet_t *new_subnet(void);
 } subnet_t;
 
 extern subnet_t *new_subnet(void);