Remove unused functions.

diff --git a/src/protocol.c b/src/protocol.c
index f43fccd4c9b53b62ae880ba7fa4956ce9be73a35..d04f9ef6af923da9a35978ebaa1d83aaa73e29a9 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -35,7 +35,7 @@ bool strictsubnets = false;
 
 static bool (*request_handlers[])(connection_t *) = {
        id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
-       status_h, error_h, termreq_h,
+       NULL, NULL, NULL,
        ping_h, pong_h,
        add_subnet_h, del_subnet_h,
        add_edge_h, del_edge_h,

diff --git a/src/protocol.h b/src/protocol.h
index 0bacd7b12af0b07f9bcd41e3e7ba410816b8694c..ad3d31e9d4708fcce63cb00e70f381fe2ea70a2a 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -88,9 +88,6 @@ extern bool send_metakey(struct connection_t *);
 extern bool send_challenge(struct connection_t *);
 extern bool send_chal_reply(struct connection_t *);
 extern bool send_ack(struct connection_t *);
-extern bool send_status(struct connection_t *, int, const char *);
-extern bool send_error(struct connection_t *, int, const  char *);
-extern bool send_termreq(struct connection_t *);
 extern bool send_ping(struct connection_t *);
 extern bool send_pong(struct connection_t *);
 extern bool send_add_subnet(struct connection_t *, const struct subnet_t *);

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 22b204d9f2f3dcaabef9ab521e5418cf058ff383..b57e00f7cb5afeac547e30b9cdd398de4ef6a770 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -31,68 +31,6 @@
 
 int maxoutbufsize = 0;
 
-/* Status and error notification routines */
-
-bool send_status(connection_t *c, int statusno, const char *statusstring) {
-       if(!statusstring) {
-               statusstring = "Status";
-       }
-
-       return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
-}
-
-bool status_h(connection_t *c) {
-       int statusno;
-       char statusstring[MAX_STRING_SIZE];
-
-       if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "STATUS",
-                      c->name, c->hostname);
-               return false;
-       }
-
-       ifdebug(STATUS) logger(LOG_NOTICE, "Status message from %s (%s): %d: %s",
-                              c->name, c->hostname, statusno, statusstring);
-
-       return true;
-}
-
-bool send_error(connection_t *c, int err, const char *errstring) {
-       if(!errstring) {
-               errstring = "Error";
-       }
-
-       return send_request(c, "%d %d %s", ERROR, err, errstring);
-}
-
-bool error_h(connection_t *c) {
-       int err;
-       char errorstring[MAX_STRING_SIZE];
-
-       if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "ERROR",
-                      c->name, c->hostname);
-               return false;
-       }
-
-       ifdebug(ERROR) logger(LOG_NOTICE, "Error message from %s (%s): %d: %s",
-                             c->name, c->hostname, err, errorstring);
-
-       terminate_connection(c, c->status.active);
-
-       return true;
-}
-
-bool send_termreq(connection_t *c) {
-       return send_request(c, "%d", TERMREQ);
-}
-
-bool termreq_h(connection_t *c) {
-       terminate_connection(c, c->status.active);
-
-       return true;
-}
-
 bool send_ping(connection_t *c) {
        c->status.pinged = true;
        c->last_ping_time = now;