X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_misc.c;fp=src%2Fprotocol_misc.c;h=02e3859810d2d9f76880abca5be513d852666767;hp=8f56aee50aff918a20f6a0791aa0c9acd7323a6b;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hpb=43fa7283ac01f2ecc95381b519ef6b3342546f35

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 8f56aee5..02e38598 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -45,14 +45,14 @@ bool send_status(connection_t *c, int statusno, const char *statusstring)
 	return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
 }
 
-bool status_h(connection_t *c)
+bool status_h(connection_t *c, char *request)
 {
 	int statusno;
 	char statusstring[MAX_STRING_SIZE];
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
+	if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
 			   c->name, c->hostname);
 		return false;
@@ -74,14 +74,14 @@ bool send_error(connection_t *c, int err, const char *errstring)
 	return send_request(c, "%d %d %s", ERROR, err, errstring);
 }
 
-bool error_h(connection_t *c)
+bool error_h(connection_t *c, char *request)
 {
 	int err;
 	char errorstring[MAX_STRING_SIZE];
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
+	if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
 			   c->name, c->hostname);
 		return false;
@@ -90,9 +90,7 @@ bool error_h(connection_t *c)
 	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;
+	return false;
 }
 
 bool send_termreq(connection_t *c)
@@ -102,13 +100,11 @@ bool send_termreq(connection_t *c)
 	return send_request(c, "%d", TERMREQ);
 }
 
-bool termreq_h(connection_t *c)
+bool termreq_h(connection_t *c, char *request)
 {
 	cp();
 
-	terminate_connection(c, c->status.active);
-
-	return true;
+	return false;
 }
 
 bool send_ping(connection_t *c)
@@ -116,12 +112,12 @@ bool send_ping(connection_t *c)
 	cp();
 
 	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)
+bool ping_h(connection_t *c, char *request)
 {
 	cp();
 
@@ -135,7 +131,7 @@ bool send_pong(connection_t *c)
 	return send_request(c, "%d", PONG);
 }
 
-bool pong_h(connection_t *c)
+bool pong_h(connection_t *c, char *request)
 {
 	cp();
 
@@ -158,7 +154,7 @@ bool send_tcppacket(connection_t *c, 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->outbuflen / (double)maxoutbufsize - 1 > drand48())
+	if(2.0 * c->buffer->output->off / (double)maxoutbufsize - 1 > drand48())
 		return true;
 
 	if(!send_request(c, "%d %hd", PACKET, packet->len))
@@ -167,13 +163,13 @@ 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, char *request)
 {
 	short int len;
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
+	if(sscanf(request, "%*d %hd", &len) != 1) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
 			   c->hostname);
 		return false;