Refactoring the debugging output.
levels of debug output: 0 - ERROR: Only for errors. 1 - TRACE: Start of each packets and if found protocol. 2 - DEBUG: Start of searching each protocol and excluding protocols. 3 - DEBUG_EXTRA: For all other messages. Added field ndpi_struct->debug_logging for enable debug output of each protocols. Simple macros for debugging output are added: NDPI_LOG_ERR(), NDPI_LOG_INFO(), NDPI_LOG_DBG(), NDPI_LOG_DBG2(), NDPI_EXCLUDE_PROTO()
This commit is contained in:
@@ -22,10 +22,14 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
#ifdef NDPI_PROTOCOL_SSH
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SSH
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
static void ndpi_int_ssh_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow){
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SSH, NDPI_PROTOCOL_UNKNOWN);
|
||||
@@ -46,8 +50,6 @@ static void ndpi_ssh_zap_cr(char *str, int len) {
|
||||
void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
if (flow->l4.tcp.ssh_stage == 0) {
|
||||
if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
|
||||
@@ -56,7 +58,7 @@ void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
strncpy(flow->protos.ssh.client_signature, (const char *)packet->payload, len);
|
||||
flow->protos.ssh.client_signature[len] = '\0';
|
||||
ndpi_ssh_zap_cr(flow->protos.ssh.client_signature, len);
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "ssh stage 0 passed\n");
|
||||
NDPI_LOG_DBG2(ndpi_struct, "ssh stage 0 passed\n");
|
||||
flow->l4.tcp.ssh_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
@@ -67,7 +69,7 @@ void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
strncpy(flow->protos.ssh.server_signature, (const char *)packet->payload, len);
|
||||
flow->protos.ssh.server_signature[len] = '\0';
|
||||
ndpi_ssh_zap_cr(flow->protos.ssh.server_signature, len);
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "found ssh\n");
|
||||
NDPI_LOG_INFO(ndpi_struct, "found ssh\n");
|
||||
|
||||
ndpi_int_ssh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
@@ -75,7 +77,7 @@ void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "excluding ssh at stage %d\n", flow->l4.tcp.ssh_stage);
|
||||
NDPI_LOG_DBG(ndpi_struct, "excluding ssh at stage %d\n", flow->l4.tcp.ssh_stage);
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSH);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user