Ensure everything compiles with -Wall without giving warnings.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 634199656e4f1cd02e2e5871f07be72cd5421eff..a279833bd8799a674ba47fac7cb502217f870d95 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,6 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,18 +22,16 @@
 #include "conf.h"
 #include "connection.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "protocol.h"
 #include "utils.h"
 #include "xalloc.h"
 
-bool tunnelserver = false;
-bool experimental = true;
-
 /* Jumptable for the request handlers */
 
-static bool (*request_handlers[])(connection_t *, const char *) = {
-               id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+static bool (*request_handlers[])(meshlink_handle_t *, connection_t *, const char *) = {
+               id_h, NULL, NULL, NULL /* metakey_h, challenge_h, chal_reply_h */, ack_h,
                status_h, error_h, termreq_h,
                ping_h, pong_h,
                NULL, NULL, //add_subnet_h, del_subnet_h,
@@ -68,7 +65,7 @@ bool check_id(const char *id) {
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-bool send_request(connection_t *c, const char *format, ...) {
+bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format, ...) {
        va_list args;
        char request[MAXBUFSIZE];
        int len;
@@ -91,14 +88,14 @@ bool send_request(connection_t *c, const char *format, ...) {
 
        request[len++] = '\n';
 
-       if(c == everyone) {
-               broadcast_meta(NULL, request, len);
+       if(c == mesh->everyone) {
+               broadcast_meta(mesh, NULL, request, len);
                return true;
        } else
-               return send_meta(c, request, len);
+               return send_meta(mesh, c, request, len);
 }
 
-void forward_request(connection_t *from, const char *request) {
+void forward_request(meshlink_handle_t *mesh, connection_t *from, const char *request) {
        logger(DEBUG_META, LOG_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
 
        // Create a temporary newline-terminated copy of the request
@@ -106,11 +103,11 @@ void forward_request(connection_t *from, const char *request) {
        char tmp[len + 1];
        memcpy(tmp, request, len);
        tmp[len] = '\n';
-       broadcast_meta(from, tmp, sizeof tmp);
+       broadcast_meta(mesh, from, tmp, sizeof tmp);
 }
 
-bool receive_request(connection_t *c, const char *request) {
-       if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
+bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *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)) {
@@ -139,7 +136,7 @@ bool receive_request(connection_t *c, const char *request) {
                        return false;
                }
 
-               if(!request_handlers[reqno](c, request)) {
+               if(!request_handlers[reqno](mesh, c, request)) {
                        /* Something went wrong. Probably scriptkiddies. Terminate. */
 
                        logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
@@ -159,18 +156,19 @@ static int past_request_compare(const past_request_t *a, const past_request_t *b
 
 static void free_past_request(past_request_t *r) {
        if(r->request)
-               free((char *)r->request);
+               free((void *)r->request);
 
        free(r);
 }
 
 static timeout_t past_request_timeout;
 
-static void age_past_requests(void *data) {
+static void age_past_requests(event_loop_t *loop, void *data) {
+       meshlink_handle_t *mesh = loop->data;
        int left = 0, deleted = 0;
 
        for splay_each(past_request_t, p, past_request_tree) {
-               if(p->firstseen + pinginterval <= now.tv_sec)
+               if(p->firstseen + mesh->pinginterval <= mesh->loop.now.tv_sec)
                        splay_delete_node(past_request_tree, node), deleted++;
                else
                        left++;
@@ -180,10 +178,10 @@ static void age_past_requests(void *data) {
                logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
 
        if(left)
-               timeout_set(&past_request_timeout, &(struct timeval){10, rand() % 100000});
+               timeout_set(&mesh->loop, &past_request_timeout, &(struct timeval){10, rand() % 100000});
 }
 
-bool seen_request(const char *request) {
+bool seen_request(meshlink_handle_t *mesh, const char *request) {
        past_request_t *new, p = {NULL};
 
        p.request = request;
@@ -194,19 +192,20 @@ bool seen_request(const char *request) {
        } else {
                new = xmalloc(sizeof *new);
                new->request = xstrdup(request);
-               new->firstseen = now.tv_sec;
+               new->firstseen = mesh->loop.now.tv_sec;
                splay_insert(past_request_tree, new);
-               timeout_add(&past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
+               timeout_add(&mesh->loop, &past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
                return false;
        }
 }
 
-void init_requests(void) {
+// TODO: move past_request_tree to meshlink_handle_t
+void init_requests(meshlink_handle_t *mesh) {
        past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
 }
 
-void exit_requests(void) {
+void exit_requests(meshlink_handle_t *mesh) {
        splay_delete_tree(past_request_tree);
 
-       timeout_del(&past_request_timeout);
+       timeout_del(&mesh->loop, &past_request_timeout);
 }