X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=7617091e5eac3711c505e2d84ce0d150ca0b3966;hp=0b893a677a653403aa59dd22aa5535ddfd62c0ed;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hpb=af95368c0f30955f0e13b587d5d6d4989fd5a83e diff --git a/src/protocol_misc.c b/src/protocol_misc.c index 0b893a67..7617091e 100644 --- a/src/protocol_misc.c +++ b/src/protocol_misc.c @@ -1,7 +1,7 @@ /* protocol_misc.c -- handle the meta-protocol, miscellaneous functions - Copyright (C) 1999-2005 Ivo Timmermans , - 2000-2005 Guus Sliepen + Copyright (C) 1999-2005 Ivo Timmermans, + 2000-2012 Guus Sliepen 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 @@ -13,11 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" @@ -35,129 +33,99 @@ int maxoutbufsize = 0; /* Status and error notification routines */ -bool send_status(connection_t *c, int statusno, const char *statusstring) -{ - cp(); - +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) -{ +bool status_h(connection_t *c, const char *request) { int statusno; char statusstring[MAX_STRING_SIZE]; - cp(); - - if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) { - logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS", + 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; } - ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"), + 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) -{ - cp(); - +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) -{ +bool error_h(connection_t *c, const char *request) { int err; char errorstring[MAX_STRING_SIZE]; - cp(); - - if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) { - logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR", + 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; } - ifdebug(ERROR) logger(LOG_NOTICE, _("Error message from %s (%s): %d: %s"), + logger(DEBUG_ERROR, LOG_NOTICE, "Error message from %s (%s): %d: %s", c->name, c->hostname, err, errorstring); - terminate_connection(c, c->status.active); - - return true; + return false; } -bool send_termreq(connection_t *c) -{ - cp(); - +bool send_termreq(connection_t *c) { return send_request(c, "%d", TERMREQ); } -bool termreq_h(connection_t *c) -{ - cp(); - - terminate_connection(c, c->status.active); - - return true; +bool termreq_h(connection_t *c, const char *request) { + return false; } -bool send_ping(connection_t *c) -{ - cp(); - +bool send_ping(connection_t *c) { c->status.pinged = true; - c->last_ping_time = now; + c->last_ping_time = time(NULL); return send_request(c, "%d", PING); } -bool ping_h(connection_t *c) -{ - cp(); - +bool ping_h(connection_t *c, const char *request) { return send_pong(c); } -bool send_pong(connection_t *c) -{ - cp(); - +bool send_pong(connection_t *c) { return send_request(c, "%d", PONG); } -bool pong_h(connection_t *c) -{ - cp(); - +bool pong_h(connection_t *c, const char *request) { c->status.pinged = false; /* Succesful connection, reset timeout if this is an outgoing connection. */ - if(c->outgoing) + if(c->outgoing) { c->outgoing->timeout = 0; + c->outgoing->cfg = NULL; + if(c->outgoing->ai) + freeaddrinfo(c->outgoing->ai); + c->outgoing->ai = NULL; + c->outgoing->aip = NULL; + } return true; } /* Sending and receiving packets via TCP */ -bool send_tcppacket(connection_t *c, vpn_packet_t *packet) -{ - cp(); +bool send_tcppacket(connection_t *c, const vpn_packet_t *packet) { + /* If there already is a lot of data in the outbuf buffer, discard this packet. + We use a very simple Random Early Drop algorithm. */ - /* If there already is a lot of data in the outbuf buffer, discard this packet. */ - - if(c->outbuflen > maxoutbufsize) + if(2.0 * c->outbuf.len / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX) return true; if(!send_request(c, "%d %hd", PACKET, packet->len)) @@ -166,14 +134,11 @@ bool send_tcppacket(connection_t *c, vpn_packet_t *packet) return send_meta(c, (char *)packet->data, packet->len); } -bool tcppacket_h(connection_t *c) -{ +bool tcppacket_h(connection_t *c, const char *request) { short int len; - cp(); - - if(sscanf(c->buffer, "%*d %hd", &len) != 1) { - logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, + if(sscanf(request, "%*d %hd", &len) != 1) { + logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "PACKET", c->name, c->hostname); return false; }