j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Obsoleted all IP<x> types in favor of struct addrinfo

Browse source
This commit is contained in:
Ivo Timmermans 2001-11-16 12:10:54 +00:00
parent fb6dc0b089
commit f1b20b3ded
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/subnet.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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.14 2001/11/16 12:10:54 zarq Exp $
*/ */
#ifndef __TINC_SUBNET_H__ #ifndef __TINC_SUBNET_H__
@ -28,8 +28,7 @@
enum enum
{ {
SUBNET_MAC = 0, SUBNET_MAC = 0,
SUBNET_IPV4, SUBNET_IP,
SUBNET_IPV6,
SUBNET_TYPES /* Guardian */ SUBNET_TYPES /* Guardian */
}; };
@ -38,17 +37,11 @@ typedef struct subnet_mac_t
mac_t address; mac_t address;
} subnet_mac_t; } subnet_mac_t;
typedef struct subnet_ipv4_t typedef struct subnet_ip_t
{ {
ipv4_t address; struct addrinfo *address;
ipv4_t mask; struct addrinfo *mask;
} subnet_ipv4_t; } subnet_ip_t;
typedef struct subnet_ipv6_t
{
ipv6_t address;
ipv6_t mask;
} subnet_ipv6_t;
#include "node.h" #include "node.h"
@ -63,8 +56,7 @@ typedef struct subnet_t {
union net union net
{ {
subnet_mac_t mac; subnet_mac_t mac;
subnet_ipv4_t ipv4; subnet_ip_t ip;
subnet_ipv6_t ipv6;
} net; } net;
} subnet_t; } subnet_t;
@ -81,8 +73,7 @@ extern char *net2str(subnet_t *);
extern subnet_t *str2net(char *); extern subnet_t *str2net(char *);
extern subnet_t *lookup_subnet(struct node_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_mac(mac_t *);
extern subnet_t *lookup_subnet_ipv4(ipv4_t *); extern subnet_t *lookup_subnet_ip(struct addrinfo *);
extern subnet_t *lookup_subnet_ipv6(ipv6_t *);
extern void dump_subnets(void); extern void dump_subnets(void);
#endif /* __TINC_SUBNET_H__ */ #endif /* __TINC_SUBNET_H__ */