projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent looping DEL_NODE/ADD_NODE messages after a node disconnects.
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
9b2ec91
..
91c4ef3
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-1,7
+1,7
@@
/*
protocol.c -- handle the meta-protocol, basic functions
/*
protocol.c -- handle the meta-protocol, basic functions
- Copyright (C) 1999-2001 Ivo Timmermans <i
timmermans@bigfoot.com
>,
- 2000,2001 Guus Sliepen <guus@sliepen.
warande.net
>
+ Copyright (C) 1999-2001 Ivo Timmermans <i
vo@o2w.nl
>,
+ 2000,2001 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.c,v 1.28.4.1
28 2002/03/27 15:26:4
3 guus Exp $
+ $Id: protocol.c,v 1.28.4.1
31 2002/09/04 08:02:3
3 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-62,8
+62,15
@@
int send_request(connection_t *c, const char *format, ...)
va_list args;
char buffer[MAXBUFSIZE];
int len, request;
va_list args;
char buffer[MAXBUFSIZE];
int len, request;
-
+ char *name = "everyone";
+ char *hostname = "broadcast";
cp
cp
+ if(c)
+ {
+ name = c->name;
+ hostname = c->hostname;
+ }
+
/* Use vsnprintf instead of vasprintf: faster, no memory
fragmentation, cleanup is automatic, and there is a limit on the
input buffer anyway */
/* Use vsnprintf instead of vasprintf: faster, no memory
fragmentation, cleanup is automatic, and there is a limit on the
input buffer anyway */
@@
-74,7
+81,7
@@
cp
if(len < 0 || len > MAXBUFSIZE-1)
{
if(len < 0 || len > MAXBUFSIZE-1)
{
- syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"),
c->name, c->
hostname);
+ syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"),
name,
hostname);
return -1;
}
return -1;
}
@@
-82,14
+89,17
@@
cp
{
sscanf(buffer, "%d", &request);
if(debug_lvl >= DEBUG_META)
{
sscanf(buffer, "%d", &request);
if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request],
c->name, c->
hostname, buffer);
+ syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request],
name,
hostname, buffer);
else
else
- syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request],
c->name, c->
hostname);
+ syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request],
name,
hostname);
}
buffer[len++] = '\n';
cp
}
buffer[len++] = '\n';
cp
- return send_meta(c, buffer, len);
+ if(c)
+ return send_meta(c, buffer, len);
+ else
+ return broadcast_meta(NULL, buffer, len);
}
int receive_request(connection_t *c)
}
int receive_request(connection_t *c)
@@
-226,7
+236,7
@@
int (*request_handlers[])(connection_t*) = {
status_h, error_h, termreq_h,
ping_h, pong_h,
add_subnet_h, del_subnet_h,
status_h, error_h, termreq_h,
ping_h, pong_h,
add_subnet_h, del_subnet_h,
- add_
edge_h, del_edg
e_h,
+ add_
node_h, del_nod
e_h,
key_changed_h, req_key_h, ans_key_h,
tcppacket_h,
};
key_changed_h, req_key_h, ans_key_h,
tcppacket_h,
};
@@
-238,7
+248,7
@@
char (*request_name[]) = {
"STATUS", "ERROR", "TERMREQ",
"PING", "PONG",
"ADD_SUBNET", "DEL_SUBNET",
"STATUS", "ERROR", "TERMREQ",
"PING", "PONG",
"ADD_SUBNET", "DEL_SUBNET",
- "ADD_
EDGE", "DEL_EDG
E",
+ "ADD_
NODE", "DEL_NOD
E",
"KEY_CHANGED", "REQ_KEY", "ANS_KEY",
"PACKET",
};
"KEY_CHANGED", "REQ_KEY", "ANS_KEY",
"PACKET",
};