sparse fixup: warning: Using plain integer as NULL pointer

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 02f2841..fd90894 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -29,6 +29,7 @@
 #include "xalloc.h"
 
 bool tunnelserver = false;
+bool strictsubnets = false;
 
 /* Jumptable for the request handlers */
 
@@ -102,6 +103,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 }
 
 void forward_request(connection_t *from, char *request) {
+       /* Note: request is not zero terminated anymore after a call to this function! */
        ifdebug(PROTOCOL) {
                ifdebug(META)
                        logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s",
@@ -112,7 +114,7 @@ void forward_request(connection_t *from, char *request) {
        }
 
        int len = strlen(request);
-       request[len] = '\n';
+       request[len++] = '\n';
        broadcast_meta(from, request, len);
 }
 
@@ -176,7 +178,7 @@ static void free_past_request(past_request_t *r) {
 static struct event past_request_event;
 
 bool seen_request(char *request) {
-       past_request_t *new, p = {0};
+       past_request_t *new, p = {NULL};
 
        p.request = request;
 
@@ -193,7 +195,7 @@ bool seen_request(char *request) {
        }
 }
 
-void age_past_requests(int fd, short events, void *data) {
+static void age_past_requests(int fd, short events, void *data) {
        splay_node_t *node, *next;
        past_request_t *p;
        int left = 0, deleted = 0;
@@ -226,5 +228,6 @@ void init_requests(void) {
 void exit_requests(void) {
        splay_delete_tree(past_request_tree);
 
-       event_del(&past_request_event);
+       if(timeout_initialized(&past_request_event))
+               event_del(&past_request_event);
 }