projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reopen log file after SIGHUP.
[tinc]
/
src
/
protocol_edge.c
diff --git
a/src/protocol_edge.c
b/src/protocol_edge.c
index
57e202f
..
1dd68d5
100644
(file)
--- a/
src/protocol_edge.c
+++ b/
src/protocol_edge.c
@@
-21,7
+21,7
@@
#include "system.h"
#include "system.h"
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "conf.h"
#include "connection.h"
#include "edge.h"
#include "conf.h"
#include "connection.h"
#include "edge.h"
@@
-41,7
+41,7
@@
bool send_add_edge(connection_t *c, const edge_t *e) {
sockaddr2str(&e->address, &address, &port);
sockaddr2str(&e->address, &address, &port);
- x = send_request(c, "%d %x %s %s %s %s %
l
x %d", ADD_EDGE, rand(),
+ x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
e->from->name, e->to->name, address, port,
e->options, e->weight);
free(address);
e->from->name, e->to->name, address, port,
e->options, e->weight);
free(address);
@@
-50,7
+50,7
@@
bool send_add_edge(connection_t *c, const edge_t *e) {
return x;
}
return x;
}
-bool add_edge_h(connection_t *c) {
+bool add_edge_h(connection_t *c
, char *request
) {
edge_t *e;
node_t *from, *to;
char from_name[MAX_STRING_SIZE];
edge_t *e;
node_t *from, *to;
char from_name[MAX_STRING_SIZE];
@@
-58,10
+58,10
@@
bool add_edge_h(connection_t *c) {
char to_address[MAX_STRING_SIZE];
char to_port[MAX_STRING_SIZE];
sockaddr_t address;
char to_address[MAX_STRING_SIZE];
char to_port[MAX_STRING_SIZE];
sockaddr_t address;
-
long in
t options;
+
uint32_
t options;
int weight;
int weight;
- if(sscanf(
c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %l
x %d",
+ if(sscanf(
request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %
x %d",
from_name, to_name, to_address, to_port, &options, &weight) != 6) {
logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
c->hostname);
from_name, to_name, to_address, to_port, &options, &weight) != 6) {
logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
c->hostname);
@@
-70,19
+70,13
@@
bool add_edge_h(connection_t *c) {
/* Check if names are valid */
/* Check if names are valid */
- if(!check_id(from_name)) {
+ if(!check_id(from_name)
|| !check_id(to_name)
) {
logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
c->hostname, "invalid name");
return false;
}
logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
c->hostname, "invalid name");
return false;
}
- if(!check_id(to_name)) {
- logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
- c->hostname, "invalid name");
- return false;
- }
-
- if(seen_request(c->buffer))
+ if(seen_request(request))
return true;
/* Lookup nodes */
return true;
/* Lookup nodes */
@@
-139,6
+133,7
@@
bool add_edge_h(connection_t *c) {
} else if(from == myself) {
ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
"ADD_EDGE", c->name, c->hostname);
} else if(from == myself) {
ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
"ADD_EDGE", c->name, c->hostname);
+ contradicting_add_edge++;
e = new_edge();
e->from = from;
e->to = to;
e = new_edge();
e->from = from;
e->to = to;
@@
-158,7
+153,7
@@
bool add_edge_h(connection_t *c) {
/* Tell the rest about the new edge */
if(!tunnelserver)
/* Tell the rest about the new edge */
if(!tunnelserver)
- forward_request(c);
+ forward_request(c
, request
);
/* Run MST before or after we tell the rest? */
/* Run MST before or after we tell the rest? */
@@
-172,13
+167,13
@@
bool send_del_edge(connection_t *c, const edge_t *e) {
e->from->name, e->to->name);
}
e->from->name, e->to->name);
}
-bool del_edge_h(connection_t *c) {
+bool del_edge_h(connection_t *c
, char *request
) {
edge_t *e;
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
edge_t *e;
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
- if(sscanf(
c->buffer
, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
+ if(sscanf(
request
, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
c->hostname);
return false;
logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
c->hostname);
return false;
@@
-186,19
+181,13
@@
bool del_edge_h(connection_t *c) {
/* Check if names are valid */
/* Check if names are valid */
- if(!check_id(from_name)) {
- logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
- c->hostname, "invalid name");
- return false;
- }
-
- if(!check_id(to_name)) {
+ if(!check_id(from_name) || !check_id(to_name)) {
logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
c->hostname, "invalid name");
return false;
}
logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
c->hostname, "invalid name");
return false;
}
- if(seen_request(
c->buffer
))
+ if(seen_request(
request
))
return true;
/* Lookup nodes */
return true;
/* Lookup nodes */
@@
-241,6
+230,7
@@
bool del_edge_h(connection_t *c) {
if(e->from == myself) {
ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself",
"DEL_EDGE", c->name, c->hostname);
if(e->from == myself) {
ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself",
"DEL_EDGE", c->name, c->hostname);
+ contradicting_del_edge++;
send_add_edge(c, e); /* Send back a correction */
return true;
}
send_add_edge(c, e); /* Send back a correction */
return true;
}
@@
-248,7
+238,7
@@
bool del_edge_h(connection_t *c) {
/* Tell the rest about the deleted edge */
if(!tunnelserver)
/* Tell the rest about the deleted edge */
if(!tunnelserver)
- forward_request(c);
+ forward_request(c
, request
);
/* Delete the edge */
/* Delete the edge */