Remove ndpi_set_proto_defaults() from the API (#2863)

Add an explicit field to indicate if the protocol is custom or internal

Author: IvanNardi

example/ndpiReader.c

@@ -753,8 +753,8 @@ static void help(u_int long_help) {
            sizeof(((struct ndpi_flow_struct *)0)->protos));
 
     printf("\n\nnDPI supported protocols:\n");
-    printf("%3s %8s %-22s %-10s %-8s %-12s %-18s %-31s %-31s \n",
-	   "Id", "Userd-id", "Protocol", "Layer_4", "Nw_Proto", "Breed", "Category","Def UDP Port/s","Def TCP Port/s");
+    printf("%3s %8s %-26s %-10s %-8s %-21s %-18s %-31s %-31s %6s\n",
+	   "Id", "Userd-id", "Protocol", "Layer_4", "Nw_Proto", "Breed", "Category","Def UDP Port/s","Def TCP Port/s", "Custom");
     num_threads = 1;
 
     ndpi_dump_protocols(ndpi_str, stdout);

fuzz/fuzz_config.cpp

@@ -706,12 +706,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   ndpi_is_subprotocol_informative(ndpi_info_mod, pid);
   ndpi_get_proto_breed(ndpi_info_mod, pid);
 
-  ndpi_port_range d_port[MAX_DEFAULT_PORTS] = {};
-  ndpi_set_proto_defaults(ndpi_info_mod, 0, 0, NDPI_PROTOCOL_SAFE, pid,
-                          protoname, NDPI_PROTOCOL_CATEGORY_UNSPECIFIED,
-			  NDPI_PROTOCOL_QOE_CATEGORY_UNSPECIFIED,
-			  d_port, d_port);
-
   ndpi_get_proto_by_name(ndpi_info_mod, NULL); /* Error */
   ndpi_get_proto_by_name(ndpi_info_mod, "foo"); /* Invalid protocol */
   ndpi_get_proto_name(ndpi_info_mod, pid);

src/include/ndpi_main.h

@@ -85,15 +85,7 @@ extern "C" {
   int ndpi_handle_ipv6_extension_headers(u_int16_t l3len,
 					 const u_int8_t ** l4ptr, u_int16_t * l4len,
 					 u_int8_t * nxt_hdr);
-  
-  void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_str,
-			       u_int8_t is_cleartext, u_int8_t is_app_protocol,
-			       ndpi_protocol_breed_t breed,
-			       u_int16_t protoId, char *protoName,
-			       ndpi_protocol_category_t protoCategory,
-			       ndpi_protocol_qoe_category_t qoeCategory,
-			       ndpi_port_range *tcpDefPorts,
-			       ndpi_port_range *udpDefPorts);
+
   void ndpi_set_risk(struct ndpi_detection_module_struct *ndpi_str, struct ndpi_flow_struct *flow,
                      ndpi_risk_enum r, char *risk_message);
   void ndpi_unset_risk(struct ndpi_detection_module_struct *ndpi_str, struct ndpi_flow_struct *flow, ndpi_risk_enum r);

src/include/ndpi_typedefs.h

@@ -1215,11 +1215,10 @@ typedef enum {
   NDPI_PROTOCOL_QOE_CATEGORY_MAX                 /* Leave it as last entry !!!                   */
 } ndpi_protocol_qoe_category_t;
 
-/* ntop extensions */
 typedef struct ndpi_proto_defaults {
   char *protoName;
   ndpi_protocol_category_t protoCategory;
-  u_int8_t isClearTextProto:1, isAppProtocol:1, _notused:6;
+  u_int8_t isClearTextProto:1, isAppProtocol:1, isCustomProto:1, _notused:5;
   u_int16_t *subprotocols;
   u_int32_t subprotocol_count;
   u_int16_t protoId, dissector_idx;