Add stricter checks for netnames.

[tinc] / src / control_common.h

diff --git a/src/control_common.h b/src/control_common.h
index bceaa71..cd54889 100644 (file)
--- 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,
@@ -32,21 +34,15 @@ enum request_type {
        REQ_DUMP_CONNECTIONS,
        REQ_DUMP_GRAPH,
        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;
-} 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