Merge pull request #1 from kYroL01/no_real

No real
This commit is contained in:
Michele Campus
2015-06-29 16:56:54 +02:00
145 changed files with 618 additions and 617 deletions
+1 -1
View File
@@ -155,7 +155,7 @@ extern "C" {
* @param ndpi_struct the detection module
* @return the protocol id of the last real protocol found in the protocol history of the flow
*/
u_int16_t ndpi_detection_get_real_protocol_of_flow(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
/* u_int16_t ndpi_detection_get_real_protocol_of_flow(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); */
/**
* returns true if the protocol history of the flow of the last packet given to the detection
+1 -1
View File
@@ -168,7 +168,7 @@
/**********************
* detection features *
**********************/
#define NDPI_SELECT_DETECTION_WITH_REAL_PROTOCOL ( 1 << 0 )
/* #define NDPI_SELECT_DETECTION_WITH_REAL_PROTOCOL ( 1 << 0 ) */
#define NDPI_DIRECTCONNECT_CONNECTION_IP_TICK_TIMEOUT 600
#define NDPI_IRC_CONNECTION_TIMEOUT 120
+4 -4
View File
@@ -100,7 +100,7 @@ u_int32_t ndpi_bytestream_to_ipv4(const u_int8_t * str, u_int16_t max_chars_to_r
void ndpi_int_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow,
u_int16_t detected_protocol, ndpi_protocol_type_t protocol_type);
u_int16_t detected_protocol/* , ndpi_protocol_type_t protocol_type */);
/* function to parse a packet which has line based information into a line based structure
@@ -112,11 +112,11 @@ extern void ndpi_parse_packet_line_info_any(struct ndpi_detection_module_struct
extern u_int16_t ndpi_check_for_email_address(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, u_int16_t counter);
extern void ndpi_int_change_packet_protocol(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow,
u_int16_t detected_protocol, ndpi_protocol_type_t protocol_type);
u_int16_t detected_protocol/* , ndpi_protocol_type_t protocol_type */);
extern void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow,
u_int16_t detected_protocol,
ndpi_protocol_type_t protocol_type);
u_int16_t detected_protocol/* , */
/* ndpi_protocol_type_t protocol_type */);
extern void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod,
ndpi_protocol_breed_t protoBreed, u_int16_t protoId,
u_int16_t tcp_alias_protoId[2], u_int16_t udp_alias_protoId[2],
+13 -13
View File
@@ -469,17 +469,17 @@ typedef struct ndpi_packet_struct {
/* this is for simple read-only access to the real protocol
* used for the main loop */
u_int16_t real_protocol_read_only;
/* u_int16_t real_protocol_read_only; */
#if NDPI_PROTOCOL_HISTORY_SIZE > 1
# if NDPI_PROTOCOL_HISTORY_SIZE > 5
# error protocol stack size not supported
# endif
struct {
u_int8_t entry_is_real_protocol:5;
u_int8_t current_stack_size_minus_one:3;
}
/* struct { */
/* u_int8_t entry_is_real_protocol:5; */
/* u_int8_t current_stack_size_minus_one:3; */
/* } */
#if !defined(WIN32)
__attribute__ ((__packed__))
#endif
@@ -677,10 +677,10 @@ typedef struct ndpi_flow_struct {
# error protocol stack size not supported
# endif
struct {
u_int8_t entry_is_real_protocol:5;
u_int8_t current_stack_size_minus_one:3;
}
/* struct { */
/* u_int8_t entry_is_real_protocol:5; */
/* u_int8_t current_stack_size_minus_one:3; */
/* } */
#if !defined(WIN32)
__attribute__ ((__packed__))
@@ -836,9 +836,9 @@ typedef struct ndpi_flow_struct {
struct ndpi_id_struct *dst;
} ndpi_flow_struct_t;
typedef enum {
NDPI_REAL_PROTOCOL = 0,
NDPI_CORRELATED_PROTOCOL = 1
} ndpi_protocol_type_t;
/* typedef enum { */
/* NDPI_REAL_PROTOCOL = 0, */
/* NDPI_CORRELATED_PROTOCOL = 1 */
/* } ndpi_protocol_type_t; */
#endif/* __NDPI_TYPEDEFS_FILE__ */