From 8cd0a8838abaa1d38697e8ec96eb2c1c1a290f21 Mon Sep 17 00:00:00 2001 From: Campus Date: Mon, 9 Nov 2015 13:39:33 +0100 Subject: fixing ndpiReader.c after previous changes --- example/ndpiReader.c | 180 ++++++++++++++++++++++++++------------------------- 1 file changed, 93 insertions(+), 87 deletions(-) (limited to 'example') diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 1b9f070d4..f850036cf 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -42,17 +42,15 @@ #include #include #include +#include #include "../config.h" +#include "ndpi_api.h" #ifdef HAVE_JSON_C #include #endif -#include "ndpi_api.h" - -#include - #define MAX_NUM_READER_THREADS 16 #define IDLE_SCAN_PERIOD 10 /* msec (use detection_tick_resolution = 1000) */ #define MAX_IDLE_TIME 30000 @@ -77,6 +75,7 @@ #define MPLS_UNI 0x8847 #define MPLS_MULTI 0x8848 #define PPPoE 0x8864 +#define SNAP 0xaa /* mask for FCF */ #define WIFI_DATA 0x2 /* 0000 0010 */ @@ -727,7 +726,7 @@ static struct ndpi_flow *get_ndpi_flow(u_int16_t thread_id, const u_int8_t version, u_int16_t vlan_id, const struct ndpi_iphdr *iph, - const struct ndpi_ip6_hdr *iph6, + const struct ndpi_ipv6hdr *iph6, u_int16_t ip_offset, u_int16_t ipsize, u_int16_t l4_packet_len, @@ -764,7 +763,7 @@ static struct ndpi_flow *get_ndpi_flow(u_int16_t thread_id, l4_offset = iph->ihl * 4; l3 = (u_int8_t*)iph; } else { - l4_offset = sizeof(struct ndpi_ip6_hdr); + l4_offset = sizeof(struct ndpi_ipv6hdr); l3 = (u_int8_t*)iph6; } @@ -941,7 +940,7 @@ static struct ndpi_flow *get_ndpi_flow(u_int16_t thread_id, static struct ndpi_flow *get_ndpi_flow6(u_int16_t thread_id, u_int16_t vlan_id, - const struct ndpi_ip6_hdr *iph6, + const struct ndpi_ipv6hdr *iph6, u_int16_t ip_offset, struct ndpi_tcphdr **tcph, struct ndpi_udphdr **udph, @@ -961,13 +960,13 @@ static struct ndpi_flow *get_ndpi_flow6(u_int16_t thread_id, iph.protocol = iph6->ip6_ctlun.ip6_un1.ip6_un1_nxt; if(iph.protocol == 0x3C /* IPv6 destination option */) { - u_int8_t *options = (u_int8_t*)iph6 + sizeof(const struct ndpi_ip6_hdr); + u_int8_t *options = (u_int8_t*)iph6 + sizeof(const struct ndpi_ipv6hdr); iph.protocol = options[0]; } return(get_ndpi_flow(thread_id, 6, vlan_id, &iph, iph6, ip_offset, - sizeof(struct ndpi_ip6_hdr), + sizeof(struct ndpi_ipv6hdr), ntohs(iph6->ip6_ctlun.ip6_un1.ip6_un1_plen), tcph, udph, sport, dport, src, dst, proto, payload, payload_len, src_to_dst_direction)); @@ -1027,7 +1026,7 @@ static unsigned int packet_processing(u_int16_t thread_id, const u_int64_t time, u_int16_t vlan_id, const struct ndpi_iphdr *iph, - struct ndpi_ip6_hdr *iph6, + struct ndpi_ipv6hdr *iph6, u_int16_t ip_offset, u_int16_t ipsize, u_int16_t rawsize) { struct ndpi_id_struct *src, *dst; @@ -1600,40 +1599,47 @@ static void pcap_packet_callback(u_char *args, /* * Declare pointers to packet headers */ - /** --- Ethernet header --- **/ + + /* --- Ethernet header --- */ const struct ndpi_ethhdr *ethernet; - /** --- Cisco HDLC header --- **/ + /* --- Ethernet II header --- */ + const struct ndpi_ethhdr *ethernet_2; + /* --- LLC header --- */ + const struct ndpi_llc_header *llc; + + /* --- Cisco HDLC header --- */ const struct ndpi_chdlc *chdlc; + /* --- SLARP frame --- */ + struct ndpi_slarp *slarp; + /* --- CDP --- */ + struct ndpi_cdp *cdp; - /** --- ieee802.11 --- **/ - /* Radio Tap header */ + /* --- Radio Tap header --- */ const struct ndpi_radiotap_header *radiotap; - /* LLC header */ - const struct ndpi_llc_header_proto *llc; - /* Data frame */ - const struct ndpi_wifi_data_frame *wifi_data; + /* --- Wifi header --- */ + const struct ndpi_wifi_header *wifi; - /* SLARP frame */ - struct ndpi_slarp *slarp; - /* CDP */ - struct ndpi_cdp *cdp; + /* --- MPLS header --- */ + struct ndpi_mpls_header *mpls; /** --- IP header --- **/ struct ndpi_iphdr *iph; /** --- IPv6 header --- **/ - struct ndpi_ip6_hdr *iph6; + struct ndpi_ipv6hdr *iph6; /* lengths and offsets */ u_int16_t eth_offset = 0; u_int16_t radio_len; u_int16_t fc; - int wifi_data_len; - int llc_len; - u_int16_t llc_ether_type; + u_int16_t type; + int wifi_len; + int llc_off; + int pyld_eth_len = 0; + int check; u_int32_t fcs; u_int64_t time; - u_int16_t type, ip_offset, ip_len, ip6_offset; + u_int16_t ip_offset, ip_len, ip6_offset; u_int16_t frag_off = 0, vlan_id = 0; u_int8_t proto = 0; u_int32_t label; @@ -1676,6 +1682,7 @@ static void pcap_packet_callback(u_char *args, datalink_check: switch(datalink_type) { + case DLT_NULL : if(ntohl(*((u_int32_t*)&packet[eth_offset])) == 2) type = ETH_P_IP; @@ -1684,7 +1691,7 @@ static void pcap_packet_callback(u_char *args, ip_offset = 4 + eth_offset; - /* Cisco PPP in HDLC-like framing - 50*/ + /* Cisco PPP in HDLC-like framing - 50 */ case DLT_PPP_SERIAL: chdlc = (struct ndpi_chdlc *) &packet[eth_offset]; ip_offset = sizeof(struct ndpi_chdlc); /* CHDLC_OFF = 4 */ @@ -1702,7 +1709,21 @@ static void pcap_packet_callback(u_char *args, case DLT_EN10MB : ethernet = (struct ndpi_ethhdr *) &packet[eth_offset]; ip_offset = sizeof(struct ndpi_ethhdr) + eth_offset; - type = ntohs(ethernet->h_proto); + check = ntohs(ethernet->h_lt); + + if(check <= 1500) + pyld_eth_len = check; + else if (check >= 1536) + type = check; + + if(pyld_eth_len != 0) { + /* check for LLC layer with SNAP extension */ + if(packet[ip_offset] == SNAP) { + llc = (struct ndpi_llc_header *)(&packet[ip_offset]); + type = llc->snap.proto_ID; + ip_offset += + 8; + } + } break; /* Linux Cooked Capture - 113 */ @@ -1726,73 +1747,67 @@ static void pcap_packet_callback(u_char *args, fcs = header->len - 4; /* Calculate 802.11 header length (variable) */ - wifi_data = (struct ndpi_wifi_data_frame*)( packet + eth_offset + radio_len); - fc = wifi_data->fc; + wifi = (struct ndpi_wifi_header*)( packet + eth_offset + radio_len); + fc = wifi->fc; /* check wifi data presence */ if(FCF_TYPE(fc) == WIFI_DATA) { if((FCF_TO_DS(fc) && FCF_FROM_DS(fc) == 0x0) || (FCF_TO_DS(fc) == 0x0 && FCF_FROM_DS(fc))) - wifi_data_len = 26; /* + 4 byte fcs */ - - /* TODO: check QoS Control for aggregated MSDU */ + wifi_len = 26; /* + 4 byte fcs */ } else /* no data frames */ break; /* Check ether_type from LLC */ - llc = (struct ndpi_llc_header_proto*)(packet + eth_offset + wifi_data_len + radio_len); - llc_ether_type = ntohs(llc->ether_IP_type); + llc = (struct ndpi_llc_header*)(packet + eth_offset + wifi_len + radio_len); + if(llc->dsap == SNAP) + type = ntohs(llc->snap.proto_ID); /* Set IP header offset */ - ip_offset = wifi_data_len + radio_len + sizeof(struct ndpi_llc_header_proto) + eth_offset; + ip_offset = wifi_len + radio_len + sizeof(struct ndpi_llc_header) + eth_offset; break; default: return; } - while(1) { - if(type == VLAN) { - vlan_id = ((packet[ip_offset] << 8) + packet[ip_offset+1]) & 0xFFF; - type = (packet[ip_offset+2] << 8) + packet[ip_offset+3]; + /* check ether type */ + if(type == VLAN) { + vlan_id = ((packet[ip_offset] << 8) + packet[ip_offset+1]) & 0xFFF; + type = (packet[ip_offset+2] << 8) + packet[ip_offset+3]; + ip_offset += 4; + vlan_packet = 1; + } + else if(type == MPLS_UNI || type == MPLS_MULTI) { + + mpls = (struct ndpi_mpls_header *) &packet[ip_offset]; + label = ntohl(mpls->label); + /* label = ntohl(*((u_int32_t*)&packet[ip_offset])); */ + ndpi_thread_info[thread_id].stats.mpls_count++; + type = ETH_P_IP, ip_offset += 4; + + while((label & 0x100) != 0x100) { ip_offset += 4; - vlan_packet = 1; - break; - } - else if(type == MPLS_UNI || type == MPLS_MULTI) { - label = ntohl(*((u_int32_t*)&packet[ip_offset])); - ndpi_thread_info[thread_id].stats.mpls_count++; - type = 0x800, ip_offset += 4; - - while((label & 0x100) != 0x100) { - ip_offset += 4; - label = ntohl(*((u_int32_t*)&packet[ip_offset])); - } - break; + label = ntohl(mpls->label); } - else if(type == SLARP) { - slarp = (struct ndpi_slarp *) &packet[ip_offset]; - if(slarp->slarp_type == 0x02 || slarp->slarp_type == 0x00 || slarp->slarp_type == 0x01) { - /* TODO if info are needed */ - } - slarp_pkts++; - break; - } - else if(type == CISCO_D_PROTO) { - cdp = (struct ndpi_cdp *) &packet[ip_offset]; - cdp_pkts++; - break; - } - else if(type == PPPoE) { - ndpi_thread_info[thread_id].stats.pppoe_count++; - type = 0x0800; - ip_offset += 8; - break; + } + else if(type == SLARP) { + slarp = (struct ndpi_slarp *) &packet[ip_offset]; + if(slarp->slarp_type == 0x02 || slarp->slarp_type == 0x00 || slarp->slarp_type == 0x01) { + /* TODO if info are needed */ } - else - break; - } /* while(1) */ - + slarp_pkts++; + } + else if(type == CISCO_D_PROTO) { + cdp = (struct ndpi_cdp *) &packet[ip_offset]; + cdp_pkts++; + } + else if(type == PPPoE) { + ndpi_thread_info[thread_id].stats.pppoe_count++; + type = ETH_P_IP; + ip_offset += 8; + } + ndpi_thread_info[thread_id].stats.vlan_count += vlan_packet; iph_check: @@ -1836,9 +1851,9 @@ static void pcap_packet_callback(u_char *args, return; } } else if(iph->version == 6) { - iph6 = (struct ndpi_ip6_hdr *)&packet[ip_offset]; + iph6 = (struct ndpi_ipv6hdr *)&packet[ip_offset]; proto = iph6->ip6_ctlun.ip6_un1.ip6_un1_nxt; - ip_len = sizeof(struct ndpi_ip6_hdr); + ip_len = sizeof(struct ndpi_ipv6hdr); if(proto == 0x3C /* IPv6 destination option */) { @@ -1848,15 +1863,6 @@ static void pcap_packet_callback(u_char *args, } iph = NULL; - /* tunnel 6in4 */ - /* ipv6in4: */ - /* ip6_offset = ip_len + ip_offset; */ - /* iph6 = (struct ndpi_ip6_hdr *)&packet[ip6_offset]; */ - /* proto = iph6->ip6_ctlun.ip6_un1.ip6_un1_nxt; */ - /* ip_len = sizeof(struct ndpi_ip6_hdr); */ - /* ip_offset = ip_len + ip6_offset; */ - /* iph = NULL; */ - } else { static u_int8_t ipv4_warning_used = 0; -- cgit v1.2.3 From 78eceb43a16fab912f204a1684f7f228350a5e94 Mon Sep 17 00:00:00 2001 From: Campus Date: Tue, 10 Nov 2015 01:12:00 +0100 Subject: deleted useless or not used functions and #ifdef --- example/ndpiReader.c | 4 +- src/include/ndpi_api.h | 24 +-------- src/include/ndpi_main.h | 34 ++++++------ src/include/ndpi_typedefs.h | 17 +++--- src/lib/ndpi_main.c | 128 +++++++++++++++----------------------------- 5 files changed, 69 insertions(+), 138 deletions(-) (limited to 'example') diff --git a/example/ndpiReader.c b/example/ndpiReader.c index f850036cf..40ef7cf6b 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -994,8 +994,8 @@ static void setupDetection(u_int16_t thread_id) { ndpi_set_protocol_detection_bitmask2(ndpi_thread_info[thread_id].ndpi_struct, &all); // allocate memory for id and flow tracking - size_id_struct = ndpi_detection_get_sizeof_ndpi_id_struct(); - size_flow_struct = ndpi_detection_get_sizeof_ndpi_flow_struct(); + size_id_struct = sizeof(struct ndpi_id_struct); + size_flow_struct = sizeof(struct ndpi_flow_struct); // clear memory for results memset(ndpi_thread_info[thread_id].stats.protocol_counter, 0, sizeof(ndpi_thread_info[thread_id].stats.protocol_counter)); diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index 7b4550150..c1f7fac84 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -32,26 +32,14 @@ extern "C" { #endif - /** - * This function returns the size of the flow struct - * @return the size of the flow struct - */ - u_int32_t ndpi_detection_get_sizeof_ndpi_flow_struct(void); - - /** - * This function returns the size of the id struct - * @return the size of the id struct - */ - u_int32_t ndpi_detection_get_sizeof_ndpi_id_struct(void); - - /* Public malloc/free */ void* ndpi_malloc(unsigned long size); void* ndpi_calloc(unsigned long count, unsigned long size); void ndpi_free(void *ptr); void *ndpi_realloc(void *ptr, size_t old_size, size_t new_size); char *ndpi_strdup(const char *s); - /* + + /** * Find the first occurrence of find in s, where the search is limited to the * first slen characters of s. */ @@ -150,14 +138,6 @@ extern "C" { */ u_int8_t ndpi_detection_get_l4(const u_int8_t * l3, u_int16_t l3_len, const u_int8_t ** l4_return, u_int16_t * l4_len_return, u_int8_t * l4_protocol_return, u_int32_t flags); - /** - * returns the real protocol for the flow of the last packet given to the detection. - * if no real protocol could be found, the unknown protocol will be returned. - * - * @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); */ /** * returns true if the protocol history of the flow of the last packet given to the detection diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h index a9414bfef..c570a5833 100644 --- a/src/include/ndpi_main.h +++ b/src/include/ndpi_main.h @@ -55,6 +55,7 @@ #include "ndpi_protocol_ids.h" #include "ndpi_typedefs.h" #include "ndpi_protocols.h" +#include "ndpi_api.h" void *ndpi_tdelete(const void * __restrict, void ** __restrict, @@ -89,43 +90,40 @@ void ndpi_set_detected_protocol(struct ndpi_detection_module_struct *ndpi_struct u_int16_t upper_detected_protocol, u_int16_t lower_detected_protocol); - -/* function to parse a packet which has line based information into a line based structure - * this function will also set some well known line pointers like: - * - host, user agent, empty line,.... - */ extern void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); extern void ndpi_parse_packet_line_info_any(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); + 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, + +extern void ndpi_int_change_packet_protocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, u_int16_t upper_detected_protocol, u_int16_t lower_detected_protocol); -extern void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow, +extern void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, u_int16_t upper_detected_protocol, u_int16_t lower_detected_protocol); -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], - char *protoName, +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], char *protoName, ndpi_port_range *tcpDefPorts, ndpi_port_range *udpDefPorts); + extern void ndpi_int_reset_packet_protocol(struct ndpi_packet_struct *packet); extern void ndpi_int_reset_protocol(struct ndpi_flow_struct *flow); + extern int ndpi_packet_src_ip_eql(const struct ndpi_packet_struct *packet, const ndpi_ip_addr_t * ip); extern int ndpi_packet_dst_ip_eql(const struct ndpi_packet_struct *packet, const ndpi_ip_addr_t * ip); extern void ndpi_packet_src_ip_get(const struct ndpi_packet_struct *packet, ndpi_ip_addr_t * ip); extern void ndpi_packet_dst_ip_get(const struct ndpi_packet_struct *packet, ndpi_ip_addr_t * ip); + extern char *ndpi_get_ip_string(struct ndpi_detection_module_struct *ndpi_struct, const ndpi_ip_addr_t * ip); -extern char *ndpi_get_packet_src_ip_string(struct ndpi_detection_module_struct *ndpi_struct, - const struct ndpi_packet_struct *packet); +extern char *ndpi_get_packet_src_ip_string(struct ndpi_detection_module_struct *ndpi_struct, const struct ndpi_packet_struct *packet); extern char* ndpi_get_proto_by_id(struct ndpi_detection_module_struct *ndpi_mod, u_int id); + extern u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_struct, u_int8_t proto, u_int16_t sport, u_int16_t dport); + extern u_int8_t ndpi_is_proto(ndpi_protocol p, u_int16_t proto); + extern u_int16_t ndpi_get_lower_proto(ndpi_protocol p); -extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct *ndpi_struct, - u_int16_t protocol_id, +extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t protocol_id, u_int16_t** tcp_master_proto, u_int16_t** udp_master_proto); @@ -134,6 +132,4 @@ void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct * const char **file, const char **func, u_int32_t * line); #endif -#include "ndpi_api.h" - #endif /* __NDPI_MAIN_INCLUDE_FILE__ */ diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 07e99b31c..16e0b6d0b 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -314,16 +314,13 @@ typedef enum { } ndpi_http_method; typedef struct ndpi_id_struct { - /* detected_protocol_bitmask: - * access this bitmask to find out whether an id has used skype or not - * if a flag is set here, it will not be resetted - * to compare this, use: - * if (NDPI_BITMASK_COMPARE(id->detected_protocol_bitmask, - * NDPI_PROTOCOL_BITMASK_XXX) != 0) - * { - * // protocol XXX detected on this id - * } - */ + + /** + detected_protocol_bitmask: + access this bitmask to find out whether an id has used skype or not + if a flag is set here, it will not be resetted + to compare this, use: + **/ NDPI_PROTOCOL_BITMASK detected_protocol_bitmask; #ifdef NDPI_PROTOCOL_RTSP ndpi_ip_addr_t rtsp_ip_address; diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index eb350bd3a..6ed7d5521 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -29,8 +29,6 @@ #include "ndpi_api.h" #include "../../config.h" -// #define DEBUG - #include #ifndef WIN32 #include @@ -40,12 +38,9 @@ #include "third_party/include/ndpi_patricia.h" #include "third_party/src/ndpi_patricia.c" -#ifdef WIN32 -/* http://social.msdn.microsoft.com/Forums/uk/vcgeneral/thread/963aac07-da1a-4612-be4a-faac3f1d65ca */ -#ifndef strtok_r -#define strtok_r(a,b,c) strtok(a,b) -#endif -#endif +/* #ifndef strtok_r */ +/* #define strtok_r(a,b,c) strtok(a,b) */ +/* #endif */ /* ftp://ftp.cc.uoc.gr/mirrors/OpenBSD/src/lib/libc/stdlib/tsearch.c */ /* find or insert datum into search tree */ @@ -344,19 +339,6 @@ char *ndpi_strdup(const char *s) { return(m); } -/* ****************************************** */ - -u_int32_t ndpi_detection_get_sizeof_ndpi_flow_struct(void) -{ - return sizeof(struct ndpi_flow_struct); -} - -/* ****************************************** */ - -u_int32_t ndpi_detection_get_sizeof_ndpi_id_struct(void) -{ - return sizeof(struct ndpi_id_struct); -} /* ******************************************************************** */ @@ -439,15 +421,6 @@ void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod, if(udpDefPorts[j].port_low != 0) addDefaultPort(&udpDefPorts[j], &ndpi_mod->proto_defaults[protoId], &ndpi_mod->udpRoot); if(tcpDefPorts[j].port_low != 0) addDefaultPort(&tcpDefPorts[j], &ndpi_mod->proto_defaults[protoId], &ndpi_mod->tcpRoot); } - -#if 0 - printf("%s(%d, %s, %p) [%s]\n", - __FUNCTION__, - protoId, - ndpi_mod->proto_defaults[protoId].protoName, - ndpi_mod, - ndpi_mod->proto_defaults[1].protoName); -#endif } /* ******************************************************************** */ @@ -2547,8 +2520,7 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n * nxt_hdr: protocol of the actual payload * returns 0 upon success and 1 upon failure */ -static int ndpi_handle_ipv6_extension_headers(struct ndpi_detection_module_struct *ndpi_struct, - const u_int8_t ** l4ptr, u_int16_t * l4len, u_int8_t * nxt_hdr) +static int ndpi_handle_ipv6_extension_headers(struct ndpi_detection_module_struct *ndpi_struct, const u_int8_t ** l4ptr, u_int16_t * l4len, u_int8_t * nxt_hdr) { while ((*nxt_hdr == 0 || *nxt_hdr == 43 || *nxt_hdr == 44 || *nxt_hdr == 60 || *nxt_hdr == 135 || *nxt_hdr == 59)) { u_int16_t ehdr_len; @@ -2683,11 +2655,6 @@ static u_int8_t ndpi_detection_get_l4_internal(struct ndpi_detection_module_stru return 0; } -#if !defined(WIN32) -#define ATTRIBUTE_ALWAYS_INLINE static inline -#else -__forceinline static -#endif void ndpi_apply_flow_protocol_to_packet(struct ndpi_flow_struct *flow, struct ndpi_packet_struct *packet) { @@ -2813,12 +2780,6 @@ static int ndpi_init_packet_header(struct ndpi_detection_module_struct *ndpi_str return 0; } - -#if !defined(WIN32) -static inline -#else -__forceinline static -#endif void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { @@ -2831,9 +2792,6 @@ void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_struct, const struct ndpi_tcphdr *tcph = packet->tcp; const struct ndpi_udphdr *udph = flow->packet.udp; - //struct ndpi_unique_flow_struct unique_flow; - //uint8_t new_connection; - u_int8_t proxy_enabled = 0; packet->tcp_retransmission = 0, packet->packet_direction = 0; @@ -4418,44 +4376,44 @@ void NDPI_DUMP_BITMASK(NDPI_PROTOCOL_BITMASK a) { } -#ifdef WIN32 -/* http://www.opensource.apple.com/source/xnu/xnu-1456.1.26/bsd/libkern/strsep.c */ - -/* - * Get next token from string *stringp, where tokens are possibly-empty - * strings separated by characters from delim. - * - * Writes NULs into the string at *stringp to end tokens. - * delim need not remain constant from call to call. - * On return, *stringp points past the last NUL written (if there might - * be further tokens), or is NULL (if there are definitely no more tokens). - * - * If *stringp is NULL, strsep returns NULL. - */ -char* strsep(char **stringp, const char *delim) { - char *s; - const char *spanp; - int c, sc; - char *tok; - - if((s = *stringp) == NULL) - return (NULL); - for(tok = s;;) { - c = *s++; - spanp = delim; - do { - if((sc = *spanp++) == c) { - if(c == 0) - s = NULL; - else - s[-1] = 0; - *stringp = s; - return (tok); - } - } while (sc != 0); - } - /* NOTREACHED */ -} -#endif +/* #ifdef WIN32 */ +/* /\* http://www.opensource.apple.com/source/xnu/xnu-1456.1.26/bsd/libkern/strsep.c *\/ */ + +/* /\* */ +/* * Get next token from string *stringp, where tokens are possibly-empty */ +/* * strings separated by characters from delim. */ +/* * */ +/* * Writes NULs into the string at *stringp to end tokens. */ +/* * delim need not remain constant from call to call. */ +/* * On return, *stringp points past the last NUL written (if there might */ +/* * be further tokens), or is NULL (if there are definitely no more tokens). */ +/* * */ +/* * If *stringp is NULL, strsep returns NULL. */ +/* *\/ */ +/* char* strsep(char **stringp, const char *delim) { */ +/* char *s; */ +/* const char *spanp; */ +/* int c, sc; */ +/* char *tok; */ + +/* if((s = *stringp) == NULL) */ +/* return (NULL); */ +/* for(tok = s;;) { */ +/* c = *s++; */ +/* spanp = delim; */ +/* do { */ +/* if((sc = *spanp++) == c) { */ +/* if(c == 0) */ +/* s = NULL; */ +/* else */ +/* s[-1] = 0; */ +/* *stringp = s; */ +/* return (tok); */ +/* } */ +/* } while (sc != 0); */ +/* } */ +/* /\* NOTREACHED *\/ */ +/* } */ +/* #endif */ -- cgit v1.2.3 From a4f170604ce97b12718181fd43f506edbdb0b0d5 Mon Sep 17 00:00:00 2001 From: Campus Date: Thu, 12 Nov 2015 12:08:41 +0100 Subject: removed kernel support and #if 0s --- example/ndpiReader.c | 50 --------------------------- src/include/ndpi_define.h | 6 ---- src/lib/ndpi_main.c | 25 ++------------ src/lib/protocols/bittorrent.c | 7 ---- src/lib/protocols/btlib.c | 7 +--- src/lib/protocols/btlib.h | 2 -- src/lib/protocols/citrix.c | 9 ----- src/lib/protocols/directdownloadlink.c | 21 +++--------- src/lib/protocols/gtp.c | 8 ----- src/lib/protocols/http.c | 8 ----- src/lib/protocols/lotus_notes.c | 14 -------- src/lib/protocols/netflow.c | 2 -- src/lib/protocols/radius.c | 8 ----- src/lib/protocols/tor.c | 2 -- src/lib/third_party/include/ndpi_patricia.h | 7 ---- src/lib/third_party/src/ahocorasick.c | 4 --- src/lib/third_party/src/ndpi_patricia.c | 52 +++++++---------------------- src/lib/third_party/src/node.c | 4 --- src/lib/third_party/src/sort.c | 38 --------------------- 19 files changed, 20 insertions(+), 254 deletions(-) (limited to 'example') diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 40ef7cf6b..88dba03e9 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -653,16 +653,6 @@ static void node_proto_guess_walker(const void *node, ndpi_VISIT which, int dept struct ndpi_flow *flow = *(struct ndpi_flow **) node; u_int16_t thread_id = *((u_int16_t *) user_data); -#if 0 - printf("<%d>Walk on node %s (%p)\n", - depth, - which == preorder?"preorder": - which == postorder?"postorder": - which == endorder?"endorder": - which == leaf?"leaf": "unknown", - flow); -#endif - if((which == ndpi_preorder) || (which == ndpi_leaf)) { /* Avoid walking the same node multiple times */ if(enable_protocol_guess) { if(flow->detected_protocol.protocol == NDPI_PROTOCOL_UNKNOWN) { @@ -1083,31 +1073,6 @@ static unsigned int packet_processing(u_int16_t thread_id, snprintf(flow->ssl.server_certificate, sizeof(flow->ssl.server_certificate), "%s", flow->ndpi_flow->protos.ssl.server_certificate); } -#if 0 - if(verbose > 1) { - if(ndpi_is_proto(flow->detected_protocol, NDPI_PROTOCOL_HTTP)) { - char *method; - - printf("[URL] %s\n", ndpi_get_http_url(ndpi_thread_info[thread_id].ndpi_struct, ndpi_flow)); - printf("[Content-Type] %s\n", ndpi_get_http_content_type(ndpi_thread_info[thread_id].ndpi_struct, ndpi_flow)); - - switch(ndpi_get_http_method(ndpi_thread_info[thread_id].ndpi_struct, ndpi_flow)) { - case HTTP_METHOD_OPTIONS: method = "HTTP_METHOD_OPTIONS"; break; - case HTTP_METHOD_GET: method = "HTTP_METHOD_GET"; break; - case HTTP_METHOD_HEAD: method = "HTTP_METHOD_HEAD"; break; - case HTTP_METHOD_POST: method = "HTTP_METHOD_POST"; break; - case HTTP_METHOD_PUT: method = "HTTP_METHOD_PUT"; break; - case HTTP_METHOD_DELETE: method = "HTTP_METHOD_DELETE"; break; - case HTTP_METHOD_TRACE: method = "HTTP_METHOD_TRACE"; break; - case HTTP_METHOD_CONNECT: method = "HTTP_METHOD_CONNECT"; break; - default: method = "HTTP_METHOD_UNKNOWN"; break; - } - - printf("[Method] %s\n", method); - } - } -#endif - free_ndpi_flow(flow); if(verbose > 1) { @@ -1122,11 +1087,6 @@ static unsigned int packet_processing(u_int16_t thread_id, } } -#if 0 - if(ndpi_flow->l4.tcp.host_server_name[0] != '\0') - printf("%s\n", ndpi_flow->l4.tcp.host_server_name); -#endif - if(live_capture) { if(ndpi_thread_info[thread_id].last_idle_scan_time + IDLE_SCAN_PERIOD < ndpi_thread_info[thread_id].last_time) { /* scan for idle flows */ @@ -2077,16 +2037,6 @@ struct timezone { /* ***************************************************** */ -#if 0 -int gettimeofday(struct timeval *tv, void *notUsed) { - tv->tv_sec = time(NULL); - tv->tv_usec = 0; - return(0); -} -#endif - -/* ***************************************************** */ - int gettimeofday(struct timeval *tv, struct timezone *tz) { FILETIME ft; LARGE_INTEGER li; diff --git a/src/include/ndpi_define.h b/src/include/ndpi_define.h index 8d70bc337..cfae5f305 100644 --- a/src/include/ndpi_define.h +++ b/src/include/ndpi_define.h @@ -42,12 +42,6 @@ #endif/* BYTE_ORDER */ #endif/* __OPENBSD__ */ -#if 0 -#ifndef NDPI_ENABLE_DEBUG_MESSAGES -#define NDPI_ENABLE_DEBUG_MESSAGES -#endif -#endif - #ifdef WIN32 #define __LITTLE_ENDIAN__ 1 #endif diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index ef6f96387..23977334e 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -3171,16 +3171,7 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct goto ret_protocols; } } - -#if 0 - a = flow->detected_protocol_stack[0]; - if(a != NDPI_PROTOCOL_UNKNOWN) { - NDPI_LOG(NDPI_PROTOCOL_UNKNOWN, ndpi_struct, NDPI_LOG_TRACE, "PROCESS KNOWN PROTOCOL\n"); - ndpi_struct->proto_defaults[a].func(ndpi_struct, flow); - return a; - } -#endif - + check_ndpi_flow_func(ndpi_struct, flow, &ndpi_selection_packet); a = flow->packet.detected_protocol_stack[0]; @@ -3216,18 +3207,8 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct flow->host_already_guessed = 1; } -#if 0 - /* Swap protocols in case of success */ - if(ret.master_protocol != NDPI_PROTOCOL_UNKNOWN) { - u_int16_t t = ret.master_protocol; - - ret.master_protocol = ret.protocol; - ret.protocol = t; - } -#endif - - if((ret.protocol == NDPI_PROTOCOL_UNKNOWN) && (ret.master_protocol != NDPI_PROTOCOL_UNKNOWN)) - ret.protocol = flow->guessed_host_proto_id; + if((ret.protocol == NDPI_PROTOCOL_UNKNOWN) && (ret.master_protocol != NDPI_PROTOCOL_UNKNOWN)) + ret.protocol = flow->guessed_host_proto_id; return(ret); } diff --git a/src/lib/protocols/bittorrent.c b/src/lib/protocols/bittorrent.c index e7f55a78d..99420b85e 100644 --- a/src/lib/protocols/bittorrent.c +++ b/src/lib/protocols/bittorrent.c @@ -432,14 +432,7 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st u_int32_t ts = ntohl(*((u_int32_t*)&(packet->payload[4]))); u_int32_t now; -#ifndef __KERNEL__ now = (u_int32_t)time(NULL); -#else - struct timespec t; - - getnstimeofday(&t); - now = t.tv_sec; -#endif if((ts < (now+86400)) && (ts > (now-86400))) { goto bittorrent_found; diff --git a/src/lib/protocols/btlib.c b/src/lib/protocols/btlib.c index 6442c7db7..beea43d0d 100644 --- a/src/lib/protocols/btlib.c +++ b/src/lib/protocols/btlib.c @@ -42,8 +42,6 @@ typedef signed long long int i_int64_t; #include "btlib.h" -#ifndef __KERNEL__ - int bt_parse_debug = 0; static char *printXb(char *s,const u_int8_t *b,int l) { @@ -183,11 +181,8 @@ static void _print_safe_str(char *msg,char *k,const u_int8_t *s,size_t l) { static void print_safe_str(char *msg,bt_parse_data_cb_t *cbd) { _print_safe_str(msg,cbd->buf,cbd->v.s.s,cbd->v.s.l); } -#define DEBUG_TRACE(cmd) { if(bt_parse_debug) cmd; } -#else -#define DEBUG_TRACE(cmd,args...) -#endif /* __KERNEL */ +#define DEBUG_TRACE(cmd) { if(bt_parse_debug) cmd; } #define STREQ(a,b) !strcmp(a,b) diff --git a/src/lib/protocols/btlib.h b/src/lib/protocols/btlib.h index cc2928155..db68370c9 100644 --- a/src/lib/protocols/btlib.h +++ b/src/lib/protocols/btlib.h @@ -139,9 +139,7 @@ typedef struct bt_parse_data_cb { } v; } bt_parse_data_cb_t; -#ifndef __KERNEL__ extern int bt_parse_debug; void dump_bt_proto_struct(struct bt_parse_protocol *p); -#endif const u_int8_t *bt_decode(const u_int8_t *b, size_t *l, int *ret, bt_parse_data_cb_t *cbd); diff --git a/src/lib/protocols/citrix.c b/src/lib/protocols/citrix.c index d03c0cbe6..92607579c 100644 --- a/src/lib/protocols/citrix.c +++ b/src/lib/protocols/citrix.c @@ -33,14 +33,6 @@ static void ndpi_check_citrix(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_packet_struct *packet = &flow->packet; u_int32_t payload_len = packet->payload_packet_len; -#if 0 - printf("[len=%u][%02X %02X %02X %02X]\n", payload_len, - packet->payload[0] & 0xFF, - packet->payload[1] & 0xFF, - packet->payload[2] & 0xFF, - packet->payload[3] & 0xFF); -#endif - if(packet->tcp != NULL) { flow->l4.tcp.citrix_packet_id++; @@ -70,7 +62,6 @@ static void ndpi_check_citrix(struct ndpi_detection_module_struct *ndpi_struct, return; } - NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CITRIX); } else if(flow->l4.tcp.citrix_packet_id > 3) NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CITRIX); diff --git a/src/lib/protocols/directdownloadlink.c b/src/lib/protocols/directdownloadlink.c index 846c60170..24375c90f 100644 --- a/src/lib/protocols/directdownloadlink.c +++ b/src/lib/protocols/directdownloadlink.c @@ -709,23 +709,10 @@ void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *n { struct ndpi_packet_struct *packet = &flow->packet; - // struct ndpi_id_struct *src=ndpi_struct->src; - // struct ndpi_id_struct *dst=ndpi_struct->dst; -#if 0 - if (ndpi_struct->direct_download_link_counter_callback != NULL) { - if (packet->detected_protocol == NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK) { - /* skip packets not requests from the client to the server */ - if (packet->packet_direction == flow->l4.tcp.ddlink_server_direction) { - search_ddl_domains(ndpi_struct, flow); // do the detection again in order to get the URL in keep alive streams - } else { - // just count the packet - ndpi_struct->direct_download_link_counter_callback(flow->hash_id_number, packet->l3_packet_len); - } - } - return; - } -#endif - // do not detect again if it is already ddl + /* struct ndpi_id_struct *src=ndpi_struct->src; */ + /* struct ndpi_id_struct *dst=ndpi_struct->dst; */ + + /* do not detect again if it is already ddl */ if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK) { if (search_ddl_domains(ndpi_struct, flow) != 0) { return; diff --git a/src/lib/protocols/gtp.c b/src/lib/protocols/gtp.c index ec2c1099e..97044f94e 100644 --- a/src/lib/protocols/gtp.c +++ b/src/lib/protocols/gtp.c @@ -35,14 +35,6 @@ static void ndpi_check_gtp(struct ndpi_detection_module_struct *ndpi_struct, str // const u_int8_t *packet_payload = packet->payload; u_int32_t payload_len = packet->payload_packet_len; -#if 0 - printf("[len=%u][%02X %02X %02X %02X]\n", payload_len, - packet->payload[0] & 0xFF, - packet->payload[1] & 0xFF, - packet->payload[2] & 0xFF, - packet->payload[3] & 0xFF); -#endif - if((packet->udp != NULL) && (payload_len > sizeof(struct gtp_header_generic))) { u_int32_t gtp_u = ntohs(2152); u_int32_t gtp_c = ntohs(2123); diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c index 9314dba65..ced34c099 100644 --- a/src/lib/protocols/http.c +++ b/src/lib/protocols/http.c @@ -349,14 +349,6 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_ NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "User Agent Type Line found %.*s\n", packet->user_agent_line.len, packet->user_agent_line.ptr); - -#if 0 - if((ndpi_struct->http_dont_dissect_response) || flow->http_detected) - ndpi_match_content_subprotocol(ndpi_struct, flow, - (char*)packet->user_agent_line.ptr, - packet->user_agent_line.len, - NDPI_PROTOCOL_HTTP); -#endif } /* check for host line */ diff --git a/src/lib/protocols/lotus_notes.c b/src/lib/protocols/lotus_notes.c index d0b3aa50f..37c4cf896 100644 --- a/src/lib/protocols/lotus_notes.c +++ b/src/lib/protocols/lotus_notes.c @@ -35,20 +35,6 @@ static void ndpi_check_lotus_notes(struct ndpi_detection_module_struct *ndpi_str if(packet->tcp != NULL) { flow->l4.tcp.lotus_notes_packet_id++; -#if 0 - printf("[lotus_notes_packet_id: %u][len=%u][%02X %02X %02X %02X %02X %02X %02X %02X]\n", - flow->l4.tcp.lotus_notes_packet_id, payload_len, - packet->payload[6] & 0xFF, - packet->payload[7] & 0xFF, - packet->payload[8] & 0xFF, - packet->payload[9] & 0xFF, - packet->payload[10] & 0xFF, - packet->payload[11] & 0xFF, - packet->payload[12] & 0xFF, - packet->payload[13] & 0xFF - ); -#endif - if((flow->l4.tcp.lotus_notes_packet_id == 1) /* We have seen the 3-way handshake */ && flow->l4.tcp.seen_syn diff --git a/src/lib/protocols/netflow.c b/src/lib/protocols/netflow.c index 30bb898f2..54c634263 100644 --- a/src/lib/protocols/netflow.c +++ b/src/lib/protocols/netflow.c @@ -23,12 +23,10 @@ #ifdef NDPI_PROTOCOL_NETFLOW -#ifndef __KERNEL__ #ifdef WIN32 extern int gettimeofday(struct timeval * tp, struct timezone * tzp); #endif #define do_gettimeofday(a) gettimeofday(a, NULL) -#endif struct flow_ver1_rec { u_int32_t srcaddr; /* Source IP Address */ diff --git a/src/lib/protocols/radius.c b/src/lib/protocols/radius.c index 09f26793b..625dc4108 100644 --- a/src/lib/protocols/radius.c +++ b/src/lib/protocols/radius.c @@ -35,14 +35,6 @@ static void ndpi_check_radius(struct ndpi_detection_module_struct *ndpi_struct, // const u_int8_t *packet_payload = packet->payload; u_int32_t payload_len = packet->payload_packet_len; -#if 0 - printf("[len=%u][%02X %02X %02X %02X]\n", payload_len, - packet->payload[0] & 0xFF, - packet->payload[1] & 0xFF, - packet->payload[2] & 0xFF, - packet->payload[3] & 0xFF); -#endif - if(packet->udp != NULL) { struct radius_header *h = (struct radius_header*)packet->payload; u_int len = ntohs(h->len); diff --git a/src/lib/protocols/tor.c b/src/lib/protocols/tor.c index 036162b1f..f2c2eae4c 100644 --- a/src/lib/protocols/tor.c +++ b/src/lib/protocols/tor.c @@ -66,13 +66,11 @@ int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct, ndpi_int_tor_add_connection(ndpi_struct, flow); return(1); } else { -#ifndef __KERNEL__ #ifdef PENDANTIC_TOR_CHECK if(gethostbyname(certificate) == NULL) { ndpi_int_tor_add_connection(ndpi_struct, flow); return(1); } -#endif #endif } diff --git a/src/lib/third_party/include/ndpi_patricia.h b/src/lib/third_party/include/ndpi_patricia.h index 651e52fc9..3053cf9e1 100644 --- a/src/lib/third_party/include/ndpi_patricia.h +++ b/src/lib/third_party/include/ndpi_patricia.h @@ -51,18 +51,13 @@ /* { from defs.h */ #define prefix_touchar(prefix) ((u_char *)&(prefix)->add.sin) -#ifdef __KERNEL__ -#define MAXLINE 512 -#else #define MAXLINE 1024 -#endif #define BIT_TEST(f, b) ((f) & (b)) /* } */ #define addroute make_and_lookup -#ifndef __KERNEL__ #include /* for u_* definitions (on FreeBSD 5) */ #include /* for EAFNOSUPPORT */ @@ -81,8 +76,6 @@ #include /* IPv6 */ #endif -#endif /* __KERNEL__ */ - /* { from mrt.h */ typedef struct the_prefix4_t { diff --git a/src/lib/third_party/src/ahocorasick.c b/src/lib/third_party/src/ahocorasick.c index 54a97e776..ce064033f 100644 --- a/src/lib/third_party/src/ahocorasick.c +++ b/src/lib/third_party/src/ahocorasick.c @@ -18,12 +18,10 @@ along with multifast. If not, see . */ -#ifndef __KERNEL__ #include #include #include #include -#endif #include "ndpi_api.h" #include "ahocorasick.h" @@ -245,7 +243,6 @@ void ac_automata_release (AC_AUTOMATA_t * thiz) ndpi_free(thiz); } -#ifndef __KERNEL__ /****************************************************************************** * FUNCTION: ac_automata_display * Prints the automata to output in human readable form. it is useful for @@ -299,7 +296,6 @@ void ac_automata_display (AC_AUTOMATA_t * thiz, char repcast) printf("---------------------------------\n"); } } -#endif /* __KERNEL__ */ /****************************************************************************** * FUNCTION: ac_automata_register_nodeptr diff --git a/src/lib/third_party/src/ndpi_patricia.c b/src/lib/third_party/src/ndpi_patricia.c index 59d17e556..0a8fa857d 100644 --- a/src/lib/third_party/src/ndpi_patricia.c +++ b/src/lib/third_party/src/ndpi_patricia.c @@ -39,7 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __KERNEL__ #include /* assert */ #include /* isdigit */ #include /* errno */ @@ -54,26 +53,8 @@ #include /* BSD, Linux: for inet_addr */ #include /* BSD, Linux, Solaris: for inet_addr */ #endif -#else -#define assert(a) ; -#endif /* __KERNEL__ */ - #include "ndpi_patricia.h" - -#ifdef __KERNEL__ - -long atol(const char *nptr) { - long l; - char *endp; - - l = simple_strtol(nptr, &endp, 10); - return(l); -} -#endif - -// #define PATRICIA_DEBUG - void ndpi_DeleteEntry(void *a) { ndpi_free(a); } @@ -126,7 +107,7 @@ inet_pton (int af, const char *src, void *dst) } } #ifdef NT -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) else if(af == AF_INET6) { struct in6_addr Address; return (inet6_addr(src, &Address)); @@ -175,15 +156,13 @@ ndpi_my_inet_pton (int af, const char *src, void *dst) } memcpy (dst, xp, sizeof(struct in_addr)); return (1); -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) } else if(af == AF_INET6) { - return (inet_pton (af, src, dst)); + return (inet_pton (af, src, dst)); #endif /* PATRICIA_IPV6 */ - } else { + } else { #ifndef NT -#ifndef __KERNEL__ - errno = EAFNOSUPPORT; -#endif + errno = EAFNOSUPPORT; #endif /* NT */ return -1; } @@ -236,7 +215,7 @@ ndpi_prefix_toa2x (prefix_t *prefix, char *buff, int with_len) } return (buff); } -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) else if(prefix->family == AF_INET6) { char *r; r = (char *) inet_ntop (AF_INET6, &prefix->add.sin6, buff, 48 /* a guess value */ ); @@ -274,7 +253,7 @@ ndpi_New_Prefix2 (int family, void *dest, int bitlen, prefix_t *prefix) int dynamic_allocated = 0; int default_bitlen = sizeof(struct in_addr) * 8; -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) if(family == AF_INET6) { default_bitlen = sizeof(struct in6_addr) * 8; if(prefix == NULL) { @@ -319,8 +298,7 @@ ndpi_New_Prefix (int family, void *dest, int bitlen) return (ndpi_New_Prefix2 (family, dest, bitlen, NULL)); } -/* ndpi_ascii2prefix - */ +/* ndpi_ascii2prefix */ prefix_t * ndpi_ascii2prefix (int family, char *string) { @@ -328,7 +306,7 @@ ndpi_ascii2prefix (int family, char *string) long maxbitlen = 0; char *cp; struct in_addr sin; -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) struct in6_addr sin6; #endif /* PATRICIA_IPV6 */ char save[MAXLINE]; @@ -339,7 +317,7 @@ ndpi_ascii2prefix (int family, char *string) /* easy way to handle both families */ if(family == 0) { family = AF_INET; -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) if(strchr (string, ':')) family = AF_INET6; #endif /* PATRICIA_IPV6 */ } @@ -347,7 +325,7 @@ ndpi_ascii2prefix (int family, char *string) if(family == AF_INET) { maxbitlen = sizeof(struct in_addr) * 8; } -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) else if(family == AF_INET6) { maxbitlen = sizeof(struct in6_addr) * 8; } @@ -373,7 +351,7 @@ ndpi_ascii2prefix (int family, char *string) return (ndpi_New_Prefix (AF_INET, &sin, bitlen)); } -#if defined(PATRICIA_IPV6) && (!defined(__KERNEL__)) +#if defined(PATRICIA_IPV6) else if(family == AF_INET6) { // Get rid of this with next IPv6 upgrade #if defined(NT) && !defined(HAVE_INET_NTOP) @@ -420,8 +398,6 @@ ndpi_Deref_Prefix (prefix_t * prefix) } } -/* } */ - /* #define PATRICIA_DEBUG 1 */ static int num_active_patricia = 0; @@ -446,7 +422,6 @@ ndpi_New_Patricia (int maxbits) * if func is supplied, it will be called as func(node->data) * before deleting the node */ - void ndpi_Clear_Patricia (patricia_tree_t *patricia, void_fn_t func) { @@ -503,7 +478,6 @@ ndpi_Destroy_Patricia (patricia_tree_t *patricia, void_fn_t func) /* * if func is supplied, it will be called as func(node->prefix, node->data) */ - void ndpi_patricia_process (patricia_tree_t *patricia, void_fn2_t func) { @@ -1073,5 +1047,3 @@ ndpi_lookup_then_remove (patricia_tree_t *tree, char *string) patricia_remove (tree, node); } #endif - -/* } */ diff --git a/src/lib/third_party/src/node.c b/src/lib/third_party/src/node.c index 404fb24d4..a43cc59a6 100644 --- a/src/lib/third_party/src/node.c +++ b/src/lib/third_party/src/node.c @@ -18,14 +18,10 @@ along with multifast. If not, see . */ -#ifndef __KERNEL__ #include #include #include -#endif - #include "ndpi_api.h" - #include "../include/node.h" #include "sort.h" diff --git a/src/lib/third_party/src/sort.c b/src/lib/third_party/src/sort.c index d6545e85a..35c8e9fdf 100644 --- a/src/lib/third_party/src/sort.c +++ b/src/lib/third_party/src/sort.c @@ -4,9 +4,6 @@ * Jan 23 2005 Matt Mackall */ -#ifdef __KERNEL__ -#include -#else #ifdef WIN32 #include typedef uint32_t u_int32_t; @@ -15,7 +12,6 @@ typedef uint32_t u_int32_t; #include #include #include -#endif /* This is a function ported from the Linux kernel lib/sort.c */ @@ -94,37 +90,3 @@ void sort(void *_base, size_t num, size_t size, } } } - - -#if 0 -/* a simple boot-time regression test */ - -int cmpint(const void *a, const void *b) -{ - return *(int *)a - *(int *)b; -} - -int main(int argc, char *argv[]) { - int *a, i, r = 1; - - a = ndpi_malloc(1000 * sizeof(int)); - - printf("testing sort()\n"); - - for (i = 0; i < 1000; i++) { - r = (r * 725861) % 6599; - a[i] = r; - } - - sort(a, 1000, sizeof(int), cmpint, NULL); - - for (i = 0; i < 999; i++) - if (a[i] > a[i+1]) { - printf("sort() failed!\n"); - break; - } - - return 0; -} - -#endif -- cgit v1.2.3