projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- More s/vertex/edge/g
[tinc]
/
src
/
subnet.h
diff --git
a/src/subnet.h
b/src/subnet.h
index
2659386
..
50cfefd
100644
(file)
--- a/
src/subnet.h
+++ b/
src/subnet.h
@@
-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.1
0 2001/01/08 21:32:30
guus Exp $
+ $Id: subnet.h,v 1.1.2.1
2 2001/10/27 13:13:35
guus Exp $
*/
#ifndef __TINC_SUBNET_H__
*/
#ifndef __TINC_SUBNET_H__
@@
-50,9
+50,11
@@
typedef struct subnet_ipv6_t
ipv6_t mask;
} subnet_ipv6_t;
ipv6_t mask;
} subnet_ipv6_t;
+#include "node.h"
+
typedef struct subnet_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
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?) */
int type; /* subnet type (IPv4? IPv6? MAC? something even weirder?) */
@@
-65,21
+67,20
@@
typedef struct subnet_t {
subnet_ipv6_t ipv6;
} net;
subnet_ipv6_t ipv6;
} net;
-} subnet_t;
-
-#include "connection.h"
+} subnet_t;
extern subnet_t *new_subnet(void);
extern void free_subnet(subnet_t *);
extern void init_subnets(void);
extern subnet_t *new_subnet(void);
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 void subnet_add(struct
node
_t *, subnet_t *);
+extern void subnet_del(s
truct node_t *, s
ubnet_t *);
extern char *net2str(subnet_t *);
extern subnet_t *str2net(char *);
extern int subnet_compare(subnet_t *, 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(struct node_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 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);
+extern void dump_subnet
s
(void);
#endif /* __TINC_SUBNET_H__ */
#endif /* __TINC_SUBNET_H__ */