projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Provide all missing IPv6 definitions in lib/ipv6.h.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
083cb23
..
2a1e79e
100644
(file)
--- a/
src/net.h
+++ b/
src/net.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: net.h,v 1.9.4.
59 2003/07/06 17:15:25
guus Exp $
+ $Id: net.h,v 1.9.4.
61 2003/07/07 11:11:33
guus Exp $
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-56,11
+56,6
@@
typedef struct ipv4_t {
uint8_t x[4];
} ipv4_t;
uint8_t x[4];
} ipv4_t;
-typedef struct ip_mask_t {
- ipv4_t address;
- ipv4_t mask;
-} ip_mask_t;
-
typedef struct ipv6_t {
uint16_t x[8];
} ipv6_t;
typedef struct ipv6_t {
uint16_t x[8];
} ipv6_t;
@@
-70,19
+65,16
@@
typedef short length_t;
typedef union {
struct sockaddr sa;
struct sockaddr_in in;
typedef union {
struct sockaddr sa;
struct sockaddr_in in;
-#ifdef HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 in6;
struct sockaddr_in6 in6;
+#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
+ struct sockaddr_storage storage;
#endif
} sockaddr_t;
#ifdef SA_LEN
#define SALEN(s) SA_LEN(&s)
#else
#endif
} sockaddr_t;
#ifdef SA_LEN
#define SALEN(s) SA_LEN(&s)
#else
-#ifdef HAVE_STRUCT_SOCKADDR_IN6
#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
-#else
-#define SALEN(s) (sizeof sockaddr_in)
-#endif
#endif
typedef struct vpn_packet_t {
#endif
typedef struct vpn_packet_t {
@@
-121,9
+113,6
@@
extern int maxtimeout;
extern int seconds_till_retry;
extern int addressfamily;
extern int seconds_till_retry;
extern int addressfamily;
-extern char *request_name[];
-extern char *status_text[];
-
#include "connection.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
extern listen_socket_t listen_socket[MAXSOCKETS];
#include "connection.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
extern listen_socket_t listen_socket[MAXSOCKETS];
@@
-144,7
+133,6
@@
extern int handle_new_meta_connection(int);
extern int setup_listen_socket(sockaddr_t *);
extern int setup_vpn_in_socket(sockaddr_t *);
extern void send_packet(struct node_t *, vpn_packet_t *);
extern int setup_listen_socket(sockaddr_t *);
extern int setup_vpn_in_socket(sockaddr_t *);
extern void send_packet(struct node_t *, vpn_packet_t *);
-extern void receive_packet(struct node_t *, vpn_packet_t *);
extern void receive_tcppacket(struct connection_t *, char *, int);
extern void broadcast_packet(struct node_t *, vpn_packet_t *);
extern int setup_network_connections(void);
extern void receive_tcppacket(struct connection_t *, char *, int);
extern void broadcast_packet(struct node_t *, vpn_packet_t *);
extern int setup_network_connections(void);