Merge branch 'dev' of https://github.com/ntop/nDPI into dev
This commit is contained in:
@@ -43,21 +43,90 @@
|
||||
#endif
|
||||
|
||||
#pragma pack(push, 1) /* push current alignment to stack */
|
||||
#pragma pack(1) /* set alignment to 1 byte boundary */
|
||||
#pragma pack(1) /* set alignment to 1 byte boundary */
|
||||
|
||||
#pragma pack(pop) /* restore original alignment from stack */
|
||||
#pragma pack(pop) /* restore original alignment from stack */
|
||||
|
||||
struct ndpi_ethhdr {
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* +++++++++++ Ethernet data structures +++++++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
struct ndpi_ethhdr
|
||||
{
|
||||
u_char h_dest[6]; /* destination eth addr */
|
||||
u_char h_source[6]; /* source ether addr */
|
||||
u_int16_t h_proto; /* packet type ID field */
|
||||
};
|
||||
|
||||
struct ndpi_80211q {
|
||||
u_int16_t vlanId;
|
||||
u_int16_t protoType;
|
||||
};
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* +++++++++++ ieee802.11 data structures +++++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
/******* RADIO TAP *******/
|
||||
/* radiotap header */
|
||||
struct ndpi_radiotap_header
|
||||
{
|
||||
u_int8_t version; /* set to 0 */
|
||||
u_int8_t pad;
|
||||
u_int16_t len;
|
||||
u_int32_t present;
|
||||
u_int64_t MAC_timestamp;
|
||||
u_int8_t flags;
|
||||
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* Beacon frame */
|
||||
struct ndpi_beacon
|
||||
{
|
||||
/* header -- 24 byte */
|
||||
u_int16_t fc;
|
||||
u_int16_t duration;
|
||||
u_char rcv_addr[6];
|
||||
u_char trsm_addr[6];
|
||||
u_char bssid[6];
|
||||
u_int16_t seq_ctrl;
|
||||
/* body (variable) */
|
||||
u_int64_t timestamp; /* 802.11 Timestamp value at frame send */
|
||||
u_int16_t beacon_interval; /* Interval at which beacons are send */
|
||||
u_int16_t capability;
|
||||
/** List of information elements **/
|
||||
/* union ndpi_80211_info info_element[0]; */
|
||||
} __attribute__((packed));
|
||||
|
||||
|
||||
/* Wifi data frame - TODO: specify when addr1 addr2 addr3 is rcv, trams or bssid*/
|
||||
struct ndpi_wifi_data_frame
|
||||
{
|
||||
u_int16_t fc;
|
||||
u_int16_t duration;
|
||||
u_char addr1[6];
|
||||
u_char addr2[6];
|
||||
u_char addr3[6];
|
||||
u_int16_t seq_ctrl;
|
||||
} __attribute__((packed));
|
||||
|
||||
/* Logical-Link Control header */
|
||||
struct ndpi_llc_header_proto
|
||||
{
|
||||
u_int8_t dsap;
|
||||
u_int8_t ssap;
|
||||
u_int8_t ctl;
|
||||
/* u_int8_t pad1; */
|
||||
u_int16_t org;
|
||||
u_int8_t org2;
|
||||
/* u_int8_t pad2; */
|
||||
u_int16_t ether_IP_type;
|
||||
} __attribute__((packed));
|
||||
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* ++++++++++++++ IP data structures ++++++++++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
|
||||
/* IP header */
|
||||
struct ndpi_iphdr {
|
||||
#if defined(__LITTLE_ENDIAN__)
|
||||
u_int8_t ihl:4, version:4;
|
||||
@@ -166,6 +235,11 @@ struct ndpi_ip6_hdr {
|
||||
struct ndpi_in6_addr ip6_dst;
|
||||
};
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* ++++++++ Transport Layer data structures +++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
|
||||
struct ndpi_tcphdr {
|
||||
u_int16_t source;
|
||||
u_int16_t dest;
|
||||
|
||||
@@ -143,13 +143,6 @@ extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct
|
||||
u_int16_t** tcp_master_proto,
|
||||
u_int16_t** udp_master_proto);
|
||||
|
||||
extern u_int8_t ndpi_net_match(u_int32_t ip_to_check,
|
||||
u_int32_t net,
|
||||
u_int32_t num_bits);
|
||||
|
||||
extern u_int8_t ndpi_ips_match(u_int32_t src, u_int32_t dst,
|
||||
u_int32_t net, u_int32_t num_bits);
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
const char **file, const char **func, u_int32_t * line);
|
||||
|
||||
@@ -201,6 +201,8 @@
|
||||
#define NDPI_PROTOCOL_WHATSAPP_VOICE 189
|
||||
#define NDPI_PROTOCOL_STARCRAFT 213 /* Matteo Bracci <matteobracci1@gmail.com> */
|
||||
#define NDPI_PROTOCOL_TEREDO 214
|
||||
#define NDPI_PROTOCOL_HEP 216 /* Sipcapture.org QXIP BV */
|
||||
#define NDPI_PROTOCOL_UBNTAC2 217 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
|
||||
|
||||
#define NDPI_CONTENT_AVI 39
|
||||
#define NDPI_CONTENT_FLASH 40
|
||||
@@ -263,7 +265,7 @@
|
||||
#define NDPI_SERVICE_HOTSPOT_SHIELD 215
|
||||
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_HOTSPOT_SHIELD
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_UBNTAC2
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
@@ -72,6 +72,7 @@ void ndpi_search_oscar(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_sip(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_hep(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
@@ -195,6 +196,7 @@ void ndpi_search_eaq(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mpegts(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_starcraft(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
|
||||
|
||||
/* --- INIT FUNCTIONS --- */
|
||||
@@ -288,6 +290,7 @@ void init_rtsp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
||||
void init_sflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_sip_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_hep_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_skinny_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -332,5 +335,6 @@ void init_yahoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
|
||||
void init_zattoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_zmq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_stracraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
|
||||
#endif /* __NDPI_PROTOCOLS_INCLUDE_FILE__ */
|
||||
|
||||
@@ -672,12 +672,10 @@ typedef struct ndpi_flow_struct {
|
||||
u_int16_t protocol_stack_info;
|
||||
|
||||
/* init parameter, internal used to set up timestamp,... */
|
||||
u_int16_t guessed_protocol_id;
|
||||
u_int16_t guessed_protocol_id, guessed_host_proto_id;
|
||||
|
||||
u_int8_t protocol_id_already_guessed:1;
|
||||
u_int8_t init_finished:1;
|
||||
u_int8_t setup_packet_direction:1;
|
||||
u_int8_t packet_direction:1; /* if ndpi_struct->direction_detect_disable == 1 */
|
||||
u_int8_t protocol_id_already_guessed:1, host_already_guessed:1, init_finished:1, setup_packet_direction:1, packet_direction:1;
|
||||
/* if ndpi_struct->direction_detect_disable == 1 */
|
||||
/* tcp sequence number connection tracking */
|
||||
u_int32_t next_tcp_seq_nr[2];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user