aboutsummaryrefslogtreecommitdiff
path: root/src/lib/protocols/bjnp.c
diff options
context:
space:
mode:
authordillinger79 <dxnanos@gmail.com>2018-03-01 14:13:50 +0200
committerGitHub <noreply@github.com>2018-03-01 14:13:50 +0200
commitb19cd086b41ed17217537664b10b29a7055e3f72 (patch)
tree9eb61225d2b9f2962f553888cdc1cbe86b93396d /src/lib/protocols/bjnp.c
parent9f8fedb3b1f3e1a380baf1600a12096aaf2e2953 (diff)
parente935ee77bf1802f2bf47afd5d7a27eb1b5116c47 (diff)
Merge pull request #3 from ntop/dev
update to latest
Diffstat (limited to 'src/lib/protocols/bjnp.c')
-rw-r--r--src/lib/protocols/bjnp.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/lib/protocols/bjnp.c b/src/lib/protocols/bjnp.c
index 260bbb9ea..f9f690308 100644
--- a/src/lib/protocols/bjnp.c
+++ b/src/lib/protocols/bjnp.c
@@ -1,7 +1,10 @@
-#include "ndpi_api.h"
+#include "ndpi_protocol_ids.h"
#ifdef NDPI_PROTOCOL_BJNP
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_BJNP
+
+#include "ndpi_api.h"
static void ndpi_int_bjnp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow,
@@ -17,24 +20,27 @@ static void ndpi_check_bjnp(struct ndpi_detection_module_struct *ndpi_struct, st
u_int32_t payload_len = packet->payload_packet_len;
if(packet->udp != NULL) {
- if(payload_len > 2) {
- if(strncmp((const char *)packet->payload, "BJNP", 4) == 0) {
- NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "Found bjnp.\n");
+ if(payload_len > 4) {
+ if((memcmp((const char *)packet->payload, "BJNP", 4) == 0)
+ || (memcmp((const char *)packet->payload, "BNJB", 4) == 0)
+ || (memcmp((const char *)packet->payload, "BJNB", 4) == 0)
+ || (memcmp((const char *)packet->payload, "MFNP", 4) == 0)
+ ) {
+ NDPI_LOG_INFO(ndpi_struct, "found bjnp\n");
ndpi_int_bjnp_add_connection(ndpi_struct, flow, 0);
return;
}
}
}
- NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "exclude bjnp.\n");
- NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BJNP);
+ NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
}
void ndpi_search_bjnp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct *packet = &flow->packet;
- NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "bjnp detection...\n");
+ NDPI_LOG_DBG(ndpi_struct, "search bjnp\n");
/* skip marked packets */
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_BJNP) {