X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fcontrol_common.h;h=cd54889a99a2d896fd4e681c4b14fb2d80892c1c;hp=6384651a04b02d2ecbe309d7d08832d2fdf4fe3a;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b

diff --git a/src/control_common.h b/src/control_common.h
index 6384651a..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
@@ -12,18 +13,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #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,
@@ -34,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