projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libevent for meta socket input/output buffering.
[tinc]
/
src
/
subnet.h
diff --git
a/src/subnet.h
b/src/subnet.h
index
0bf3b91
..
f73aaf9
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.eu
.org>,
- 2000
,2001 Ivo Timmermans <ivo@o2w.nl>
+ 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
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.25 2003/10/06 14:33:04 guus Exp
$
+ $Id$
*/
#ifndef __TINC_SUBNET_H__
*/
#ifndef __TINC_SUBNET_H__
@@
-34,7
+34,6
@@
typedef enum subnet_type_t {
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 {
} subnet_mac_t;
typedef struct subnet_ipv4_t {
@@
-53,6
+52,7
@@
typedef struct subnet_t {
struct node_t *owner; /* the owner of this subnet */
subnet_type_t type; /* subnet type (IPv4? IPv6? MAC? something even weirder?) */
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 */
/* And now for the actual subnet: */
/* And now for the actual subnet: */
@@
-63,16
+63,20
@@
typedef struct subnet_t {
} net;
} subnet_t;
} net;
} subnet_t;
+#define MAXNETSTR 64
+
+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 exit_subnets(void);
extern subnet_t *new_subnet(void) __attribute__ ((__malloc__));
extern void free_subnet(subnet_t *);
extern void init_subnets(void);
extern void exit_subnets(void);
-extern
avl
_tree_t *new_subnet_tree(void) __attribute__ ((__malloc__));
-extern void free_subnet_tree(
avl
_tree_t *);
+extern
splay
_tree_t *new_subnet_tree(void) __attribute__ ((__malloc__));
+extern void free_subnet_tree(
splay
_tree_t *);
extern void subnet_add(struct node_t *, subnet_t *);
extern void subnet_del(struct node_t *, subnet_t *);
extern void subnet_add(struct node_t *, subnet_t *);
extern void subnet_del(struct node_t *, subnet_t *);
-extern char *net2str(const subnet_t *);
-extern subnet_t *str2net(const char *);
+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(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 *);