From 51726faeea70c12caf2540d62dbdc135c5dfaf18 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 20 Jun 2021 23:17:24 +0200 Subject: [PATCH] Remove logging when compiled with -DNDEBUG. Also fix compiler warnings generated when logger() is #defined to do nothing. --- src/connection.c | 1 + src/logger.c | 2 + src/logger.h | 4 + src/protocol.c | 2 +- src/protocol.h | 1 - src/protocol_edge.c | 295 +------------------------------------------- src/protocol_key.c | 22 +--- src/protocol_misc.c | 50 +------- 8 files changed, 21 insertions(+), 356 deletions(-) diff --git a/src/connection.c b/src/connection.c index 97e3918..fd95ce9 100644 --- a/src/connection.c +++ b/src/connection.c @@ -30,6 +30,7 @@ void init_connections(meshlink_handle_t *mesh) { assert(!mesh->connection); + mesh->connection = NULL; } void exit_connections(meshlink_handle_t *mesh) { diff --git a/src/logger.c b/src/logger.c index 78d629e..d4da403 100644 --- a/src/logger.c +++ b/src/logger.c @@ -23,6 +23,7 @@ #include "meshlink_internal.h" #include "sptps.h" +#ifndef logger // TODO: refactor logging code to use a meshlink_handle_t *. void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *format, ...) { assert(format); @@ -54,3 +55,4 @@ void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *for global_log_cb(NULL, level, message); } } +#endif \ No newline at end of file diff --git a/src/logger.h b/src/logger.h index b9269f0..e0d99e6 100644 --- a/src/logger.h +++ b/src/logger.h @@ -22,6 +22,10 @@ #include "meshlink_internal.h" +#ifdef NDEBUG +#define logger(mesh, ...) do {(void)mesh;} while(0) +#else void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *format, ...) __attribute__((__format__(printf, 3, 4))); +#endif #endif diff --git a/src/protocol.c b/src/protocol.c index c69d7a1..25419c0 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -47,7 +47,7 @@ static bool (*request_handlers[NUM_REQUESTS])(meshlink_handle_t *, connection_t /* Request names */ -static const char *request_name[NUM_REQUESTS] = { +static const char *request_name[NUM_REQUESTS] __attribute__((unused)) = { [ID] = "ID", [ACK] = "ACK", [STATUS] = "STATUS", diff --git a/src/protocol.h b/src/protocol.h index 215840d..ed7e5df 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -99,6 +99,5 @@ bool del_edge_h(struct meshlink_handle *mesh, struct connection_t *, const char bool key_changed_h(struct meshlink_handle *mesh, struct connection_t *, const char *); bool req_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *); bool ans_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *); -bool tcppacket_h(struct meshlink_handle *mesh, struct connection_t *, const char *); #endif diff --git a/src/protocol_edge.c b/src/protocol_edge.c index 18615ce..744ae38 100644 --- a/src/protocol_edge.c +++ b/src/protocol_edge.c @@ -52,308 +52,19 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { (void)mesh; (void)c; -#if 0 - edge_t *e; - node_t *from, *to; - char from_name[MAX_STRING_SIZE]; - int from_devclass; - char from_submesh_name[MAX_STRING_SIZE] = ""; - char to_name[MAX_STRING_SIZE]; - char to_address[MAX_STRING_SIZE]; - char to_port[MAX_STRING_SIZE]; - int to_devclass; - char to_submesh_name[MAX_STRING_SIZE] = ""; - sockaddr_t address; - int weight; - int contradictions = 0; - uint32_t session_id = 0; - submesh_t *s = NULL; + (void)request; - if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %d "MAX_STRING" %*x %d %d %x", - from_name, &from_devclass, from_submesh_name, to_name, to_address, to_port, &to_devclass, to_submesh_name, - &weight, &contradictions, &session_id) < 9) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ADD_EDGE", c->name); - return false; - } - - // Check if devclasses are valid - - if(from_devclass < 0 || from_devclass >= DEV_CLASS_COUNT) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "from devclass invalid"); - return false; - } - - if(to_devclass < 0 || to_devclass >= DEV_CLASS_COUNT) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "to devclass invalid"); - return false; - } - - if(0 == strcmp(from_submesh_name, "")) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "invalid submesh id"); - return false; - } - - if(0 == strcmp(to_submesh_name, "")) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "invalid submesh id"); - return false; - } - - if(seen_request(mesh, request)) { - return true; - } - - /* Lookup nodes */ - - from = lookup_node(mesh, from_name); - to = lookup_node(mesh, to_name); - - if(!from) { - from = new_node(); - from->status.dirty = true; - from->status.blacklisted = false; - from->name = xstrdup(from_name); - from->devclass = from_devclass; - - from->submesh = NULL; - - if(0 != strcmp(from_submesh_name, CORE_MESH)) { - if(!(from->submesh = lookup_or_create_submesh(mesh, from_submesh_name))) { - return false; - } - } - - node_add(mesh, from); - } - - if(contradictions > 50) { - handle_duplicate_node(mesh, from); - } - - from->devclass = from_devclass; - - if(!from->session_id) { - from->session_id = session_id; - } - - if(!to) { - to = new_node(); - to->status.dirty = true; - to->status.blacklisted = false; - to->name = xstrdup(to_name); - to->devclass = to_devclass; - - to->submesh = NULL; - - if(0 != strcmp(to_submesh_name, CORE_MESH)) { - if(!(to->submesh = lookup_or_create_submesh(mesh, to_submesh_name))) { - return false; - - } - } - - node_add(mesh, to); - } - - to->devclass = to_devclass; - - /* Convert addresses */ - - address = str2sockaddr(to_address, to_port); - - /* Check if edge already exists */ - - e = lookup_edge(from, to); - - if(e) { - if(e->weight != weight || e->session_id != session_id || sockaddrcmp(&e->address, &address)) { - if(from == mesh->self) { - /* The sender has outdated information, we own this edge to send a correction back */ - logger(mesh, MESHLINK_DEBUG, "Got %s from %s for ourself which does not match existing entry", "ADD_EDGE", c->name); - send_add_edge(mesh, c, e, 0); - return true; - } else if(to == mesh->self && from != c->node && from->status.reachable) { - /* The sender has outdated information, someone else owns this node so they will correct */ - logger(mesh, MESHLINK_DEBUG, "Got %s from %s which does not match existing entry, ignoring", "ADD_EDGE", c->name); - return true; - } else { - /* Might be outdated, but update our information, another node will send a correction if necessary */ - logger(mesh, MESHLINK_DEBUG, "Got %s from %s which does not match existing entry", "ADD_EDGE", c->name); - edge_del(mesh, e); - } - } else { - return true; - } - } else if(from == mesh->self) { - logger(mesh, MESHLINK_WARNING, "Got %s from %s for ourself which does not exist", "ADD_EDGE", c->name); - mesh->contradicting_add_edge++; - e = new_edge(); - e->from = from; - e->to = to; - e->session_id = session_id; - send_del_edge(mesh, c, e, mesh->contradicting_add_edge); - free_edge(e); - return true; - } - - e = new_edge(); - e->from = from; - e->to = to; - e->address = address; - e->weight = weight; - e->session_id = session_id; - edge_add(mesh, e); - - /* Run MST before or after we tell the rest? */ - - graph(mesh); - - if(e->from->submesh && e->to->submesh && (e->from->submesh != e->to->submesh)) { - logger(mesh, MESHLINK_ERROR, "Dropping add edge ( %s to %s )", e->from->submesh->name, e->to->submesh->name); - return false; - } - - if(e->from->submesh) { - s = e->from->submesh; - } else { - s = e->to->submesh; - } - - /* Tell the rest about the new edge */ - - forward_request(mesh, c, s, request); -#endif - - /* TODO: Check if this is an edge we would own */ + /* TODO: Check if this is an edge we would own. */ return true; } -#if 0 -bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, int contradictions) { - submesh_t *s = NULL; - - if(c->node && c->node->submesh) { - if(!submesh_allows_node(e->from->submesh, c->node)) { - return true; - } - - if(!submesh_allows_node(e->to->submesh, c->node)) { - return true; - } - } - - if(e->from->submesh && e->to->submesh && (e->from->submesh != e->to->submesh)) { - return true; - } - - - if(e->from->submesh) { - s = e->from->submesh; - } else { - s = e->to->submesh; - } - - return send_request(mesh, c, s, "%d %x %s %s %d %x", DEL_EDGE, prng(mesh, UINT_MAX), - e->from->name, e->to->name, contradictions, e->session_id); -} -#endif - bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { assert(request); assert(*request); (void)mesh; (void)c; -#if 0 - edge_t *e; - char from_name[MAX_STRING_SIZE]; - char to_name[MAX_STRING_SIZE]; - node_t *from, *to; - int contradictions = 0; - uint32_t session_id = 0; - submesh_t *s = NULL; - - if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" %d %x", from_name, to_name, &contradictions, &session_id) < 2) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "DEL_EDGE", c->name); - return false; - } - - if(seen_request(mesh, request)) { - return true; - } - - /* Lookup nodes */ - - from = lookup_node(mesh, from_name); - to = lookup_node(mesh, to_name); - - if(!from) { - logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree", "DEL_EDGE", c->name); - return true; - } - - if(!to) { - logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree", "DEL_EDGE", c->name); - return true; - } - - if(contradictions > 50) { - handle_duplicate_node(mesh, from); - } - - /* Check if edge exists */ - - e = lookup_edge(from, to); - - if(!e) { - logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree", "DEL_EDGE", c->name); - return true; - } - - if(e->from == mesh->self) { - logger(mesh, MESHLINK_WARNING, "Got %s from %s for ourself", "DEL_EDGE", c->name); - mesh->contradicting_del_edge++; - send_add_edge(mesh, c, e, mesh->contradicting_del_edge); /* Send back a correction */ - return true; - } - - /* Tell the rest about the deleted edge */ - - - if(!e->from->submesh || !e->to->submesh || (e->from->submesh == e->to->submesh)) { - if(e->from->submesh) { - s = e->from->submesh; - } else { - s = e->to->submesh; - } - - /* Tell the rest about the deleted edge */ - forward_request(mesh, c, s, request); - - } else { - logger(mesh, MESHLINK_ERROR, "Dropping del edge ( %s to %s )", e->from->submesh->name, e->to->submesh->name); - return false; - } - - /* Delete the edge */ - - edge_del(mesh, e); - - /* Run MST before or after we tell the rest? */ - - graph(mesh); - - /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */ - - if(!to->status.reachable) { - e = lookup_edge(to, mesh->self); - - if(e) { - send_del_edge(mesh, mesh->everyone, e, 0); - edge_del(mesh, e); - } - } - -#endif + (void)request; /* TODO: Check if this is an edge we would own. */ return true; diff --git a/src/protocol_key.c b/src/protocol_key.c index c2d6036..6ee2875 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.c @@ -34,24 +34,9 @@ static const int req_key_timeout = 2; bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { - assert(request); - assert(*request); - - char name[MAX_STRING_SIZE]; - node_t *n; - - if(sscanf(request, "%*d %*x " MAX_STRING, name) != 1) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "KEY_CHANGED", c->name); - return false; - } - - n = lookup_node(mesh, name); - - if(!n) { - logger(mesh, MESHLINK_ERROR, "Got %s from %s origin %s which does not exist", "KEY_CHANGED", c->name, name); - return true; - } - + (void)mesh; + (void)c; + (void)request; return true; } @@ -346,6 +331,7 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { assert(request); assert(*request); + (void)c; char from_name[MAX_STRING_SIZE]; char to_name[MAX_STRING_SIZE]; diff --git a/src/protocol_misc.c b/src/protocol_misc.c index 145dde7..9218f96 100644 --- a/src/protocol_misc.c +++ b/src/protocol_misc.c @@ -34,18 +34,9 @@ int maxoutbufsize = 0; /* Status and error notification routines */ bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { - assert(request); - assert(*request); - - int statusno; - char statusstring[MAX_STRING_SIZE]; - - if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "STATUS", c->name); - return false; - } - - logger(mesh, MESHLINK_INFO, "Status message from %s: %d: %s", c->name, statusno, statusstring); + (void)mesh; + (void)c; + (void)request; return true; } @@ -57,18 +48,9 @@ bool send_error(meshlink_handle_t *mesh, connection_t *c, request_error_t err, c } bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { - assert(request); - assert(*request); - - int err; - char errorstring[MAX_STRING_SIZE]; - - if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ERROR", c->name); - return false; - } - - logger(mesh, MESHLINK_INFO, "Error message from %s: %d: %s", c->name, err, errorstring); + (void)mesh; + (void)c; + (void)request; return false; } @@ -78,9 +60,6 @@ bool termreq_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { (void)c; (void)request; - assert(request); - assert(*request); - return false; } @@ -121,20 +100,3 @@ bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { return true; } - -/* Sending and receiving packets via TCP */ - -bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { - assert(request); - assert(*request); - - short int len; - - if(sscanf(request, "%*d %hd", &len) != 1) { - logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "PACKET", c->name); - return false; - } - - // This should never happen with MeshLink. - return false; -} -- 2.39.5