diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-06-28 21:32:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-28 21:32:08 +0200 |
| commit | 93a4a4387af951a4680061bf4e1effa87fa65406 (patch) | |
| tree | 5cf4f6cf539587d2e73dd751ac38b7547a3a1533 /src | |
| parent | b2e89e67361a931672281f680faede0551542eea (diff) | |
| parent | f39e3c98f05e84f263af7d74bcedb1051efa7169 (diff) | |
Merge pull request #938 from IvanNardi/errors
Errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_define.h.in | 2 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 6 | ||||
| -rw-r--r-- | src/lib/protocols/tls.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index be7c21175..13989a60e 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.in @@ -277,7 +277,7 @@ #define NDPI_SET_BIT(num, n) num |= 1UL << n #define NDPI_CLR_BIT(num, n) num &= ~(1UL << n) #define NDPI_CLR_BIT(num, n) num &= ~(1UL << n) -#define NDPI_ISSET_BIT(num, n) (num & (1 << n)) +#define NDPI_ISSET_BIT(num, n) (num & (1UL << n)) #define NDPI_ZERO_BIT(num) num = 0 /* this is a very very tricky macro *g*, diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index e34a5a5ee..957e3b763 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -3288,6 +3288,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* IEC 60870-5-104 */ init_104_dissector(ndpi_str, &a, detection_bitmask); + /* DNP3 */ + init_dnp3_dissector(ndpi_str, &a, detection_bitmask); + /* WEBSOCKET */ init_websocket_dissector(ndpi_str, &a, detection_bitmask); @@ -4376,7 +4379,8 @@ static void ndpi_reset_packet_line_info(struct ndpi_packet_struct *packet) { packet->http_cookie.len = 0, packet->http_origin.len = 0, packet->http_origin.ptr = NULL, packet->http_x_session_type.ptr = NULL, packet->http_x_session_type.len = 0, packet->server_line.ptr = NULL, packet->server_line.len = 0, packet->http_method.ptr = NULL, packet->http_method.len = 0, - packet->http_response.ptr = NULL, packet->http_response.len = 0, packet->http_num_headers = 0; + packet->http_response.ptr = NULL, packet->http_response.len = 0, packet->http_num_headers = 0, + packet->forwarded_line.ptr = NULL, packet->forwarded_line.len = 0; } /* ********************************************************************************* */ diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index c9b2d0ee2..007931e19 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -818,14 +818,14 @@ static void ndpi_int_tls_add_connection(struct ndpi_detection_module_struct *ndp /* https://engineering.salesforce.com/tls-fingerprinting-with-ja3-and-ja3s-247362855967 */ #define JA3_STR_LEN 1024 -#define MAX_NUM_JA3 128 +#define MAX_NUM_JA3 512 struct ja3_info { u_int16_t tls_handshake_version; u_int16_t num_cipher, cipher[MAX_NUM_JA3]; u_int16_t num_tls_extension, tls_extension[MAX_NUM_JA3]; u_int16_t num_elliptic_curve, elliptic_curve[MAX_NUM_JA3]; - u_int8_t num_elliptic_curve_point_format, elliptic_curve_point_format[MAX_NUM_JA3]; + u_int16_t num_elliptic_curve_point_format, elliptic_curve_point_format[MAX_NUM_JA3]; }; /* **************************************** */ |