projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix signed comparison bug in lookup_subnet_ipv4().
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
29282a1
..
7c9a3a8
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.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.c,v 1.28.4.10
1 2001/07/20 13:54:19
guus Exp $
+ $Id: protocol.c,v 1.28.4.10
4 2001/08/17 18:14:04
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-245,14
+245,10
@@
cp
cl->status.outgoing = 1;
old->status.outgoing = 0;
}
cl->status.outgoing = 1;
old->status.outgoing = 0;
}
- terminate_connection(old);
+ terminate_connection(old
, 0
);
return 0;
}
return 0;
}
- /* Now we can add the name to the id tree */
-
- id_add(cl);
-
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
old = avl_search(active_tree, cl);
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
old = avl_search(active_tree, cl);
@@
-266,7
+262,6
@@
cp
/* Activate this connection */
cl->allow_request = ALL;
/* Activate this connection */
cl->allow_request = ALL;
- cl->status.active = 1;
cl->nexthop = cl;
cl->cipher_pkttype = EVP_bf_cbc();
cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cl->nexthop = cl;
cl->cipher_pkttype = EVP_bf_cbc();
cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
@@
-834,7
+829,7
@@
cp
if((old = lookup_id(name)))
{
if((old = lookup_id(name)))
{
- if((new->address == old->address) && (new->port == old->port))
+ if((new->address == old->address) && (new->port == old->port)
&& (cl == old->nexthop)
)
{
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
{
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
@@
-848,7
+843,7
@@
cp
syslog(LOG_NOTICE, _("Removing old entry for %s (%s) in favour of new connection"),
old->name, old->hostname);
syslog(LOG_NOTICE, _("Removing old entry for %s (%s) in favour of new connection"),
old->name, old->hostname);
- terminate_connection(old);
+ terminate_connection(old
, 0
);
}
}
}
}
@@
-856,7
+851,6
@@
cp
new->name = xstrdup(name);
active_add(new);
new->name = xstrdup(name);
active_add(new);
- id_add(new);
/* Tell the rest about the new host */
/* Tell the rest about the new host */
@@
-870,7
+864,6
@@
cp
/* Fill in rest of connection structure */
new->nexthop = cl;
/* Fill in rest of connection structure */
new->nexthop = cl;
- new->status.active = 1;
new->cipher_pkttype = EVP_bf_cbc();
new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cp
new->cipher_pkttype = EVP_bf_cbc();
new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cp
@@
-921,7
+914,7
@@
cp
return 0;
}
return 0;
}
- /* Check if the
new
host already exists in the connnection list */
+ /* Check if the
deleted
host already exists in the connnection list */
if(!(old = lookup_id(name)))
{
if(!(old = lookup_id(name)))
{
@@
-940,10
+933,9
@@
cp
/* Ok, since EVERYTHING seems to check out all right, delete it */
/* Ok, since EVERYTHING seems to check out all right, delete it */
- old->status.active = 0;
- terminate_connection(old);
+ terminate_connection(old, 0);
- /* Tell the rest about the
new
host */
+ /* Tell the rest about the
deleted
host */
for(node = connection_tree->head; node; node = node->next)
{
for(node = connection_tree->head; node; node = node->next)
{
@@
-1014,7
+1006,7
@@
cp
cl->name, cl->hostname, strerror(err), errorstring);
}
cl->name, cl->hostname, strerror(err), errorstring);
}
- terminate_connection(cl);
+ terminate_connection(cl
, cl->status.meta
);
cp
return 0;
}
cp
return 0;
}
@@
-1028,7
+1020,7
@@
cp
int termreq_h(connection_t *cl)
{
cp
int termreq_h(connection_t *cl)
{
cp
- terminate_connection(cl);
+ terminate_connection(cl
, cl->status.meta
);
cp
return 0;
}
cp
return 0;
}