diff options
| author | Toni <matzeton@googlemail.com> | 2022-10-02 12:47:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 12:47:56 +0200 |
| commit | c83e0b3c8d780df6fb5b064ff7c1c03e758a03a1 (patch) | |
| tree | b3249504b8df1a363cbc9fd54f6e4f60d6466d05 | |
| parent | 503aac70bccfecfc920e30b5d7d32e252f0cae92 (diff) | |
Restore Confidence enum constants to ascending values. (#1760)
* NDPI_CONFIDENCE_MAX is useless otherwise since it is
supposed the be the highest value w/o any gaps
* for client applications, it makes sense to use that
the numbers directly w/o any additional mapping
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | src/include/ndpi_typedefs.h | 15 | ||||
| -rw-r--r-- | tests/unit/unit.c | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 9dfa80c9a..8d7f1e864 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -915,14 +915,13 @@ typedef struct { } ndpi_port_range; typedef enum { - /* Try to have "stable" values (across releases/changes) */ - NDPI_CONFIDENCE_UNKNOWN = 0, /* Unknown classification */ - NDPI_CONFIDENCE_MATCH_BY_PORT = 10, /* Classification obtained looking only at the L4 ports */ - NDPI_CONFIDENCE_NBPF = 50, /* PF_RING nBPF (custom protocol) */ - NDPI_CONFIDENCE_DPI_PARTIAL = 100, /* Classification results based on partial/incomplete DPI information */ - NDPI_CONFIDENCE_DPI_PARTIAL_CACHE = 110, /* Classification results based on some LRU cache with partial/incomplete DPI information */ - NDPI_CONFIDENCE_DPI_CACHE = 200, /* Classification results based on some LRU cache (i.e. correlation among sessions) */ - NDPI_CONFIDENCE_DPI = 210, /* Deep packet inspection */ + NDPI_CONFIDENCE_UNKNOWN = 0, /* Unknown classification */ + NDPI_CONFIDENCE_MATCH_BY_PORT, /* Classification obtained looking only at the L4 ports */ + NDPI_CONFIDENCE_NBPF, /* PF_RING nBPF (custom protocol) */ + NDPI_CONFIDENCE_DPI_PARTIAL, /* Classification results based on partial/incomplete DPI information */ + NDPI_CONFIDENCE_DPI_PARTIAL_CACHE, /* Classification results based on some LRU cache with partial/incomplete DPI information */ + NDPI_CONFIDENCE_DPI_CACHE, /* Classification results based on some LRU cache (i.e. correlation among sessions) */ + NDPI_CONFIDENCE_DPI, /* Deep packet inspection */ /* IMPORTANT diff --git a/tests/unit/unit.c b/tests/unit/unit.c index 979dbc107..5123155e0 100644 --- a/tests/unit/unit.c +++ b/tests/unit/unit.c @@ -286,7 +286,7 @@ int serializeProtoUnitTest(void) buffer_len = 0; buffer = ndpi_serializer_get_buffer(&serializer, &buffer_len); #ifndef WIN32 - char const * const expected_json_str = "{\"flow_risk\": {\"6\": {\"risk\":\"Self-signed Cert\",\"severity\":\"High\",\"risk_score\": {\"total\":500,\"client\":450,\"server\":50}},\"7\": {\"risk\":\"Obsolete TLS (v1.1 or older)\",\"severity\":\"High\",\"risk_score\": {\"total\":510,\"client\":455,\"server\":55}},\"8\": {\"risk\":\"Weak TLS Cipher\",\"severity\":\"High\",\"risk_score\": {\"total\":250,\"client\":225,\"server\":25}},\"17\": {\"risk\":\"Malformed Packet\",\"severity\":\"Low\",\"risk_score\": {\"total\":260,\"client\":130,\"server\":130}}},\"confidence\": {\"210\":\"DPI\"},\"proto\":\"TLS.Facebook\",\"proto_id\":\"91.119\",\"encrypted\":1,\"breed\":\"Fun\",\"category_id\":6,\"category\":\"SocialNetwork\",\"float\":340282346638528859811704183484516925440.000000,\"double\":680564693277057719623408366969033850880.000000}"; + char const * const expected_json_str = "{\"flow_risk\": {\"6\": {\"risk\":\"Self-signed Cert\",\"severity\":\"High\",\"risk_score\": {\"total\":500,\"client\":450,\"server\":50}},\"7\": {\"risk\":\"Obsolete TLS (v1.1 or older)\",\"severity\":\"High\",\"risk_score\": {\"total\":510,\"client\":455,\"server\":55}},\"8\": {\"risk\":\"Weak TLS Cipher\",\"severity\":\"High\",\"risk_score\": {\"total\":250,\"client\":225,\"server\":25}},\"17\": {\"risk\":\"Malformed Packet\",\"severity\":\"Low\",\"risk_score\": {\"total\":260,\"client\":130,\"server\":130}}},\"confidence\": {\"6\":\"DPI\"},\"proto\":\"TLS.Facebook\",\"proto_id\":\"91.119\",\"encrypted\":1,\"breed\":\"Fun\",\"category_id\":6,\"category\":\"SocialNetwork\",\"float\":340282346638528859811704183484516925440.000000,\"double\":680564693277057719623408366969033850880.000000}"; if (strncmp(buffer, expected_json_str, buffer_len) != 0) { |