fix check for issue https://github.com/ntop/nDPI/issues/272

1 files changed, 15 insertions, 16 deletions

diff --git a/src/lib/protocols/bgp.c b/src/lib/protocols/bgp.c
index e72fdee57..0ec6fa59c 100644
--- a/src/lib/protocols/bgp.c
+++ b/src/lib/protocols/bgp.c
@@ -1,8 +1,7 @@
 /*
  * bgp.c
  *
- * Copyright (C) 2009-2011 by ipoque GmbH
- * Copyright (C) 2011-15 - ntop.org
+ * Copyright (C) 2016 - ntop.org
  *
  * This file is part of nDPI, an open source deep packet inspection
  * library based on the OpenDPI and PACE technology by ipoque GmbH
@@ -21,9 +20,8 @@
  * along with nDPI.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
-
 #include "ndpi_protocols.h"
+
 #ifdef NDPI_PROTOCOL_BGP
 
 
@@ -38,19 +36,20 @@ void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
   struct ndpi_packet_struct *packet = &flow->packet;
   u_int16_t bgp_port = htons(179);
 
-  if(packet->tcp
-     && (packet->payload_packet_len > 18)
-     && (packet->payload[18] < 5)
-     && ((packet->tcp->dest == bgp_port) || (packet->tcp->source == bgp_port))
-     && (get_u_int64_t(packet->payload, 0) == 0xffffffffffffffffULL)
-     && (get_u_int64_t(packet->payload, 8) == 0xffffffffffffffffULL)
-     && (ntohs(get_u_int16_t(packet->payload, 16)) <= packet->payload_packet_len)
-     ) {
-    NDPI_LOG(NDPI_PROTOCOL_BGP, ndpi_struct, NDPI_LOG_DEBUG, "BGP detected.\n");
-    ndpi_int_bgp_add_connection(ndpi_struct, flow);
-    return;
+  if(packet->tcp) {
+    if(packet->payload_packet_len > 18
+       && packet->payload[18] < 5
+       && ((packet->tcp->dest == bgp_port) || (packet->tcp->source == bgp_port))
+       && (get_u_int64_t(packet->payload, 0) == 0xffffffffffffffffULL)
+       && (get_u_int64_t(packet->payload, 8) == 0xffffffffffffffffULL)
+       && (ntohs(get_u_int16_t(packet->payload, 16)) <= packet->payload_packet_len)) {
+      
+      NDPI_LOG(NDPI_PROTOCOL_BGP, ndpi_struct, NDPI_LOG_DEBUG, "BGP detected.\n");
+      ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BGP, NDPI_PROTOCOL_UNKNOWN);
+      return;
+    } 
   }
-
+  /* exclude BGP */
   NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BGP);
 }