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:
@@ -18,11 +18,15 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_ORACLE
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_ORACLE
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
|
||||
#ifdef NDPI_PROTOCOL_ORACLE
|
||||
static void ndpi_int_oracle_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
@@ -34,11 +38,11 @@ void ndpi_search_oracle(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int16_t dport = 0, sport = 0;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ORACLE, ndpi_struct, NDPI_LOG_DEBUG, "search for ORACLE.\n");
|
||||
NDPI_LOG_DBG(ndpi_struct, "search ORACLE\n");
|
||||
|
||||
if(packet->tcp != NULL) {
|
||||
sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest);
|
||||
NDPI_LOG(NDPI_PROTOCOL_ORACLE, ndpi_struct, NDPI_LOG_DEBUG, "calculating ORACLE over tcp.\n");
|
||||
NDPI_LOG_DBG2(ndpi_struct, "calculating ORACLE over tcp\n");
|
||||
/* Oracle Database 9g,10g,11g */
|
||||
if ((dport == 1521 || sport == 1521)
|
||||
&& (((packet->payload[0] == 0x07) && (packet->payload[1] == 0xff) && (packet->payload[2] == 0x00))
|
||||
@@ -46,17 +50,16 @@ void ndpi_search_oracle(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
&& (packet->payload[1] != 0x00)
|
||||
&& (packet->payload[2] == 0x00)
|
||||
&& (packet->payload[3] == 0x00)))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ORACLE, ndpi_struct, NDPI_LOG_DEBUG, "found oracle.\n");
|
||||
NDPI_LOG_INFO(ndpi_struct, "found oracle\n");
|
||||
ndpi_int_oracle_add_connection(ndpi_struct, flow);
|
||||
} else if (packet->payload_packet_len == 213 && packet->payload[0] == 0x00 &&
|
||||
packet->payload[1] == 0xd5 && packet->payload[2] == 0x00 &&
|
||||
packet->payload[3] == 0x00 ) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ORACLE, ndpi_struct, NDPI_LOG_DEBUG, "found oracle.\n");
|
||||
NDPI_LOG_INFO(ndpi_struct, "found oracle\n");
|
||||
ndpi_int_oracle_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ORACLE, ndpi_struct, NDPI_LOG_DEBUG, "exclude ORACLE.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_ORACLE);
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user