From b34eb5555d40b7e87c1e06988250e4977a793c09 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 6 Nov 2017 22:27:57 +0100 Subject: [PATCH] Remove unused functions. --- src/protocol.c | 2 +- src/protocol.h | 2 -- src/protocol_misc.c | 50 --------------------------------------------- 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/src/protocol.c b/src/protocol.c index 941459c7..7cb19448 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -36,7 +36,7 @@ bool experimental = true; 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, + NULL, NULL, termreq_h, 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 390349c7..3ffcfd5f 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -96,8 +96,6 @@ extern bool send_metakey_ec(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 *); diff --git a/src/protocol_misc.c b/src/protocol_misc.c index a8b30ff3..a78728fa 100644 --- a/src/protocol_misc.c +++ b/src/protocol_misc.c @@ -38,56 +38,6 @@ int maxoutbufsize = 0; int mtu_info_interval = 5; int udp_info_interval = 5; -/* 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, const char *request) { - int statusno; - char statusstring[MAX_STRING_SIZE]; - - if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) { - logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "STATUS", - c->name, c->hostname); - return false; - } - - logger(DEBUG_STATUS, 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, const char *request) { - int err; - char errorstring[MAX_STRING_SIZE]; - - if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) { - logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ERROR", - c->name, c->hostname); - return false; - } - - logger(DEBUG_ERROR, LOG_NOTICE, "Error message from %s (%s): %d: %s", - c->name, c->hostname, err, errorstring); - - return false; -} - bool send_termreq(connection_t *c) { return send_request(c, "%d", TERMREQ); } -- 2.20.1