1 files changed, 0 insertions, 74 deletions
diff --git a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch b/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
deleted file mode 100644
index 69aa892d2d11..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From e4512dbcb9e1db0500290b712257e501d1440d71 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Tue, 24 Mar 2020 12:18:15 +0100
-Subject: [PATCH] Refresh of ndpi_netbios_name_interpret
-
----
- src/include/ndpi_main.h     |  2 +-
- src/lib/protocols/netbios.c | 15 +++++++--------
- 2 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h
-index c909adc7..9335f215 100644
---- a/src/include/ndpi_main.h
-+++ b/src/include/ndpi_main.h
-@@ -132,7 +132,7 @@ extern "C" {
- 					       u_int16_t** tcp_master_proto,
- 					       u_int16_t** udp_master_proto);
-   #/* NDPI_PROTOCOL_NETBIOS */
--  int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len);
-+  int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len);
-   
- #ifdef NDPI_ENABLE_DEBUG_MESSAGES
-   void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
-diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c
-index 19cffeb8..1c65b185 100644
---- a/src/lib/protocols/netbios.c
-+++ b/src/lib/protocols/netbios.c
-@@ -35,17 +35,17 @@ struct netbios_header {
- };
- 
- /* The function below has been inherited by tcpdump */
--int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
-+int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len) {
-   int ret = 0, len;
-   char *b;
--  
-+
-   len = (*in++)/2;
-   b  = out;
-   *out = 0;
- 
--  if(len > (out_len-1) || len < 1)
--    return(-1);  
--  
-+  if(len > (out_len-1) || len < 1 || 2*len > inlen)
-+    return(-1);
-+
-   while (len--) {
-     if(in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') {
-       *out = 0;
-@@ -53,7 +53,7 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
-     }
- 
-     *out = ((in[0]-'A')<<4) + (in[1]-'A');
--        
-+
-     in += 2;
- 
-     if(isprint(*out))
-@@ -69,13 +69,12 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
-   return(ret);
- }
- 
--
- static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
- 					    *ndpi_struct, struct ndpi_flow_struct *flow) { 
-   char name[64];
-   u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14;
-   
--  if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], name, sizeof(name)) > 0)
-+  if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], flow->packet.payload_packet_len - off, name, sizeof(name)) > 0)
-     snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);    
-   
-   ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN);