projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s/sliepen.warande.net/sliepen.eu.org/g
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
cbe0958
..
c7c5732
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-1,7
+1,7
@@
/*
protocol_auth.c -- handle the meta-protocol, authentication
/*
protocol_auth.c -- handle the meta-protocol, authentication
- Copyright (C) 1999-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>,
- 2000-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ Copyright (C) 1999-2002 Ivo Timmermans <i
vo@o2w.nl
>,
+ 2000-2002 Guus Sliepen <guus@sliepen.
eu.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
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
@@
-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_auth.c,v 1.1.4.
5 2002/03/22 13:31:18
guus Exp $
+ $Id: protocol_auth.c,v 1.1.4.
9 2002/06/21 10:11:13
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-473,7
+473,7
@@
cp
gettimeofday(&now, NULL);
c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
sockaddr2str(&c->address, &address, &port);
gettimeofday(&now, NULL);
c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
sockaddr2str(&c->address, &address, &port);
- x = send_request(c, "%d %s %s %
s %d %lx", ACK, myport, address, port
, c->estimated_weight, c->options);
+ x = send_request(c, "%d %s %s %
d %lx", ACK, myport, address
, c->estimated_weight, c->options);
free(address);
free(port);
cp
free(address);
free(port);
cp
@@
-562,10
+562,8
@@
cp
c->edge = new_edge();
cp
c->edge->from.node = myself;
c->edge = new_edge();
cp
c->edge->from.node = myself;
-// c->edge->from.tcpaddress = str2sockaddr(address, port);
c->edge->from.udpaddress = str2sockaddr(myaddress, myport);
c->edge->to.node = n;
c->edge->from.udpaddress = str2sockaddr(myaddress, myport);
c->edge->to.node = n;
-// c->edge->to.tcpaddress = c->address;
sockaddr2str(&c->address, &hisaddress, &dummy);
c->edge->to.udpaddress = str2sockaddr(hisaddress, hisport);
free(hisaddress);
sockaddr2str(&c->address, &hisaddress, &dummy);
c->edge->to.udpaddress = str2sockaddr(hisaddress, hisport);
free(hisaddress);
@@
-602,11
+600,6
@@
cp
/* Run MST and SSSP algorithms */
graph();
/* Run MST and SSSP algorithms */
graph();
-
- /* Succesful connection, reset timeout if this is an outgoing connection. */
-
- if(c->outgoing)
- c->outgoing->timeout = 0;
cp
return 0;
}
cp
return 0;
}