X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=d4a45e8ce820580b553da752ac4fd522970405fa;hb=ca989c0c8b19901cbd7664a9d2b42aa85c9c176e;hp=a8b30ff3959ba1bf2f7228db411b01190c22907c;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc diff --git a/src/protocol_misc.c b/src/protocol_misc.c index a8b30ff3..d4a45e8c 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); } @@ -114,7 +64,7 @@ bool send_pong(connection_t *c) { bool pong_h(connection_t *c, const char *request) { c->status.pinged = false; - /* Succesful connection, reset timeout if this is an outgoing connection. */ + /* Successful connection, reset timeout if this is an outgoing connection. */ if(c->outgoing) { c->outgoing->timeout = 0;