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
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
ac4b767
..
90eca01
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-29,6
+29,7
@@
#include "xalloc.h"
bool tunnelserver = false;
#include "xalloc.h"
bool tunnelserver = false;
+bool strictsubnets = false;
/* Jumptable for the request handlers */
/* Jumptable for the request handlers */
@@
-38,7
+39,7
@@
static bool (*request_handlers[])(connection_t *, char *) = {
ping_h, pong_h,
add_subnet_h, del_subnet_h,
add_edge_h, del_edge_h,
ping_h, pong_h,
add_subnet_h, del_subnet_h,
add_edge_h, del_edge_h,
- key_changed_h, req_key_h, ans_key_h, tcppacket_h,
+ key_changed_h, req_key_h, ans_key_h, tcppacket_h,
control_h,
};
/* Request names */
};
/* Request names */
@@
-48,7
+49,7
@@
static char (*request_name[]) = {
"STATUS", "ERROR", "TERMREQ",
"PING", "PONG",
"ADD_SUBNET", "DEL_SUBNET",
"STATUS", "ERROR", "TERMREQ",
"PING", "PONG",
"ADD_SUBNET", "DEL_SUBNET",
- "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
+ "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
"CONTROL",
};
static splay_tree_t *past_request_tree;
};
static splay_tree_t *past_request_tree;