Merge remote-tracking branch 'upstream/dev' into dev

1 files changed, 27 insertions, 2 deletions

diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h
index 4193a2c57..9fbabc5f7 100644
--- a/src/include/ndpi_api.h
+++ b/src/include/ndpi_api.h
@@ -384,6 +384,20 @@ extern "C" {
 
 
   /**
+   * Exclude protocol from search
+   *
+   * @par    ndpi_struct         = the detection module
+   * @par    flow                = the flow where match the host
+   * @par    master_protocol_id  = value of the ID associated to the master protocol detected
+   *
+   */
+  void ndpi_exclude_protocol(struct ndpi_detection_module_struct *ndpi_struct,
+				  struct ndpi_flow_struct *flow,
+				  u_int16_t master_protocol_id,
+				  const char *_file, const char *_func,int _line);
+
+
+  /**
    * Check if the string -bigram_to_match- match with a bigram of -automa-
    *
    * @par     ndpi_mod         = the detection module
@@ -519,14 +533,25 @@ extern "C" {
    * Return the ID of the protocol
    *
    * @par     ndpi_mod   = the detection module
-   * @par     proto      = the ID of the protocol
-   * @return  the string name of the breed ID
+   * @par     proto      = the protocol name
+   * @return  the ID of the protocol
    *
    */
   int ndpi_get_protocol_id(struct ndpi_detection_module_struct *ndpi_mod, char *proto);
 
 
   /**
+   * Return the ID of the category
+   *
+   * @par     ndpi_mod   = the detection module
+   * @par     proto      = the category name
+   * @return  the ID of the category
+   *
+   */
+  int ndpi_get_category_id(struct ndpi_detection_module_struct *ndpi_mod, char *cat);
+
+
+  /**
    * Write the list of the supported protocols
    *
    * @par  ndpi_mod = the detection module