Merge branch 'master' into 1.1

[tinc] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 28571ef..43df9bb 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -40,11 +40,11 @@ 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];
 
-       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;
@@ -63,11 +63,11 @@ 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];
 
-       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;
@@ -76,29 +76,25 @@ 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) {
        return send_request(c, "%d", TERMREQ);
 }
 
-bool termreq_h(connection_t *c) {
-       terminate_connection(c, c->status.active);
-
-       return true;
+bool termreq_h(connection_t *c, char *request) {
+       return false;
 }
 
 bool send_ping(connection_t *c) {
        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) {
        return send_pong(c);
 }
 
@@ -106,7 +102,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) {
        c->status.pinged = false;
 
        /* Succesful connection, reset timeout if this is an outgoing connection. */
@@ -123,7 +119,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 / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
+       if(2.0 * c->buffer->output->off / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
                return true;
 
        if(!send_request(c, "%d %hd", PACKET, packet->len))
@@ -132,10 +128,10 @@ 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;
 
-       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;