summaryrefslogtreecommitdiff
path: root/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch')
-rw-r--r--net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch208
1 files changed, 0 insertions, 208 deletions
diff --git a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch b/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
deleted file mode 100644
index 04f264d52ddd..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 60e3ac6b39cb25c974785b8ccc49edaae458a891 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Fri, 3 Apr 2020 15:31:23 +0200
-Subject: [PATCH] Fix for serialization of strings where the first element is a
- zero len string
-
----
- src/include/ndpi_typedefs.h | 10 ++++++----
- src/lib/ndpi_serializer.c | 36 +++++++++++++++++++++++++++++++-----
- 2 files changed, 37 insertions(+), 9 deletions(-)
-
-diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
-index 98b8ccf8..2c513e26 100644
---- a/src/include/ndpi_typedefs.h
-+++ b/src/include/ndpi_typedefs.h
-@@ -1446,10 +1446,12 @@ typedef enum {
- #define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
- #define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
-
--#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
--#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
--#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
--#define NDPI_SERIALIZER_STATUS_SOB (1 << 3)
-+#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
-+#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
-+#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
-+#define NDPI_SERIALIZER_STATUS_SOB (1 << 3)
-+#define NDPI_SERIALIZER_STATUS_NOT_EMPTY (1 << 4)
-+
-
- typedef struct {
- u_int32_t flags;
-diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
-index 80221005..57c61604 100644
---- a/src/lib/ndpi_serializer.c
-+++ b/src/lib/ndpi_serializer.c
-@@ -43,6 +43,14 @@
-
- /* ********************************** */
-
-+static u_int8_t ndpi_serialize_is_not_empty(ndpi_serializer *_serializer) {
-+ ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
-+
-+ return(((serializer->status.flags & NDPI_SERIALIZER_STATUS_NOT_EMPTY) == NDPI_SERIALIZER_STATUS_NOT_EMPTY) ? 1 : 0);
-+}
-+
-+/* ********************************** */
-+
- static u_int64_t ndpi_htonll(u_int64_t v) {
- union { u_int32_t lv[2]; u_int64_t llv; } u;
-
-@@ -442,14 +450,17 @@ int ndpi_serialize_end_of_record(ndpi_serializer *_serializer) {
- if(!(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)) {
- serializer->buffer[0] = '[';
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used],
-- buff_diff, "]");
-+ buff_diff, "]");
- }
-+
- serializer->status.flags |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR;
- serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_COMMA;
- } else {
- serializer->buffer[serializer->status.size_used++] = ndpi_serialization_end_of_record;
- }
-
-+ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-+
- return(0);
- }
-
-@@ -556,6 +567,7 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -607,6 +619,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -660,6 +673,7 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -713,6 +727,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -761,6 +776,7 @@ int ndpi_serialize_uint32_float(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -811,6 +827,7 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -851,6 +868,7 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
- value ? "true" : "false");
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -908,6 +926,8 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-+
- return(0);
- }
-
-@@ -967,6 +987,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1030,6 +1051,7 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1056,7 +1078,7 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
- return(ndpi_serialize_string_uint32(_serializer, key, value));
- } else {
- char buf[16];
--
-+
- snprintf(buf, sizeof(buf), format, value);
- return(ndpi_serialize_string_string(_serializer, key, buf));
- }
-@@ -1111,6 +1133,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1174,6 +1197,7 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
- ndpi_serialize_single_float(serializer, value);
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1232,8 +1256,8 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
- ndpi_serialize_json_post(_serializer);
- } else if(serializer->fmt == ndpi_serialization_format_csv) {
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
-- "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
-- value);
-+ "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
-+ value);
- } else {
- serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_string;
-
-@@ -1241,6 +1265,7 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
- ndpi_serialize_single_string(serializer, value, vlen);
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1320,10 +1345,11 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
- ndpi_serialize_json_post(_serializer);
- } else if(serializer->fmt == ndpi_serialization_format_csv) {
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
-- "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
-+ "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
- value ? "true" : "false");
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 03:51:08 +0000