projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated documentation.
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
e37d767
..
6b5b874
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.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_auth.c,v 1.1.4.
3 2002/02/20 19:25:09
guus Exp $
+ $Id: protocol_auth.c,v 1.1.4.
7 2002/03/23 20:21:10
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 %d", 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
@@
-515,17
+515,16
@@
void send_everything(connection_t *c)
int ack_h(connection_t *c)
{
int ack_h(connection_t *c)
{
- char address[MAX_STRING_SIZE];
- char port[MAX_STRING_SIZE];
+ char myaddress[MAX_STRING_SIZE];
char hisport[MAX_STRING_SIZE];
char *hisaddress, *dummy;
int weight;
char hisport[MAX_STRING_SIZE];
char *hisaddress, *dummy;
int weight;
- int options;
+
long
int options;
node_t *n;
connection_t *other;
avl_node_t *node;
cp
node_t *n;
connection_t *other;
avl_node_t *node;
cp
- if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING"
"MAX_STRING" %d %d", hisport, address, port, &weight, &options) != 5
)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING"
%d %lx", hisport, myaddress, &weight, &options) != 4
)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
return -1;
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
return -1;
@@
-563,10
+562,10
@@
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(address, myport);
+
//
c->edge->from.tcpaddress = str2sockaddr(address, port);
+ c->edge->from.udpaddress = str2sockaddr(
my
address, myport);
c->edge->to.node = n;
c->edge->to.node = n;
- c->edge->to.tcpaddress = c->address;
+
//
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);
@@
-603,11
+602,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;
}