projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use iface instead of interface.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
2b50c5a
..
8de3a2c
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-87,6
+87,7
@@
typedef struct listen_socket_t {
int tcp;
int udp;
sockaddr_t sa;
int tcp;
int udp;
sockaddr_t sa;
+ int priority;
} listen_socket_t;
#include "conf.h"
} listen_socket_t;
#include "conf.h"
@@
-122,20
+123,6
@@
extern time_t now;
extern int contradicting_add_edge;
extern int contradicting_del_edge;
extern int contradicting_add_edge;
extern int contradicting_del_edge;
-extern char *proxyhost;
-extern char *proxyport;
-extern char *proxyuser;
-extern char *proxypass;
-typedef enum proxytype_t {
- PROXY_NONE = 0,
- PROXY_SOCKS4,
- PROXY_SOCKS4A,
- PROXY_SOCKS5,
- PROXY_HTTP,
- PROXY_EXEC,
-} proxytype_t;
-extern proxytype_t proxytype;
-
extern volatile bool running;
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
extern volatile bool running;
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */