projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add warnings for bad combinations of Device and Interface.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
863616b
..
50d5680
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-39,6
+39,7
@@
#include "netutl.h"
#include "process.h"
#include "protocol.h"
#include "netutl.h"
#include "process.h"
#include "protocol.h"
+#include "proxy.h"
#include "route.h"
#include "subnet.h"
#include "utils.h"
#include "route.h"
#include "subnet.h"
#include "utils.h"
@@
-47,12
+48,6
@@
char *myport;
devops_t devops;
char *myport;
devops_t devops;
-char *proxyhost;
-char *proxyport;
-char *proxyuser;
-char *proxypass;
-proxytype_t proxytype;
-
bool read_rsa_public_key(connection_t *c) {
FILE *fp;
char *pubname;
bool read_rsa_public_key(connection_t *c) {
FILE *fp;
char *pubname;