Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 43df9bbc77bff4a5d077d3d6a2820b56190acecd..225d7b4e7f325e50dab0e4281bf48dc8f84050cc 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -115,11 +115,11 @@ bool pong_h(connection_t *c, char *request) {
 
 /* Sending and receiving packets via TCP */
 
-bool send_tcppacket(connection_t *c, vpn_packet_t *packet) {
+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->buffer->output->off / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
+       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))