Don't assume sa.sa_family is a short int.

[tinc] / src / protocol_subnet.c

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index 6f9e626..06dafbc 100644 (file)
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -1,7 +1,7 @@
 /*
     protocol_subnet.c -- handle the meta-protocol, subnets
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
 
     This program is free software; you can redistribute it and/or modify
@@ -41,14 +41,14 @@ bool send_add_subnet(connection_t *c, const subnet_t *subnet) {
        return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), subnet->owner->name, netstr);
 }
 
-bool add_subnet_h(connection_t *c, char *request) {
+bool add_subnet_h(connection_t *c, const char *request) {
        char subnetstr[MAX_STRING_SIZE];
        char name[MAX_STRING_SIZE];
        node_t *owner;
        subnet_t s = {NULL}, *new, *old;
 
        if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
                           c->hostname);
                return false;
        }
@@ -56,7 +56,7 @@ bool add_subnet_h(connection_t *c, char *request) {
        /* Check if owner name is valid */
 
        if(!check_id(name)) {
-               logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
                           c->hostname, "invalid name");
                return false;
        }
@@ -64,7 +64,7 @@ bool add_subnet_h(connection_t *c, char *request) {
        /* Check if subnet string is valid */
 
        if(!str2net(&s, subnetstr)) {
-               logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
                           c->hostname, "invalid subnet string");
                return false;
        }
@@ -78,7 +78,7 @@ bool add_subnet_h(connection_t *c, char *request) {
 
        if(tunnelserver && owner != myself && owner != c->node) {
                /* in case of tunnelserver, ignore indirect subnet registrations */
-               ifdebug(PROTOCOL) logger(LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s",
+               logger(DEBUG_PROTOCOL, LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s",
                                   "ADD_SUBNET", c->name, c->hostname, subnetstr);
                return true;
        }
@@ -97,7 +97,7 @@ bool add_subnet_h(connection_t *c, char *request) {
        /* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
 
        if(owner == myself) {
-               ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself",
+               logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
                                   "ADD_SUBNET", c->name, c->hostname);
                s.owner = myself;
                send_del_subnet(c, &s);
@@ -107,7 +107,7 @@ bool add_subnet_h(connection_t *c, char *request) {
        /* In tunnel server mode, we should already know all allowed subnets */
 
        if(tunnelserver) {
-               logger(LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
                                "ADD_SUBNET", c->name, c->hostname, subnetstr);
                return true;
        }
@@ -115,7 +115,7 @@ bool add_subnet_h(connection_t *c, char *request) {
        /* Ignore if strictsubnets is true, but forward it to others */
 
        if(strictsubnets) {
-               logger(LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Ignoring unauthorized %s from %s (%s): %s",
                                "ADD_SUBNET", c->name, c->hostname, subnetstr);
                forward_request(c, request);
                return true;
@@ -151,14 +151,14 @@ bool send_del_subnet(connection_t *c, const subnet_t *s) {
        return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), s->owner->name, netstr);
 }
 
-bool del_subnet_h(connection_t *c, char *request) {
+bool del_subnet_h(connection_t *c, const char *request) {
        char subnetstr[MAX_STRING_SIZE];
        char name[MAX_STRING_SIZE];
        node_t *owner;
        subnet_t s = {NULL}, *find;
 
        if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
                           c->hostname);
                return false;
        }
@@ -166,7 +166,7 @@ bool del_subnet_h(connection_t *c, char *request) {
        /* Check if owner name is valid */
 
        if(!check_id(name)) {
-               logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
                           c->hostname, "invalid name");
                return false;
        }
@@ -174,7 +174,7 @@ bool del_subnet_h(connection_t *c, char *request) {
        /* Check if subnet string is valid */
 
        if(!str2net(&s, subnetstr)) {
-               logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
                           c->hostname, "invalid subnet string");
                return false;
        }
@@ -188,13 +188,13 @@ bool del_subnet_h(connection_t *c, char *request) {
 
        if(tunnelserver && owner != myself && owner != c->node) {
                /* in case of tunnelserver, ignore indirect subnet deletion */
-               ifdebug(PROTOCOL) logger(LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s",
-                                  "DEL_SUBNET", c->name, c->hostname, subnetstr);
+               logger(DEBUG_PROTOCOL, LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s",
+                                 "DEL_SUBNET", c->name, c->hostname, subnetstr);
                return true;
        }
 
        if(!owner) {
-               ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for %s which is not in our node tree",
+               logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for %s which is not in our node tree",
                                   "DEL_SUBNET", c->name, c->hostname, name);
                return true;
        }
@@ -206,7 +206,7 @@ bool del_subnet_h(connection_t *c, char *request) {
        find = lookup_subnet(owner, &s);
 
        if(!find) {
-               ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for %s which does not appear in his subnet tree",
+               logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for %s which does not appear in his subnet tree",
                                   "DEL_SUBNET", c->name, c->hostname, name);
                if(strictsubnets)
                        forward_request(c, request);
@@ -216,7 +216,7 @@ bool del_subnet_h(connection_t *c, char *request) {
        /* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
 
        if(owner == myself) {
-               ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself",
+               logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
                                   "DEL_SUBNET", c->name, c->hostname);
                send_add_subnet(c, find);
                return true;