projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
634e9e7
..
f53c27a
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-114,6
+114,8
@@
extern int listen_sockets;
extern int keylifetime;
extern bool do_prune;
extern char *myport;
extern int keylifetime;
extern bool do_prune;
extern char *myport;
+extern int contradicting_add_edge;
+extern int contradicting_del_edge;
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
#include "connection.h"
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
#include "connection.h"
@@
-144,6
+146,7
@@
extern void regenerate_key();
extern void purge(void);
extern void retry(void);
extern int reload_configuration(void);
extern void purge(void);
extern void retry(void);
extern int reload_configuration(void);
+extern void load_all_subnets();
#ifndef HAVE_MINGW
#define closesocket(s) close(s)
#ifndef HAVE_MINGW
#define closesocket(s) close(s)