/*
protocol_misc.c -- handle the meta-protocol, miscellaneous functions
- Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
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
#include "conf.h"
#include "connection.h"
#include "logger.h"
+#include "meshlink_internal.h"
#include "meta.h"
#include "net.h"
#include "netutl.h"
/* 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, char *request) {
+bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
int statusno;
char statusstring[MAX_STRING_SIZE];
if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
- logger(LOG_ERR, "Got bad %s from %s (%s)", "STATUS",
- c->name, c->hostname);
+ 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) {
- if(!errstring)
- errstring = "Error";
-
- return send_request(c, "%d %d %s", ERROR, err, errstring);
-}
-
-bool error_h(connection_t *c, char *request) {
+bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
int err;
char errorstring[MAX_STRING_SIZE];
if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
- logger(LOG_ERR, "Got bad %s from %s (%s)", "ERROR",
- c->name, c->hostname);
+ 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);
+ logger(mesh, MESHLINK_INFO, "Error message from %s: %d: %s", c->name, err, errorstring);
return false;
}
-bool send_termreq(connection_t *c) {
- return send_request(c, "%d", TERMREQ);
-}
-
-bool termreq_h(connection_t *c, char *request) {
+bool termreq_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ (void)mesh;
+ (void)c;
+ (void)request;
return false;
}
-bool send_ping(connection_t *c) {
+bool send_ping(meshlink_handle_t *mesh, connection_t *c) {
c->status.pinged = true;
- c->last_ping_time = time(NULL);
+ c->last_ping_time = mesh->loop.now.tv_sec;
- return send_request(c, "%d", PING);
+ return send_request(mesh, c, "%d", PING);
}
-bool ping_h(connection_t *c, char *request) {
- return send_pong(c);
+bool ping_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ (void)request;
+ return send_pong(mesh, c);
}
-bool send_pong(connection_t *c) {
- return send_request(c, "%d", PONG);
+bool send_pong(meshlink_handle_t *mesh, connection_t *c) {
+ return send_request(mesh, c, "%d", PONG);
}
-bool pong_h(connection_t *c, char *request) {
+bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ (void)mesh;
+ (void)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, 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(2.0 * c->outbuf.len / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
- 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, char *request) {
+bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
short int len;
if(sscanf(request, "%*d %hd", &len) != 1) {
- logger(LOG_ERR, "Got bad %s from %s (%s)", "PACKET", c->name,
- c->hostname);
+ 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;
}