aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Nardi <12729895+IvanNardi@users.noreply.github.com>2021-10-06 18:32:15 +0200
committerGitHub <noreply@github.com>2021-10-06 18:32:15 +0200
commit2dfc478ad476bdb3f774fe83ad90ccd6aa4ff7c3 (patch)
tree863f3fc094c5ce9ec3d6d56820d3e499e274e59d
parent944e8ed105d1847f26b66059802c970735678139 (diff)
Fix compilation with clang-13 or if some debug macros are enabled (#1326)
-rw-r--r--example/ndpiReader.c5
-rw-r--r--src/lib/protocols/stun.c2
-rw-r--r--src/lib/protocols/tls.c12
3 files changed, 7 insertions, 12 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index e4ff88d52..e53803fea 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -2915,7 +2915,6 @@ static void printFlowsStats() {
*/
static void printResults(u_int64_t processing_time_usec, u_int64_t setup_time_usec) {
u_int32_t i;
- u_int64_t total_flow_bytes = 0;
u_int32_t avg_pkt_size = 0;
int thread_id;
char buf[32];
@@ -3108,8 +3107,6 @@ static void printResults(u_int64_t processing_time_usec, u_int64_t setup_time_us
(long long unsigned int)cumulative_stats.protocol_counter_bytes[i],
cumulative_stats.protocol_flows[i]);
}
-
- total_flow_bytes += cumulative_stats.protocol_counter_bytes[i];
}
}
@@ -3125,8 +3122,6 @@ static void printResults(u_int64_t processing_time_usec, u_int64_t setup_time_us
}
}
- // printf("\n\nTotal Flow Traffic: %llu (diff: %llu)\n", total_flow_bytes, cumulative_stats.total_ip_bytes-total_flow_bytes);
-
printRiskStats();
printFlowsStats();
diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c
index 19129165b..f91be68b2 100644
--- a/src/lib/protocols/stun.c
+++ b/src/lib/protocols/stun.c
@@ -86,7 +86,7 @@ void ndpi_int_stun_add_connection(struct ndpi_detection_module_struct *ndpi_stru
#ifdef DEBUG_LRU
printf("[LRU] ADDING %u / %u.%u [%u -> %u]\n", key, proto, app_proto,
- ntohs(flow->packet.udp->source), ntohs(flow->packet.udp->dest));
+ ntohs(packet->udp->source), ntohs(packet->udp->dest));
#endif
ndpi_lru_add_to_cache(ndpi_struct->stun_cache, key, app_proto);
diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c
index 2d9d517cc..799092af2 100644
--- a/src/lib/protocols/tls.c
+++ b/src/lib/protocols/tls.c
@@ -1098,7 +1098,7 @@ static void tlsCheckUncommonALPN(struct ndpi_detection_module_struct *ndpi_struc
if(!is_a_common_alpn(ndpi_struct, alpn_start, alpn_len)) {
#ifdef DEBUG_TLS
- printf("TLS uncommon ALPN found: %.*s\n", (int)alpn_len, alpn);
+ printf("TLS uncommon ALPN found: %.*s\n", (int)alpn_len, alpn_start);
#endif
ndpi_set_risk(ndpi_struct, flow, NDPI_TLS_UNCOMMON_ALPN);
break;
@@ -1604,9 +1604,9 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct,
/* Note that both Safari and Chrome can overlap */
#ifdef DEBUG_HEURISTIC
printf("[CIPHERS] [is_chrome_tls: %u (%u)][is_safari_tls: %u (%u)][this_is_not_safari: %u]\n",
- flow->protos.tls_quic_stun.tls_quic.browser_euristics.is_chrome_tls,
+ flow->protos.tls_quic_stun.tls_quic.browser_heuristics.is_chrome_tls,
chrome_ciphers,
- flow->protos.tls_quic_stun.tls_quic.browser_euristics.is_safari_tls,
+ flow->protos.tls_quic_stun.tls_quic.browser_heuristics.is_safari_tls,
safari_ciphers,
this_is_not_safari);
#endif
@@ -1914,9 +1914,9 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct,
#ifdef DEBUG_HEURISTIC
printf("[SIGNATURE] [is_firefox_tls: %u][is_chrome_tls: %u][is_safari_tls: %u][duplicate_found: %u]\n",
- flow->protos.tls_quic_stun.tls_quic.browser_euristics.is_firefox_tls,
- flow->protos.tls_quic_stun.tls_quic.browser_euristics.is_chrome_tls,
- flow->protos.tls_quic_stun.tls_quic.browser_euristics.is_safari_tls,
+ flow->protos.tls_quic_stun.tls_quic.browser_heuristics.is_firefox_tls,
+ flow->protos.tls_quic_stun.tls_quic.browser_heuristics.is_chrome_tls,
+ flow->protos.tls_quic_stun.tls_quic.browser_heuristics.is_safari_tls,
duplicate_found);
#endif