Merge branch 'master' into dirtydebug

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index d166305bee8185ff0397e71ff34e757091b4baf5..65aabd8101ababb82b1e258c95f96e5aba007d1c 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 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
@@ -29,7 +29,6 @@
 #include "xalloc.h"
 
 bool tunnelserver = false;
-bool strictsubnets = false;
 bool experimental = true;
 
 /* Jumptable for the request handlers */
@@ -38,9 +37,9 @@ static bool (*request_handlers[])(connection_t *, const char *) = {
                id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
                status_h, error_h, termreq_h,
                ping_h, pong_h,
-               add_subnet_h, del_subnet_h,
+               NULL, NULL, //add_subnet_h, del_subnet_h,
                add_edge_h, del_edge_h,
-               key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
+               key_changed_h, req_key_h, ans_key_h, tcppacket_h, NULL, //control_h,
 };
 
 /* Request names */