net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -955,6 +955,7 @@
   4        CFLAGS="$_save_CFLAGS"
   5      ])
   6      PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)])
   7 +    PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)])
   8      ;;
   9    no)
  10      AC_MSG_RESULT(no)
  11 --- a/src/ndpi/ndpi.c
  12 +++ b/src/ndpi/ndpi.c
  13 @@ -374,10 +374,14 @@
  14    if (flow->detection_completed || flow->tcp_finished) {
  15      if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
  16  #ifdef WITH_NDPI26
  17 +#ifdef WITH_NDPI30
  18 +         flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
  19 +#else
  20        flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
  21 +#endif /* WITH_NDPI30 */
  22  #else
  23        flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
  24 -#endif
  25 +#endif /* WITH_NDPI26 */
  26
  27      if (workflow->prefs.protocol_guess) {
  28        if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {