X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=713dacf19a800a2a4c357da55f79056840060d74;hb=94f49a163aa570ea272bf3bbd7734187098d88b7;hp=f255a5810b11bb2a370ec3bf954bbc04eac9c2b2;hpb=6dfdb323612184529b4b83c1be914dda8262de47;p=tinc

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index f255a581..713dacf1 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,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 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
@@ -89,7 +89,7 @@ bool termreq_h(connection_t *c, const char *request) {
 
 bool send_ping(connection_t *c) {
 	c->status.pinged = true;
-	c->last_ping_time = time(NULL);
+	c->last_ping_time = now.tv_sec;
 
 	return send_request(c, "%d", PING);
 }
@@ -123,7 +123,7 @@ bool pong_h(connection_t *c, const char *request) {
 
 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. */
+	   We use a very simple Random Early Drop algorithm. */
 
 	if(2.0 * c->outbuf.len / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
 		return true;
@@ -131,7 +131,7 @@ bool send_tcppacket(connection_t *c, const vpn_packet_t *packet) {
 	if(!send_request(c, "%d %hd", PACKET, packet->len))
 		return false;
 
-	return send_meta(c, (char *)packet->data, packet->len);
+	return send_meta(c, (char *)DATA(packet), packet->len);
 }
 
 bool tcppacket_h(connection_t *c, const char *request) {