Remove logging when compiled with -DNDEBUG.

[meshlink-tiny] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 0fbb52069e30a1970c81461d21e54334ee121580..9218f967f26833ed0ebd369591c4cd16e66fff5f 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -34,41 +34,23 @@ 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;
 }
 
 bool send_error(meshlink_handle_t *mesh, connection_t *c, request_error_t err, const char *message) {
-       send_request(mesh, c, NULL, "%d %d %s", ERROR, err, message);
+       send_request(mesh, c, "%d %d %s", ERROR, err, message);
        flush_meta(mesh, c);
        return false;
 }
 
 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;
 }
 
@@ -88,7 +67,7 @@ bool send_ping(meshlink_handle_t *mesh, connection_t *c) {
        c->status.pinged = true;
        c->last_ping_time = mesh->loop.now.tv_sec;
 
-       return send_request(mesh, c, NULL, "%d", PING);
+       return send_request(mesh, c, "%d", PING);
 }
 
 bool ping_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
@@ -101,7 +80,7 @@ bool ping_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 }
 
 bool send_pong(meshlink_handle_t *mesh, connection_t *c) {
-       return send_request(mesh, c, NULL, "%d", PONG);
+       return send_request(mesh, c, "%d", PONG);
 }
 
 bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
@@ -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;
-}