Various optimizations to reduce not-necessary calls

Optimized various UDP dissectors
Removed dead protocols such as pando and pplive

1 files changed, 0 insertions, 232 deletions

diff --git a/src/lib/protocols/pplive.c b/src/lib/protocols/pplive.c
deleted file mode 100644
index 2e41d64f5..000000000
--- a/src/lib/protocols/pplive.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * pplive.c
- *
- * Copyright (C) 2014 Tomasz Bujlow <tomasz@skatnet.dk>
- * 
- * The signature is mostly based on the Libprotoident library
- * except the detection of HTTP Steam flows.
- *
- * This file is part of nDPI, an open source deep packet inspection
- * library based on the OpenDPI and PACE technology by ipoque GmbH
- *
- * nDPI is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * nDPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with nDPI.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-#include "ndpi_protocol_ids.h"
-
-#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_PPLIVE
-
-#include "ndpi_api.h"
-
-static void ndpi_int_pplive_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
-  ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_PPLIVE, NDPI_PROTOCOL_UNKNOWN);
-}
-
-static void ndpi_check_pplive_udp1(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
-	struct ndpi_packet_struct *packet = &flow->packet;
-	u_int32_t payload_len = packet->payload_packet_len;
-	
-	/* Check if we so far detected the protocol in the request or not. */
-	if (flow->pplive_stage1 == 0) {
-		NDPI_LOG_DBG2(ndpi_struct, "PPLIVE stage 0: \n");
-		
-		if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
-			NDPI_LOG_DBG2(ndpi_struct, "Possible PPLIVE request detected, we will look further for the response..\n");
-
-			/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
-			flow->pplive_stage1 = packet->packet_direction + 1; // packet_direction 0: stage 1, packet_direction 1: stage 2
-			return;
-		}
-		
-		if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x42\x01")) {
-			NDPI_LOG_DBG2(ndpi_struct, "Possible PPLIVE request detected, we will look further for the response..\n");
-
-			/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
-			flow->pplive_stage1 = packet->packet_direction + 3; // packet_direction 0: stage 3, packet_direction 1: stage 4
-			return;
-		}
-		
-		if (ndpi_match_strprefix(packet->payload, payload_len, "\x1c\x1c\x32\x01")) {
-			NDPI_LOG_DBG2(ndpi_struct, "Possible PPLIVE request detected, we will look further for the response..\n");
-
-			/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
-			flow->pplive_stage1 = packet->packet_direction + 5; // packet_direction 0: stage 5, packet_direction 1: stage 6
-			return;
-		}			
-
-	} else if ((flow->pplive_stage1 == 1) || (flow->pplive_stage1 == 2)) {
-		NDPI_LOG_DBG2(ndpi_struct, "PPLIVE stage %u: \n", flow->pplive_stage1);
-
-		/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
-		if ((flow->pplive_stage1 - packet->packet_direction) == 1) {
-			return;
-		}
-
-		/* This is a packet in another direction. Check if we find the proper response. */
-		if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x42\x01") || ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
-			NDPI_LOG_DBG2(ndpi_struct, "Found PPLIVE\n");
-			ndpi_int_pplive_add_connection(ndpi_struct, flow);
-		} else {
-			NDPI_LOG_DBG2(ndpi_struct, "The reply did not seem to belong to PPLIVE, resetting the stage to 0..\n");
-			flow->pplive_stage1 = 0;
-		}
-		
-	} else if ((flow->pplive_stage1 == 3) || (flow->pplive_stage1 == 4)) {
-		NDPI_LOG_DBG2(ndpi_struct, "PPLIVE stage %u: \n", flow->pplive_stage1);
-
-		/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
-		if ((flow->pplive_stage1 - packet->packet_direction) == 3) {
-			return;
-		}
-
-		/* This is a packet in another direction. Check if we find the proper response. */
-		if (ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
-			NDPI_LOG_INFO(ndpi_struct, "found PPLIVE\n");
-			ndpi_int_pplive_add_connection(ndpi_struct, flow);
-		} else {
-			NDPI_LOG_DBG2(ndpi_struct, "The reply did not seem to belong to PPLIVE, resetting the stage to 0..\n");
-			flow->pplive_stage1 = 0;
-		}
-	} else if ((flow->pplive_stage1 == 5) || (flow->pplive_stage1 == 6)) {
-		NDPI_LOG_DBG2(ndpi_struct, "PPLIVE stage %u: \n", flow->pplive_stage1);
-
-		/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
-		if ((flow->pplive_stage1 - packet->packet_direction) == 5) {
-			return;
-		}
-
-		/* This is a packet in another direction. Check if we find the proper response. */
-		if (ndpi_match_strprefix(packet->payload, payload_len, "\x1c\x1c\x32\x01")) {
-			NDPI_LOG_INFO(ndpi_struct, "Found PPLIVE\n");
-			ndpi_int_pplive_add_connection(ndpi_struct, flow);
-		} else {
-			NDPI_LOG_DBG2(ndpi_struct, "The reply did not seem to belong to PPLIVE, resetting the stage to 0..\n");
-			flow->pplive_stage1 = 0;
-		}
-	}
-		
-}
-
-static void ndpi_check_pplive_udp2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
-	struct ndpi_packet_struct *packet = &flow->packet;
-	u_int32_t payload_len = packet->payload_packet_len;
-
-	/* Check if we so far detected the protocol in the request or not. */
-	NDPI_LOG_DBG2(ndpi_struct, "PPLIVE stage %u: \n", flow->pplive_stage2);
-	if (flow->pplive_stage2 == 0) {
-		
-		if ((payload_len == 57) && ndpi_match_strprefix(packet->payload, payload_len, "\xe9\x03\x41\x01")) {
-			NDPI_LOG_DBG2(ndpi_struct, "Possible PPLIVE request detected, we will look further for the response..\n");
-
-			/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
-			flow->pplive_stage2 = packet->packet_direction + 1; // packet_direction 0: stage 1, packet_direction 1: stage 2
-		}
-
-	} else {
-		/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
-		if ((flow->pplive_stage2 - packet->packet_direction) == 1) {
-			return;
-		}
-
-		/* This is a packet in another direction. Check if we find the proper response. */
-		if (payload_len == 0) {
-			NDPI_LOG_INFO(ndpi_struct, "found PPLIVE\n");
-			ndpi_int_pplive_add_connection(ndpi_struct, flow);
-		} else {
-			NDPI_LOG_DBG2(ndpi_struct, "The reply did not seem to belong to PPLIVE, resetting the stage to 0..\n");
-			flow->pplive_stage2 = 0;
-		}
-		
-	}
-}
-
-static void ndpi_check_pplive_udp3(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
-	struct ndpi_packet_struct *packet = &flow->packet;
-	u_int32_t payload_len = packet->payload_packet_len;
-	
-	/* Check if we so far detected the protocol in the request or not. */
-	NDPI_LOG_DBG(ndpi_struct, "PPLIVE stage %u: \n", flow->pplive_stage3);
-	if (flow->pplive_stage3 == 0) {
-		
-		if ((payload_len == 94) && (packet->udp->dest == htons(5041) || packet->udp->source == htons(5041) || packet->udp->dest == htons(8303) || packet->udp->source == htons(8303))) {
-			NDPI_LOG_DBG2(ndpi_struct, "Possible PPLIVE request detected, we will look further for the response..\n");
-
-			/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
-			flow->pplive_stage3 = packet->packet_direction + 1; // packet_direction 0: stage 1, packet_direction 1: stage 2
-			return;
-		}	
-
-	} else {
-
-		/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
-		if ((flow->pplive_stage3 - packet->packet_direction) == 1) {
-			return;
-		}
-
-		/* This is a packet in another direction. Check if we find the proper response. */
-		if ((payload_len == 0) || (payload_len == 49) ||(payload_len == 94)) {
-			NDPI_LOG_INFO(ndpi_struct, "found PPLIVE\n");
-			ndpi_int_pplive_add_connection(ndpi_struct, flow);
-		} else {
-			NDPI_LOG_DBG2(ndpi_struct, "The reply did not seem to belong to PPLIVE, resetting the stage to 0..\n");
-			flow->pplive_stage3 = 0;
-		}
-	}
-		
-}
-
-void ndpi_search_pplive(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
-	struct ndpi_packet_struct *packet = &flow->packet;
-	
-	NDPI_LOG_DBG(ndpi_struct, "search PPLIVE\n");
-
-	/* Break after 20 packets. */
-	if (flow->packet_counter > 20) {
-		NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
-		return;
-	}
-
-	if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_PPLIVE) {
-		return;
-	}
-
-	ndpi_check_pplive_udp1(ndpi_struct, flow);
-	
-	if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_PPLIVE) {
-	    return;
-	}
-	
-	ndpi_check_pplive_udp2(ndpi_struct, flow);
-	
-	if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_PPLIVE) {
-	    return;
-	}
-	
-	ndpi_check_pplive_udp3(ndpi_struct, flow);
-}
-
-
-void init_pplive_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
-{
-  ndpi_set_bitmask_protocol_detection("PPLive", ndpi_struct, detection_bitmask, *id,
-				      NDPI_PROTOCOL_PPLIVE,
-				      ndpi_search_pplive,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP,
-				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-
-  *id += 1;
-}
-