projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Darwin (MacOS/X) tun device handling.
[tinc]
/
src
/
protocol_misc.c
diff --git
a/src/protocol_misc.c
b/src/protocol_misc.c
index
5863f9e
..
9f1a5fb
100644
(file)
--- a/
src/protocol_misc.c
+++ b/
src/protocol_misc.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol_misc.c,v 1.1.4.
1 2002/02/11 10:05:58
guus Exp $
+ $Id: protocol_misc.c,v 1.1.4.
3 2002/03/23 20:21:10
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-122,7
+122,7
@@
int send_ping(connection_t *c)
{
cp
c->status.pinged = 1;
{
cp
c->status.pinged = 1;
- c->last_ping_time =
time(NULL)
;
+ c->last_ping_time =
now
;
cp
return send_request(c, "%d", PING);
}
cp
return send_request(c, "%d", PING);
}
@@
-143,6
+143,11
@@
int pong_h(connection_t *c)
{
cp
c->status.pinged = 0;
{
cp
c->status.pinged = 0;
+
+ /* Succesful connection, reset timeout if this is an outgoing connection. */
+
+ if(c->outgoing)
+ c->outgoing->timeout = 0;
cp
return 0;
}
cp
return 0;
}