X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=c6a3630ae2ea190fc27ee41dbe8b9206c85591b9;hp=0b893a677a653403aa59dd22aa5535ddfd62c0ed;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=af95368c0f30955f0e13b587d5d6d4989fd5a83e diff --git a/src/protocol_misc.c b/src/protocol_misc.c index 0b893a67..c6a3630a 100644 --- a/src/protocol_misc.c +++ b/src/protocol_misc.c @@ -1,7 +1,6 @@ /* protocol_misc.c -- handle the meta-protocol, miscellaneous functions - Copyright (C) 1999-2005 Ivo Timmermans , - 2000-2005 Guus Sliepen + Copyright (C) 2014-2017 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 +12,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" @@ -25,6 +22,7 @@ #include "conf.h" #include "connection.h" #include "logger.h" +#include "meshlink_internal.h" #include "meta.h" #include "net.h" #include "netutl.h" @@ -35,152 +33,102 @@ int maxoutbufsize = 0; /* Status and error notification routines */ -bool send_status(connection_t *c, int statusno, const char *statusstring) -{ - cp(); - - if(!statusstring) - statusstring = "Status"; - - return send_request(c, "%d %d %s", STATUS, statusno, statusstring); -} +bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { + assert(request); + assert(*request); -bool status_h(connection_t *c) -{ 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", - c->name, c->hostname); + if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) { + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "STATUS", c->name); return false; } - ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"), - c->name, c->hostname, statusno, statusstring); + logger(mesh, MESHLINK_INFO, "Status message from %s: %d: %s", c->name, statusno, statusstring); return true; } -bool send_error(connection_t *c, int err, const char *errstring) -{ - cp(); - - if(!errstring) - errstring = "Error"; - - return send_request(c, "%d %d %s", ERROR, err, errstring); -} +bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { + assert(request); + assert(*request); -bool error_h(connection_t *c) -{ 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", - c->name, c->hostname); + if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) { + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ERROR", c->name); 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); + logger(mesh, MESHLINK_INFO, "Error message from %s: %d: %s", c->name, err, errorstring); - return true; + return false; } -bool send_termreq(connection_t *c) -{ - cp(); +bool termreq_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { + (void)mesh; + (void)c; + (void)request; - return send_request(c, "%d", TERMREQ); -} + assert(request); + assert(*request); -bool termreq_h(connection_t *c) -{ - cp(); - - terminate_connection(c, c->status.active); - - return true; + return false; } -bool send_ping(connection_t *c) -{ - cp(); - +bool send_ping(meshlink_handle_t *mesh, connection_t *c) { c->status.pinged = true; - c->last_ping_time = now; + c->last_ping_time = mesh->loop.now.tv_sec; - return send_request(c, "%d", PING); + return send_request(mesh, c, NULL, "%d", PING); } -bool ping_h(connection_t *c) -{ - cp(); +bool ping_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { + (void)request; - return send_pong(c); -} + assert(request); + assert(*request); -bool send_pong(connection_t *c) -{ - cp(); + return send_pong(mesh, c); +} - return send_request(c, "%d", PONG); +bool send_pong(meshlink_handle_t *mesh, connection_t *c) { + return send_request(mesh, c, NULL, "%d", PONG); } -bool pong_h(connection_t *c) -{ - cp(); +bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { + (void)mesh; + (void)request; + + assert(request); + assert(*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; + if(c->outgoing) { + reset_outgoing(c->outgoing); + } return true; } /* Sending and receiving packets via TCP */ -bool send_tcppacket(connection_t *c, vpn_packet_t *packet) -{ - cp(); - - /* If there already is a lot of data in the outbuf buffer, discard this packet. */ +bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { + assert(request); + assert(*request); - if(c->outbuflen > maxoutbufsize) - return true; - - if(!send_request(c, "%d %hd", PACKET, packet->len)) - return false; - - return send_meta(c, (char *)packet->data, packet->len); -} - -bool tcppacket_h(connection_t *c) -{ short int len; - cp(); - - if(sscanf(c->buffer, "%*d %hd", &len) != 1) { - logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, - c->hostname); + if(sscanf(request, "%*d %hd", &len) != 1) { + logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "PACKET", c->name); return false; } - /* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */ - - c->tcplen = len; - - return true; + // This should never happen with MeshLink. + return false; }