From: Guus Sliepen Date: Sat, 4 Nov 2017 11:20:50 +0000 (+0100) Subject: Remove unused functions. X-Git-Tag: release-1.0.33~6 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=3f0c1f6b81dd305b0ded2424f9f7da441c7d97b6;p=tinc Remove unused functions. --- diff --git a/src/protocol.c b/src/protocol.c index f43fccd4..d04f9ef6 100644 --- 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 0bacd7b1..ad3d31e9 100644 --- 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 22b204d9..b57e00f7 100644 --- 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;