diff --git a/src/etcp_api.c b/src/etcp_api.c index 1cd2dfd0..89f17003 100644 --- a/src/etcp_api.c +++ b/src/etcp_api.c @@ -94,10 +94,10 @@ void etcp_int_recv(struct ll_queue* queue, void* arg) { struct UTUN_INSTANCE* inst = conn->instance; if (!inst) { queue_dgram_free(e); queue_entry_free(e); queue_resume_callback(queue); return; } if (inst->api_bindings.callbacks[id]) { - DEBUG_DEBUG(DEBUG_CATEGORY_DEBUG, "dispatch id=0x%02x conn=%s len=%zu", id, conn->log_name, e->len); + DEBUG_TRACE(DEBUG_CATEGORY_DEBUG, "dispatch id=0x%02x conn=%s len=%zu", id, conn->log_name, e->len); inst->api_bindings.callbacks[id](conn, e); } else if (inst->api_bindings.callbacks[0]) { - DEBUG_DEBUG(DEBUG_CATEGORY_DEBUG, "dispatch id=0x%02x (fallback) conn=%s len=%zu", id, conn->log_name, e->len); + DEBUG_TRACE(DEBUG_CATEGORY_DEBUG, "dispatch id=0x%02x (fallback) conn=%s len=%zu", id, conn->log_name, e->len); inst->api_bindings.callbacks[0](conn, e); } else { DEBUG_DEBUG(DEBUG_CATEGORY_DEBUG, "dispatch id=0x%02x NO CB conn=%s len=%zu — DROPPED", id, conn->log_name, e->len); queue_dgram_free(e); queue_entry_free(e); } queue_resume_callback(queue); diff --git a/src/etcp_connections.c b/src/etcp_connections.c index c317ca32..0039f868 100644 --- a/src/etcp_connections.c +++ b/src/etcp_connections.c @@ -1532,7 +1532,7 @@ void etcp_connections_read_callback_socket(socket_t sock, void* arg) { return; } - DEBUG_DEBUG(DEBUG_CATEGORY_DEBUG, "raw_recv on %s from=%s len=%zd", e_sock->name, sockaddr_storage_to_str(&addr).str, recv_len); + DEBUG_TRACE(DEBUG_CATEGORY_DEBUG, "raw_recv on %s from=%s len=%zd", e_sock->name, sockaddr_storage_to_str(&addr).str, recv_len); // DUMP: Show received packet content if (debug_should_output(DEBUG_LEVEL_DEBUG, DEBUG_CATEGORY_CRYPTO)) log_dump(DEBUG_LEVEL_DEBUG, DEBUG_CATEGORY_CRYPTO, "RECV in:", data, recv_len); diff --git a/src/nat_detection.c b/src/nat_detection.c index 149da5ef..1e8b1915 100644 --- a/src/nat_detection.c +++ b/src/nat_detection.c @@ -263,7 +263,7 @@ static void nat_detection_on_conn_down(struct ETCP_CONN* conn, void* arg) { static void nat_detection_new_conn_cbk(struct ETCP_CONN* conn, void* arg) { if (!conn || !conn->instance) return; struct NAT_DETECTION* nd = (struct NAT_DETECTION*)arg; - DEBUG_INFO(DEBUG_CATEGORY_BGP, "NAT detection set callbacks: %s", conn->log_name); + DEBUG_DEBUG(DEBUG_CATEGORY_NAT, "NAT detection set callbacks: %s", conn->log_name); etcp_conn_add_up_cbk(conn, nat_detection_on_conn_up, nd); etcp_conn_add_down_cbk(conn, nat_detection_on_conn_down, nd); } diff --git a/src/ntp_node_time.c b/src/ntp_node_time.c index f438b2b7..9526eedb 100644 --- a/src/ntp_node_time.c +++ b/src/ntp_node_time.c @@ -93,7 +93,7 @@ static struct NTP_NODE_PEER* add_peer(struct NTP_NODE_TIME* np, uint64_t node_id static void check_drift(uint64_t node_id, int64_t offset_us) { int64_t abs_us = offset_us < 0 ? -offset_us : offset_us; if (abs_us > NTP_NODE_DRIFT_ERROR_US) { - DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "NTP_node: clock drift >10s with node %012llx: %lldus", + DEBUG_WARN(DEBUG_CATEGORY_GENERAL, "NTP_node: clock drift >10s with node %012llx: %lldus", (unsigned long long)node_id, (long long)offset_us); } else if (abs_us > NTP_NODE_DRIFT_WARN_US) { DEBUG_WARN(DEBUG_CATEGORY_GENERAL, "NTP_node: clock drift >2s with node %012llx: %lldus", diff --git a/src/pkt_normalizer.c b/src/pkt_normalizer.c index 7843540e..2d652917 100644 --- a/src/pkt_normalizer.c +++ b/src/pkt_normalizer.c @@ -242,7 +242,7 @@ static void pn_send_to_etcp(struct PKTNORM* pn) { frag->ll.dgram_pool = pn->etcp->instance->data_pool; frag->ll.memlen = pn->etcp->instance->data_pool->object_size; - DEBUG_INFO(DEBUG_CATEGORY_NORMALIZER, "pn->etcp: size=%d memlen=%d frag_size=%d", frag->ll.len, frag->ll.memlen, pn->frag_size); + DEBUG_DEBUG(DEBUG_CATEGORY_NORMALIZER, "pn->etcp: size=%d memlen=%d frag_size=%d", frag->ll.len, frag->ll.memlen, pn->frag_size); if (debug_should_output(DEBUG_LEVEL_DEBUG, DEBUG_CATEGORY_DUMP)) log_dump(DEBUG_LEVEL_DEBUG, DEBUG_CATEGORY_DUMP, "NORM->ETCP", pn->data, frag->ll.len); queue_data_put(pn->etcp->input_queue, (struct ll_entry*)frag); diff --git a/tools/chatgui/transport/chat_core.c b/tools/chatgui/transport/chat_core.c index f12fe872..674311f5 100644 --- a/tools/chatgui/transport/chat_core.c +++ b/tools/chatgui/transport/chat_core.c @@ -828,31 +828,6 @@ void chat_core_connect_auto(uint64_t node_id, return; } - /* ── DB state diagnostics ── */ - DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "%s: auto_connect DIAG: looking for node=0x%016llx", CC_ID, (unsigned long long)node_id); - { - sqlite3_stmt* diag = NULL; - if (sqlite3_prepare_v2(g_cc.db, "SELECT COUNT(*) FROM node_addresses", -1, &diag, NULL) == SQLITE_OK) { - if (sqlite3_step(diag) == SQLITE_ROW) - DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "%s: auto_connect DIAG: node_addresses total=%d", CC_ID, sqlite3_column_int(diag, 0)); - sqlite3_finalize(diag); - } - if (sqlite3_prepare_v2(g_cc.db, "SELECT node_id, COUNT(*) FROM node_addresses GROUP BY node_id", -1, &diag, NULL) == SQLITE_OK) { - while (sqlite3_step(diag) == SQLITE_ROW) - DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "%s: auto_connect DIAG: node_addresses node=0x%016llx cnt=%d", - CC_ID, (unsigned long long)sqlite3_column_int64(diag, 0), sqlite3_column_int(diag, 1)); - sqlite3_finalize(diag); - } - if (sqlite3_prepare_v2(g_cc.db, "SELECT node_id, name FROM nodes WHERE node_id=?", -1, &diag, NULL) == SQLITE_OK) { - sqlite3_bind_int64(diag, 1, (sqlite3_int64)node_id); - if (sqlite3_step(diag) == SQLITE_ROW) - DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "%s: auto_connect DIAG: node found in nodes table name=%s", - CC_ID, sqlite3_column_text(diag, 1)); - else - DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "%s: auto_connect DIAG: node NOT found in nodes table", CC_ID); - sqlite3_finalize(diag); - } - } /* collect IPv4 addresses */ struct { uint8_t addr[4]; uint16_t port; } addrs[16]; int addr_count = 0;