X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol_common.h;h=c89f9de7dcfb61755aa64ef3a60878e1d9d48210;hb=edebf579f2ea29e6e84360cb13731f5858a1555b;hp=2b7795562299ae91da1029c14132bb0ed580da4f;hpb=a62a6825a8a69e279ee0688a4cd9e51fbc52054b;p=tinc

diff --git a/src/control_common.h b/src/control_common.h
index 2b779556..c89f9de7 100644
--- a/src/control_common.h
+++ b/src/control_common.h
@@ -12,18 +12,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,
@@ -33,21 +34,9 @@ enum request_type {
 	REQ_DUMP_GRAPH,
 	REQ_PURGE,
 	REQ_SET_DEBUG,
+	REQ_RETRY,
 };
 
 #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