Merge branch 'master' into 1.1

[meshlink] / src / control_common.h

diff --git a/src/control_common.h b/src/control_common.h
index 3fa034eb5eea2d556506159956eb32cdd4f8b191..6384651a04b02d2ecbe309d7d08832d2fdf4fe3a 100644 (file)
--- a/src/control_common.h
+++ b/src/control_common.h
@@ -26,6 +26,14 @@ enum request_type {
        REQ_STOP,
        REQ_RELOAD,
        REQ_RESTART,
+       REQ_DUMP_NODES,
+       REQ_DUMP_EDGES,
+       REQ_DUMP_SUBNETS,
+       REQ_DUMP_CONNECTIONS,
+       REQ_DUMP_GRAPH,
+       REQ_PURGE,
+       REQ_SET_DEBUG,
+       REQ_RETRY,
 };
 
 #define TINC_CTL_VERSION_CURRENT 0
@@ -33,6 +41,7 @@ enum request_type {
 /* This greeting is sent by the server on socket open. */
 typedef struct tinc_ctl_greeting_t {
        int version;
+       pid_t pid;
 } tinc_ctl_greeting_t;
 
 /* A single request or response header. */