Allow log messages to be captured by tincctl.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index c91723b..d3eef21 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -61,7 +61,7 @@ bool id_h(connection_t *c, char *request) {
        char name[MAX_STRING_SIZE];
 
        if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "ID", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ID", c->name,
                           c->hostname);
                return false;
        }
@@ -78,7 +78,7 @@ bool id_h(connection_t *c, char *request) {
        /* Check if identity is a valid name */
 
        if(!check_id(name)) {
-               logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name,
                           c->hostname, "invalid name");
                return false;
        }
@@ -87,7 +87,7 @@ bool id_h(connection_t *c, char *request) {
 
        if(c->outgoing) {
                if(strcmp(c->name, name)) {
-                       logger(LOG_ERR, "Peer %s is %s instead of %s", c->hostname, name,
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s is %s instead of %s", c->hostname, name,
                                   c->name);
                        return false;
                }
@@ -100,7 +100,7 @@ bool id_h(connection_t *c, char *request) {
        /* Check if version matches */
 
        if(c->protocol_major != myself->connection->protocol_major) {
-               logger(LOG_ERR, "Peer %s (%s) uses incompatible version %d.%d",
+               logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) uses incompatible version %d.%d",
                           c->name, c->hostname, c->protocol_major, c->protocol_minor);
                return false;
        }
@@ -119,7 +119,7 @@ bool id_h(connection_t *c, char *request) {
                init_configuration(&c->config_tree);
 
                if(!read_connection_config(c)) {
-                       logger(LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname,
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname,
                                   c->name);
                        return false;
                }
@@ -183,9 +183,9 @@ bool send_metakey(connection_t *c) {
 
        cipher_set_key_from_rsa(&c->outcipher, key, len, true);
 
-       ifdebug(SCARY_THINGS) {
+       if(debug_level >= DEBUG_SCARY_THINGS) {
                bin2hex(key, hexkey, len);
-               logger(LOG_DEBUG, "Generated random meta key (unencrypted): %s", hexkey);
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Generated random meta key (unencrypted): %s", hexkey);
        }
 
        /* Encrypt the random data
@@ -196,7 +196,7 @@ bool send_metakey(connection_t *c) {
         */
 
        if(!rsa_public_encrypt(&c->rsa, key, len, enckey)) {
-               logger(LOG_ERR, "Error during encryption of meta key for %s (%s)", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error during encryption of meta key for %s (%s)", c->name, c->hostname);
                return false;
        }
 
@@ -223,7 +223,7 @@ bool metakey_h(connection_t *c, char *request) {
        char key[len];
 
        if(sscanf(request, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, hexkey) != 5) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "METAKEY", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "METAKEY", c->name, c->hostname);
                return false;
        }
 
@@ -234,31 +234,31 @@ bool metakey_h(connection_t *c, char *request) {
        /* Check if the length of the meta key is all right */
 
        if(inlen != len) {
-               logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong keylength");
+               logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong keylength");
                return false;
        }
 
        /* Decrypt the meta key */
 
        if(!rsa_private_decrypt(&myself->connection->rsa, enckey, len, key)) {
-               logger(LOG_ERR, "Error during decryption of meta key for %s (%s)", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error during decryption of meta key for %s (%s)", c->name, c->hostname);
                return false;
        }
 
-       ifdebug(SCARY_THINGS) {
+       if(debug_level >= DEBUG_SCARY_THINGS) {
                bin2hex(key, hexkey, len);
-               logger(LOG_DEBUG, "Received random meta key (unencrypted): %s", hexkey);
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Received random meta key (unencrypted): %s", hexkey);
        }
 
        /* Check and lookup cipher and digest algorithms */
 
        if(!cipher_open_by_nid(&c->incipher, cipher) || !cipher_set_key_from_rsa(&c->incipher, key, len, false)) {
-               logger(LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
                return false;
        }
 
        if(!digest_open_by_nid(&c->indigest, digest, -1)) {
-               logger(LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
                return false;
        }
 
@@ -296,7 +296,7 @@ bool challenge_h(connection_t *c, char *request) {
        char digest[digestlen];
 
        if(sscanf(request, "%*d " MAX_STRING, buffer) != 1) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "CHALLENGE", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHALLENGE", c->name, c->hostname);
                return false;
        }
 
@@ -307,7 +307,7 @@ bool challenge_h(connection_t *c, char *request) {
        /* Check if the length of the challenge is all right */
 
        if(inlen != len) {
-               logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge length");
+               logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge length");
                return false;
        }
 
@@ -330,7 +330,7 @@ bool chal_reply_h(connection_t *c, char *request) {
        char hishash[MAX_STRING_SIZE];
 
        if(sscanf(request, "%*d " MAX_STRING, hishash) != 1) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "CHAL_REPLY", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHAL_REPLY", c->name,
                           c->hostname);
                return false;
        }
@@ -342,7 +342,7 @@ bool chal_reply_h(connection_t *c, char *request) {
        /* Check if the length of the hash is all right */
 
        if(inlen != digest_length(&c->outdigest)) {
-               logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply length");
+               logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply length");
                return false;
        }
 
@@ -350,7 +350,7 @@ bool chal_reply_h(connection_t *c, char *request) {
        /* Verify the hash */
 
        if(!digest_verify(&c->outdigest, c->hischallenge, rsa_size(&c->rsa), hishash)) {
-               logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply");
+               logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply");
                return false;
        }
 
@@ -451,16 +451,16 @@ static bool upgrade_h(connection_t *c, char *request) {
        char pubkey[MAX_STRING_SIZE];
 
        if(sscanf(request, "%*d " MAX_STRING, pubkey) != 1) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name, c->hostname);
                return false;
        }
 
        if(ecdsa_active(&c->ecdsa) || read_ecdsa_public_key(c)) {
-               logger(LOG_INFO, "Already have ECDSA public key from %s (%s), not upgrading.", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_INFO, "Already have ECDSA public key from %s (%s), not upgrading.", c->name, c->hostname);
                return false;
        }
 
-       logger(LOG_INFO, "Got ECDSA public key from %s (%s), upgrading!", c->name, c->hostname);
+       logger(DEBUG_ALWAYS, LOG_INFO, "Got ECDSA public key from %s (%s), upgrading!", c->name, c->hostname);
        append_config_file(c->name, "ECDSAPublicKey", pubkey);
        c->allow_request = TERMREQ;
        return send_termreq(c);
@@ -478,7 +478,7 @@ bool ack_h(connection_t *c, char *request) {
        bool choice;
 
        if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &weight, &options) != 3) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name,
                           c->hostname);
                return false;
        }
@@ -494,11 +494,11 @@ bool ack_h(connection_t *c, char *request) {
        } else {
                if(n->connection) {
                        /* Oh dear, we already have a connection to this node. */
-                       ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname);
+                       logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname);
 
                        if(n->connection->outgoing) {
                                if(c->outgoing)
-                                       logger(LOG_WARNING, "Two outgoing connections to the same node!");
+                                       logger(DEBUG_ALWAYS, LOG_WARNING, "Two outgoing connections to the same node!");
                                else
                                        c->outgoing = n->connection->outgoing;
 
@@ -540,7 +540,7 @@ bool ack_h(connection_t *c, char *request) {
        c->allow_request = ALL;
        c->status.active = true;
 
-       ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection with %s (%s) activated", c->name,
+       logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection with %s (%s) activated", c->name,
                           c->hostname);
 
        /* Send him everything we know */