Merge branch 'master' into 1.1

[tinc] / src / control_common.h

diff --git a/src/control_common.h b/src/control_common.h
index 2b77955..6384651 100644 (file)
--- a/src/control_common.h
+++ b/src/control_common.h
@@ -33,6 +33,7 @@ enum request_type {
        REQ_DUMP_GRAPH,
        REQ_PURGE,
        REQ_SET_DEBUG,
+       REQ_RETRY,
 };
 
 #define TINC_CTL_VERSION_CURRENT 0
@@ -40,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. */