projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5cddf5e
)
Remove code duplication when checking ADD_EDGE/DEL_EDGE messages.
author
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 11 Oct 2009 11:54:05 +0000
(13:54 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 11 Oct 2009 11:54:05 +0000
(13:54 +0200)
src/protocol_edge.c
patch
|
blob
|
history
diff --git
a/src/protocol_edge.c
b/src/protocol_edge.c
index
57e202f
..
9d43922
100644
(file)
--- a/
src/protocol_edge.c
+++ b/
src/protocol_edge.c
@@
-70,13
+70,7
@@
bool add_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", "ADD_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", "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;
@@
-186,13
+180,7
@@
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;