X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=05afbce2894983bd27444e6d6e3567bafb235ff9;hp=96234e4f941c6f4f8b5be12b40ca127467a1cccd;hb=8a6f278fd2606c0a8f133f05df83b2649eacf6c3;hpb=462ab530e546f5732dfd51134751da6f6910d679 diff --git a/src/protocol_misc.c b/src/protocol_misc.c index 96234e4f..05afbce2 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-2002 Ivo Timmermans , - 2000-2002 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,186 +13,143 @@ 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: protocol_misc.c,v 1.2 2002/04/09 15:26:01 zarq Exp $ + 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 "config.h" - -#include -#include -#include -#include -#include -#include - -#include +#include "system.h" #include "conf.h" +#include "connection.h" +#include "logger.h" +#include "meta.h" #include "net.h" #include "netutl.h" #include "protocol.h" -#include "meta.h" -#include "connection.h" +#include "utils.h" -#include "system.h" +int maxoutbufsize = 0; /* Status and error notification routines */ -int send_status(connection_t *c, int statusno, char *statusstring) -{ -cp - if(!statusstring) - statusstring = status_text[statusno]; -cp - return send_request(c, "%d %d %s", STATUS, statusno, statusstring); +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); } -int status_h(connection_t *c) -{ - int statusno; - char statusstring[MAX_STRING_SIZE]; -cp - if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2) - { - syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS", - c->name, c->hostname); - return -1; - } - - if(debug_lvl >= DEBUG_STATUS) - { - syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"), - c->name, c->hostname, status_text[statusno], statusstring); - } - -cp - return 0; +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; } -int send_error(connection_t *c, int err, char *errstring) -{ -cp - if(!errstring) - errstring = strerror(err); - return send_request(c, "%d %d %s", ERROR, err, errstring); +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); } -int error_h(connection_t *c) -{ - int err; - char errorstring[MAX_STRING_SIZE]; -cp - if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2) - { - syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR", - c->name, c->hostname); - return -1; - } - - if(debug_lvl >= DEBUG_ERROR) - { - syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"), - c->name, c->hostname, strerror(err), errorstring); - } - - terminate_connection(c, c->status.active); -cp - return 0; +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; } -int send_termreq(connection_t *c) -{ -cp - return send_request(c, "%d", TERMREQ); +bool send_termreq(connection_t *c) { + return send_request(c, "%d", TERMREQ); } -int termreq_h(connection_t *c) -{ -cp - terminate_connection(c, c->status.active); -cp - return 0; +bool termreq_h(connection_t *c) { + terminate_connection(c, c->status.active); + + return true; } -int send_ping(connection_t *c) -{ -cp - c->status.pinged = 1; - c->last_ping_time = now; -cp - return send_request(c, "%d", PING); +bool send_ping(connection_t *c) { + c->status.pinged = true; + c->last_ping_time = now; + + return send_request(c, "%d", PING); } -int ping_h(connection_t *c) -{ -cp - return send_pong(c); +bool ping_h(connection_t *c) { + return send_pong(c); } -int send_pong(connection_t *c) -{ -cp - return send_request(c, "%d", PONG); +bool send_pong(connection_t *c) { + return send_request(c, "%d", PONG); } -int pong_h(connection_t *c) -{ -cp - c->status.pinged = 0; - - /* Succesful connection, reset timeout if this is an outgoing connection. */ - - if(c->outgoing) - c->outgoing->timeout = 0; -cp - return 0; +bool pong_h(connection_t *c) { + c->status.pinged = false; + + /* Succesful connection, reset timeout if this is an outgoing connection. */ + + 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 */ -int send_tcppacket(connection_t *c, vpn_packet_t *packet) -{ - int x; -cp - /* Evil hack. */ +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. */ - x = send_request(c, "%d %hd", PACKET, packet->len); + if(2.0 * c->outbuflen / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX) + return true; - if(x) - return x; -cp - return send_meta(c, packet->data, packet->len); -} + if(!send_request(c, "%d %hd", PACKET, packet->len)) + return false; -int tcppacket_h(connection_t *c) -{ - short int len; -cp - if(sscanf(c->buffer, "%*d %hd", &len) != 1) - { - syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, c->hostname); - return -1; - } - - /* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */ - - c->tcplen = len; -cp - return 0; + return send_meta(c, (char *)packet->data, packet->len) && flush_meta(c); } -/* Status strings */ +bool tcppacket_h(connection_t *c) { + short int len; + + if(sscanf(c->buffer, "%*d %hd", &len) != 1) { + logger(LOG_ERR, "Got bad %s from %s (%s)", "PACKET", c->name, + c->hostname); + return false; + } -char (*status_text[]) = { - "Warning", -}; + /* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */ -/* Error strings */ + c->tcplen = len; -char (*error_text[]) = { - "Error", -}; + return true; +}