Work around STATUS already being defined in the ESP32 header files.

diff --git a/src/protocol.c b/src/protocol.c
index 61a76081a20c1337a7ee830b481a82e8f9bcd72b..f0e911c1db8adf5232df49a9c415547795f9b4d2 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -33,7 +33,7 @@
 static bool (*request_handlers[NUM_REQUESTS])(meshlink_handle_t *, connection_t *, const char *) = {
        [ID] = id_h,
        [ACK] = ack_h,
-       [STATUS] = status_h,
+       [PSTATUS] = status_h,
        [ERROR] = error_h,
        [TERMREQ] = termreq_h,
        [PING] = ping_h,
@@ -51,7 +51,7 @@ static bool (*request_handlers[NUM_REQUESTS])(meshlink_handle_t *, connection_t
 static const char *request_name[NUM_REQUESTS] __attribute__((unused)) = {
        [ID] = "ID",
        [ACK] = "ACK",
-       [STATUS] = "STATUS",
+       [PSTATUS] = "STATUS",
        [ERROR] = "ERROR",
        [TERMREQ] = "TERMREQ",
        [PING] = "PING",

diff --git a/src/protocol.h b/src/protocol.h
index 02c22666c91f559d327d06fa7962baadba72324d..6381a6192f5ac31e1a2db8b9b5ad39bca160d6d5 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -38,7 +38,7 @@
 typedef enum request_t {
        ALL = -1, /* Guardian for allow_request */
        ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
-       STATUS, ERROR, TERMREQ,
+       PSTATUS, ERROR, TERMREQ,
        PING, PONG,
        ADD_SUBNET, DEL_SUBNET,
        ADD_EDGE, DEL_EDGE,