along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol_edge.c,v 1.1.4.8 2002/06/21 10:11:19 guus Exp $
+ $Id: protocol_edge.c,v 1.1.4.10 2002/09/04 16:26:45 guus Exp $
*/
#include "config.h"
int send_add_edge(connection_t *c, edge_t *e)
{
int x;
- char *from_udpaddress, *from_udpport;
- char *to_udpaddress, *to_udpport;
+ char *address, *port;
cp
- sockaddr2str(&e->from.udpaddress, &from_udpaddress, &from_udpport);
- sockaddr2str(&e->to.udpaddress, &to_udpaddress, &to_udpport);
- x = send_request(c, "%d %lx %s %s %s %s %s %s %lx %d", ADD_EDGE, random(),
- e->from.node->name, from_udpaddress, from_udpport,
- e->to.node->name, to_udpaddress, to_udpport,
+ sockaddr2str(&e->address, &address, &port);
+ x = send_request(c, "%d %lx %s %s %s %s %lx %d", ADD_EDGE, random(),
+ e->from->name, e->to->name, address, port,
e->options, e->weight);
- free(from_udpaddress);
- free(from_udpport);
- free(to_udpaddress);
- free(to_udpport);
+ free(address);
+ free(port);
cp
return x;
}
int add_edge_h(connection_t *c)
{
- connection_t *other;
edge_t *e;
node_t *from, *to;
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
- char from_address[MAX_STRING_SIZE];
- char from_udpport[MAX_STRING_SIZE];
char to_address[MAX_STRING_SIZE];
- char to_udpport[MAX_STRING_SIZE];
- sockaddr_t from_udpaddress;
- sockaddr_t to_udpaddress;
+ char to_port[MAX_STRING_SIZE];
+ sockaddr_t address;
long int options;
int weight;
- avl_node_t *node;
cp
- if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
- from_name, from_address, from_udpport,
- to_name, to_address, to_udpport,
- &options, &weight) != 8)
+ if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
+ from_name, to_name, to_address, to_port, &options, &weight) != 6)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
return -1;
/* Convert addresses */
- from_udpaddress = str2sockaddr(from_address, from_udpport);
- to_udpaddress = str2sockaddr(to_address, to_udpport);
+ address = str2sockaddr(to_address, to_port);
/* Check if edge already exists */
if(e)
{
- if(e->weight != weight || e->options != options
- || ((e->from.node == from) && (sockaddrcmp(&e->from.udpaddress, &from_udpaddress)|| sockaddrcmp(&e->to.udpaddress, &to_udpaddress)))
- || ((e->from.node == to) && (sockaddrcmp(&e->from.udpaddress, &to_udpaddress) || sockaddrcmp(&e->to.udpaddress, &from_udpaddress)))
- )
+ if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address))
{
- if(from == myself || to == myself)
+ if(from == myself)
{
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
else
return 0;
}
- else if(from == myself || to == myself)
+ else if(from == myself)
{
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"), "ADD_EDGE", c->name, c->hostname);
e = new_edge();
- e->from.node = from;
- e->to.node = to;
+ e->from = from;
+ e->to = to;
send_del_edge(c, e);
free_edge(e);
return 0;
}
e = new_edge();
- e->from.node = from;
- e->from.udpaddress = from_udpaddress;
- e->to.node = to;
- e->to.udpaddress = to_udpaddress;
+ e->from = from;
+ e->to = to;
+ e->address = address;
e->options = options;
e->weight = weight;
edge_add(e);
/* Tell the rest about the new edge */
- for(node = connection_tree->head; node; node = node->next)
- {
- other = (connection_t *)node->data;
- if(other->status.active && other != c)
- send_request(other, "%s", c->buffer);
- }
+ forward_request(c);
/* Run MST before or after we tell the rest? */
{
cp
return send_request(c, "%d %lx %s %s", DEL_EDGE, random(),
- e->from.node->name, e->to.node->name);
+ e->from->name, e->to->name);
}
int del_edge_h(connection_t *c)
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
- connection_t *other;
- avl_node_t *node;
cp
if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING"", from_name, to_name) != 2)
{
return 0;
}
- if(e->from.node == myself || e->to.node == myself)
+ if(e->from == myself)
{
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"), "DEL_EDGE", c->name, c->hostname);
/* Tell the rest about the deleted edge */
- for(node = connection_tree->head; node; node = node->next)
- {
- other = (connection_t *)node->data;
- if(other->status.active && other != c)
- send_request(other, "%s", c->buffer);
- }
+ forward_request(c);
/* Delete the edge */