diff options
| author | lns <matzeton@googlemail.com> | 2022-06-04 17:14:06 +0200 |
|---|---|---|
| committer | lns <matzeton@googlemail.com> | 2022-06-04 17:57:56 +0200 |
| commit | c9ab5573765b605ed56b3f4781124df457ad3b52 (patch) | |
| tree | bb0a1f93626168d202b7d2f5483a26f0e5d6bd0f /src/include | |
| parent | 338427d71290a3df44c9f43b49a8609964ec63a6 (diff) | |
Added RSH dissector. Fixes #202.add/rsh
- added syslog false-positive pcap that was missing in 09fbe0a64a11b08a35435f516e9a19f7e0c20d7c
- added NDPI_ARRAY_LENGTH() macro, usable on `type var[]` declarations
Signed-off-by: lns <matzeton@googlemail.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_define.h.in | 3 | ||||
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_protocols.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 6 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index d34f8672d..b1b6a7599 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.in @@ -297,6 +297,8 @@ #define NDPI_IPIP_PROTOCOL_TYPE 0x04 #define NDPI_ICMPV6_PROTOCOL_TYPE 0x3a +#define NDPI_ARRAY_LENGTH(array) (sizeof(array) / sizeof((array)[0])) + /* the get_uXX will return raw network packet bytes !! */ #define get_u_int8_t(X,O) (*(u_int8_t *)((&(((u_int8_t *)X)[O])))) #define get_u_int16_t(X,O) (*(u_int16_t *)((&(((u_int8_t *)X)[O])))) @@ -315,7 +317,6 @@ static inline u_int64_t get_u_int64_t(const u_int8_t* X, int O) /* new definitions to get little endian from network bytes */ #define get_ul8(X,O) get_u_int8_t(X,O) - #if defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN) #define get_l16(X,O) get_u_int16_t(X,O) #define get_l32(X,O) get_u_int32_t(X,O) diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 7e8d5e315..3ec782bfd 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -322,6 +322,7 @@ typedef enum { NDPI_PROTOCOL_MPEGDASH = 291, NDPI_PROTOCOL_DAZN = 292, NDPI_PROTOCOL_GOTO = 293, /* GoTo products, mainly GoToMeeting */ + NDPI_PROTOCOL_RSH = 294, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 841506a65..24329eb17 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -226,6 +226,7 @@ void init_sd_rtn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i void init_raknet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_xiaomi_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_mpegdash_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_rsh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); /* ndpi_main.c */ extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port); diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index b0143d404..78e879a0d 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1292,6 +1292,12 @@ struct ndpi_flow_struct { } telnet; struct { + char client_username[32]; + char server_username[32]; + char command[48]; + } rsh; + + struct { char version[32]; } ubntac2; |