X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fcontrol_common.h;h=cd54889a99a2d896fd4e681c4b14fb2d80892c1c;hp=720c2360dfbe195b42dc89202a24a6342d8c85ab;hb=af9ee7ff003fb448b783ccf39347907adc239cb2;hpb=108b238915c5f58b3d94ab433dc5d04e064c2b11

diff --git a/src/control_common.h b/src/control_common.h
index 720c2360..cd54889a 100644
--- a/src/control_common.h
+++ b/src/control_common.h
@@ -1,6 +1,7 @@
 /*
     control_protocol.h -- control socket protocol.
-    Copyright (C) 2007 Scott Lamb <slamb@slamb.org>
+    Copyright (C) 2007      Scott Lamb <slamb@slamb.org>
+                  2009-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,8 +21,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 +36,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