Remove some debugging messages.

diff --git a/src/net.c b/src/net.c
index 8cf4a765673b755a5d87dfd0a79ab272e63a4718..ba8bcca789121a338a943cfc3bddb31acd0ac686 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -319,7 +319,6 @@ int reload_configuration(void) {
 
                for(node = myself->subnet_tree->head; node; node = node->next) {
                        subnet_t *subnet = node->data;
-                       logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d", subnet, (int)subnet->expires);
                        if(!subnet->expires)
                                subnet->expires = 1;
                }
@@ -331,13 +330,11 @@ int reload_configuration(void) {
                                continue;
 
                        if((s2 = lookup_subnet(myself, subnet))) {
-                               logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d", s2, (int)s2->expires);
                                if(s2->expires == 1)
                                        s2->expires = 0;
 
                                free_subnet(subnet);
                        } else {
-                               logger(DEBUG_ALWAYS, LOG_DEBUG, "read new subnet %p", subnet);
                                subnet_add(myself, subnet);
                                send_add_subnet(everyone, subnet);
                                subnet_update(myself, subnet, true);
@@ -350,7 +347,6 @@ int reload_configuration(void) {
                        next = node->next;
                        subnet_t *subnet = node->data;
                        if(subnet->expires == 1) {
-                               logger(DEBUG_ALWAYS, LOG_DEBUG, "removed subnet %p", subnet);
                                send_del_subnet(everyone, subnet);
                                subnet_update(myself, subnet, false);
                                subnet_del(myself, subnet);

diff --git a/src/protocol_key.c b/src/protocol_key.c
index f9afb4fe42e856b40702d967813398c828db624a..fbd3c16f570ad27161717ee26b7b5f5d9bf63e2f 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -108,7 +108,7 @@ static bool send_initial_sptps_data(void *handle, uint8_t type, const char *data
 bool send_req_key(node_t *to) {
        if(to->status.sptps) {
                if(!node_read_ecdsa_public_key(to)) {
-                       logger(DEBUG_ALWAYS, LOG_DEBUG, "No ECDSA key known for %s (%s)", to->name, to->hostname);
+                       logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", to->name, to->hostname);
                        send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, to->name, REQ_PUBKEY);
                        return true;
                }
@@ -136,7 +136,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 
                case ANS_PUBKEY: {
                        if(node_read_ecdsa_public_key(from)) {
-                               logger(DEBUG_ALWAYS, LOG_WARNING, "Got ANS_PUBKEY from %s (%s) even though we already have his pubkey", from->name, from->hostname);
+                               logger(DEBUG_PROTOCOL, LOG_WARNING, "Got ANS_PUBKEY from %s (%s) even though we already have his pubkey", from->name, from->hostname);
                                return true;
                        }
 
@@ -146,14 +146,14 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
                                return true;
                        }
 
-                       logger(DEBUG_ALWAYS, LOG_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
+                       logger(DEBUG_PROTOCOL, LOG_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
                        append_config_file(from->name, "ECDSAPublicKey", pubkey);
                        return true;
                }
 
                case REQ_KEY: {
                        if(!node_read_ecdsa_public_key(from)) {
-                               logger(DEBUG_ALWAYS, LOG_DEBUG, "No ECDSA key known for %s (%s)", from->name, from->hostname);
+                               logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", from->name, from->hostname);
                                send_request(from->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, from->name, REQ_PUBKEY);
                                return true;
                        }
@@ -230,7 +230,7 @@ bool req_key_h(connection_t *c, const char *request) {
                        return true;
 
                if(!to->status.reachable) {
-                       logger(DEBUG_ALWAYS, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
+                       logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
                                "REQ_KEY", c->name, c->hostname, to_name);
                        return true;
                }