X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol_common.h;h=34bae47ca734960688f7a2d82d9f576211c58dbd;hb=368727c3dac4a1f8343e2e0eccf5bc62d9b197e2;hp=720c2360dfbe195b42dc89202a24a6342d8c85ab;hpb=761517c21c37a808a19b487aa116c3c19439feca;p=tinc

diff --git a/src/control_common.h b/src/control_common.h
index 720c2360..34bae47c 100644
--- a/src/control_common.h
+++ b/src/control_common.h
@@ -20,8 +20,11 @@
 #ifndef __TINC_CONTROL_PROTOCOL_H__
 #define __TINC_CONTROL_PROTOCOL_H__
 
+#include "protocol.h"
+
 enum request_type {
-	REQ_STOP,
+	REQ_INVALID = -1,
+	REQ_STOP = 0,
 	REQ_RELOAD,
 	REQ_RESTART,
 	REQ_DUMP_NODES,
@@ -32,22 +35,13 @@ enum request_type {
 	REQ_PURGE,
 	REQ_SET_DEBUG,
 	REQ_RETRY,
+	REQ_CONNECT,
+	REQ_DISCONNECT,
+	REQ_DUMP_TRAFFIC,
+	REQ_PCAP,
+	REQ_LOG,
 };
 
 #define TINC_CTL_VERSION_CURRENT 0
 
-/* 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. */
-typedef struct tinc_ctl_request_t {
-	size_t length; /* total length, including the header */
-	enum request_type type;
-	int id;
-	int res_errno; /* used only for responses */
-} tinc_ctl_request_t;
-
 #endif