projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'volth/release-1.1pre16-rtt' into 1.1
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
827194e
..
d69eabd
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-74,9
+74,6
@@
typedef union sockaddr_t {
struct sockaddr_in in;
struct sockaddr_in6 in6;
struct sockaddr_unknown unknown;
struct sockaddr_in in;
struct sockaddr_in6 in6;
struct sockaddr_unknown unknown;
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
- struct sockaddr_storage storage;
-#endif
} sockaddr_t;
#ifdef SA_LEN
} sockaddr_t;
#ifdef SA_LEN
@@
-151,6
+148,7
@@
extern int keylifetime;
extern int udp_rcvbuf;
extern int udp_sndbuf;
extern int max_connection_burst;
extern int udp_rcvbuf;
extern int udp_sndbuf;
extern int max_connection_burst;
+extern int fwmark;
extern bool do_prune;
extern char *myport;
extern bool device_standby;
extern bool do_prune;
extern char *myport;
extern bool device_standby;