Don't use assert() to check the results of pthread_*() calls.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 482808a7e71885c6cf37d24ce42444f9d18c8aac..e2842abe5c7665ab341b1af86213c3f4f981b04b 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -42,7 +42,7 @@ static bool (*request_handlers[])(meshlink_handle_t *, connection_t *, const cha
 
 /* Request names */
 
-static char (*request_name[]) = {
+static const char *request_name[] = {
        "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
        "STATUS", "ERROR", "TERMREQ",
        "PING", "PONG",
@@ -66,7 +66,7 @@ bool check_id(const char *id) {
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-bool send_request(meshlink_handle_t *mesh, connection_t *c, submesh_t *s, const char *format, ...) {
+bool send_request(meshlink_handle_t *mesh, connection_t *c, const submesh_t *s, const char *format, ...) {
        assert(c);
        assert(format);
        assert(*format);
@@ -106,7 +106,7 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, submesh_t *s, const
        }
 }
 
-void forward_request(meshlink_handle_t *mesh, connection_t *from, submesh_t *s, const char *request) {
+void forward_request(meshlink_handle_t *mesh, connection_t *from, const submesh_t *s, const char *request) {
        assert(from);
        assert(request);
        assert(*request);
@@ -130,22 +130,6 @@ void forward_request(meshlink_handle_t *mesh, connection_t *from, submesh_t *s,
 bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        assert(request);
 
-       if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
-               if(!request[0] || request[0] == '\r') {
-                       return true;
-               }
-
-               if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
-                       if(!strncmp(request + 9, "200", 3)) {
-                               logger(mesh, MESHLINK_DEBUG, "Proxy request granted");
-                               return true;
-                       } else {
-                               logger(mesh, MESHLINK_DEBUG, "Proxy request rejected: %s", request + 9);
-                               return false;
-                       }
-               }
-       }
-
        int reqno = atoi(request);
 
        if(reqno || *request == '0') {
@@ -196,7 +180,7 @@ static void age_past_requests(event_loop_t *loop, void *data) {
 
        for splay_each(past_request_t, p, mesh->past_request_tree) {
                if(p->firstseen + request_timeout <= mesh->loop.now.tv_sec) {
-                       splay_delete_node(mesh->past_request_tree, node), deleted++;
+                       splay_delete_node(mesh->past_request_tree, splay_node), deleted++;
                } else {
                        left++;
                }