X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=95a240e18d8ffdbce7f2fe8aa599625ddc68c7d2;hb=6e80da3370249caa1082c23c3ef55f338d1e9e74;hp=0b893a677a653403aa59dd22aa5535ddfd62c0ed;hpb=af95368c0f30955f0e13b587d5d6d4989fd5a83e;p=tinc

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 0b893a67..95a240e1 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-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -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();
 
@@ -157,7 +153,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. */
 
-	if(c->outbuflen > maxoutbufsize)
+	if(c->buffer->output->off > maxoutbufsize)
 		return true;
 
 	if(!send_request(c, "%d %hd", PACKET, packet->len))
@@ -166,13 +162,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;