Added RSH dissector. Fixes #202. (#1581)

- added syslog false-positive pcap that was missing in 09fbe0a64a
 - added NDPI_ARRAY_LENGTH() macro, usable on `type var[]` declarations

Signed-off-by: lns <matzeton@googlemail.com>
This commit is contained in:
Toni
2022-06-04 19:12:53 +02:00
committed by GitHub
parent 338427d712
commit 7419cfee64
11 changed files with 202 additions and 6 deletions
+2 -1
View File
@@ -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)
+1
View File
@@ -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"
+1
View File
@@ -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);
+6
View File
@@ -1291,6 +1291,12 @@ struct ndpi_flow_struct {
char username[32], password[32];
} telnet;
struct {
char client_username[32];
char server_username[32];
char command[48];
} rsh;
struct {
char version[32];
} ubntac2;