projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't forget to set prevhop to myself for new connections.
[tinc]
/
src
/
protocol_subnet.c
diff --git
a/src/protocol_subnet.c
b/src/protocol_subnet.c
index
fbb021d
..
e510307
100644
(file)
--- a/
src/protocol_subnet.c
+++ b/
src/protocol_subnet.c
@@
-1,7
+1,7
@@
/*
protocol_subnet.c -- handle the meta-protocol, subnets
/*
protocol_subnet.c -- handle the meta-protocol, subnets
- 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_subnet.c,v 1.1.4.
1 2002/02/11 10:05:58
guus Exp $
+ $Id: protocol_subnet.c,v 1.1.4.
5 2002/09/03 20:43:26
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-40,8
+40,6
@@
#include "meta.h"
#include "connection.h"
#include "node.h"
#include "meta.h"
#include "connection.h"
#include "node.h"
-#include "edge.h"
-#include "graph.h"
#include "system.h"
#include "system.h"
@@
-50,7
+48,7
@@
int send_add_subnet(connection_t *c, subnet_t *subnet)
int x;
char *netstr;
cp
int x;
char *netstr;
cp
- x = send_request(c, "%d %
s %s", ADD_SUBNET
,
+ x = send_request(c, "%d %
lx %s %s", ADD_SUBNET, random()
,
subnet->owner->name, netstr = net2str(subnet));
free(netstr);
cp
subnet->owner->name, netstr = net2str(subnet));
free(netstr);
cp
@@
-66,7
+64,7
@@
int add_subnet_h(connection_t *c)
subnet_t *s;
avl_node_t *node;
cp
subnet_t *s;
avl_node_t *node;
cp
- if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
+ if(sscanf(c->buffer, "%*d
%*x
"MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname);
return -1;
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname);
return -1;
@@
-88,6
+86,9
@@
cp
return -1;
}
return -1;
}
+ if(seen_request(c->buffer))
+ return 0;
+
/* Check if the owner of the new subnet is in the connection list */
owner = lookup_node(name);
/* Check if the owner of the new subnet is in the connection list */
owner = lookup_node(name);
@@
-128,7
+129,7
@@
cp
{
other = (connection_t *)node->data;
if(other->status.active && other != c)
{
other = (connection_t *)node->data;
if(other->status.active && other != c)
- send_
add_subnet(other, s
);
+ send_
request(other, "%s", c->buffer
);
}
cp
return 0;
}
cp
return 0;
@@
-140,7
+141,7
@@
int send_del_subnet(connection_t *c, subnet_t *s)
char *netstr;
cp
netstr = net2str(s);
char *netstr;
cp
netstr = net2str(s);
- x = send_request(c, "%d %
s %s", DEL_SUBNET
, s->owner->name, netstr);
+ x = send_request(c, "%d %
lx %s %s", DEL_SUBNET, random()
, s->owner->name, netstr);
free(netstr);
cp
return x;
free(netstr);
cp
return x;
@@
-155,7
+156,7
@@
int del_subnet_h(connection_t *c)
subnet_t *s, *find;
avl_node_t *node;
cp
subnet_t *s, *find;
avl_node_t *node;
cp
- if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
+ if(sscanf(c->buffer, "%*d
%*x
"MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname);
return -1;
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname);
return -1;
@@
-187,6
+188,9
@@
cp
return -1;
}
return -1;
}
+ if(seen_request(c->buffer))
+ return 0;
+
/* If everything is correct, delete the subnet from the list of the owner */
s->owner = owner;
/* If everything is correct, delete the subnet from the list of the owner */
s->owner = owner;
@@
-219,7
+223,7
@@
cp
{
other = (connection_t *)node->data;
if(other->status.active && other != c)
{
other = (connection_t *)node->data;
if(other->status.active && other != c)
- send_
del_subnet(other, find
);
+ send_
request(other, "%s", c->buffer
);
}
/* Finally, delete it. */
}
/* Finally, delete it. */