/*
protocol_auth.c -- handle the meta-protocol, authentication
- Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1999-2002 Ivo Timmermans <ivo@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
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.14 2002/09/04 16:26:45 guus Exp $
*/
#include "config.h"
to create node_t and edge_t structures. */
int x;
- char *address, *port;
struct timeval now;
cp
/* Estimate weight */
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);
- free(address);
- free(port);
+ x = send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
cp
return x;
}
subnet_t *s;
edge_t *e;
- /* Send all known subnets */
+ /* Send all known subnets and edges */
for(node = node_tree->head; node; node = node->next)
{
s = (subnet_t *)node2->data;
send_add_subnet(c, s);
}
- }
-
- /* Send all known edges */
-
- for(node = edge_tree->head; node; node = node->next)
- {
- e = (edge_t *)node->data;
-
- if(e == c->edge)
- continue;
- send_add_edge(c, e);
+ for(node2 = n->edge_tree->head; node2; node2 = node2->next)
+ {
+ e = (edge_t *)node2->data;
+ send_add_edge(c, e);
+ }
}
}
int ack_h(connection_t *c)
{
- char myaddress[MAX_STRING_SIZE];
char hisport[MAX_STRING_SIZE];
char *hisaddress, *dummy;
int weight;
long int options;
node_t *n;
- connection_t *other;
- avl_node_t *node;
cp
- if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %d %lx", hisport, myaddress, &weight, &options) != 4)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" %d %lx", hisport, &weight, &options) != 3)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
return -1;
syslog(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"), n->name, n->hostname);
terminate_connection(n->connection, 0);
}
-
- /* FIXME: check if information in existing node matches that of the other end of this connection */
}
n->connection = c;
c->node = n;
c->options |= options;
+ /* Activate this connection */
+
+ c->allow_request = ALL;
+ c->status.active = 1;
+
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
+
+ /* Send him everything we know */
+
+ send_everything(c);
+
/* Create an edge_t for this connection */
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->to.tcpaddress = c->address;
+ c->edge->from = myself;
+ c->edge->to = n;
sockaddr2str(&c->address, &hisaddress, &dummy);
- c->edge->to.udpaddress = str2sockaddr(hisaddress, hisport);
+ c->edge->address = str2sockaddr(hisaddress, hisport);
free(hisaddress);
free(dummy);
c->edge->weight = (weight + c->estimated_weight) / 2;
cp
edge_add(c->edge);
- /* Activate this connection */
-
- c->allow_request = ALL;
- c->status.active = 1;
-
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
-
cp
- /* Send him everything we know */
-
- send_everything(c);
+ /* Notify everyone of the new edge */
- /* Notify others of this connection */
-
- for(node = connection_tree->head; node; node = node->next)
- {
- other = (connection_t *)node->data;
-
- if(other->status.active && other != c)
- send_add_edge(other, c->edge);
- }
+ send_add_edge(broadcast, c->edge);
/* 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;
}