X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=c6a3630ae2ea190fc27ee41dbe8b9206c85591b9;hp=f255a5810b11bb2a370ec3bf954bbc04eac9c2b2;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=19be9cf7150858311f7898fa3fb525d692d02f64

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index f255a581..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-2012 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
@@ -23,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"
@@ -33,87 +33,84 @@ int maxoutbufsize = 0;
 
 /* Status and error notification routines */
 
-bool send_status(connection_t *c, int statusno, const char *statusstring) {
-	if(!statusstring)
-		statusstring = "Status";
+bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
 
-	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);
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "STATUS", c->name);
 		return false;
 	}
 
-	logger(DEBUG_STATUS, 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";
+bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
 
-	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);
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ERROR", c->name);
 		return false;
 	}
 
-	logger(DEBUG_ERROR, 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(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	(void)mesh;
+	(void)c;
+	(void)request;
+
+	assert(request);
+	assert(*request);
 
-bool termreq_h(connection_t *c, const char *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, NULL, "%d", PING);
 }
 
-bool ping_h(connection_t *c, const char *request) {
-	return send_pong(c);
+bool ping_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	(void)request;
+
+	assert(request);
+	assert(*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, NULL, "%d", PONG);
 }
 
-bool pong_h(connection_t *c, const char *request) {
+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;
-		c->outgoing->cfg = NULL;
-		if(c->outgoing->ai)
-			freeaddrinfo(c->outgoing->ai);
-		c->outgoing->ai = NULL;
-		c->outgoing->aip = NULL;
+		reset_outgoing(c->outgoing);
 	}
 
 	return true;
@@ -121,31 +118,17 @@ bool pong_h(connection_t *c, const char *request) {
 
 /* 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. */
+bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
 
-	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, const char *request) {
 	short int len;
 
 	if(sscanf(request, "%*d %hd", &len) != 1) {
-		logger(DEBUG_ALWAYS, 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;
 }