Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1734] trunk
|
From: <xb...@us...> - 2013-03-23 13:45:47
|
Revision: 1734
http://sourceforge.net/p/scstudio/code/1734
Author: xborza
Date: 2013-03-23 13:45:40 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
z120 added tests for timestamps format [1e+005], [1e-005]
+ tests for pcap (edited code for settings //is_aggregation_active())
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/src/data/pcap/flow.cpp
trunk/src/data/pcap/flow_stats.cpp
trunk/src/data/pcap/pcap_settings.cpp
trunk/src/data/pcap/protocols.h
trunk/tests/CMakeLists.txt
trunk/tests/pcap/CMakeLists.txt
trunk/tests/pcap/config/mix.ini
trunk/tests/pcap/mpr_out/arp_example_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/arp_example_all_info.mpr
trunk/tests/pcap/mpr_out/arp_example_app_layer.mpr
trunk/tests/pcap/mpr_out/arp_example_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/arp_example_config.mpr
trunk/tests/pcap/mpr_out/arp_example_ignore.mpr
trunk/tests/pcap/mpr_out/arp_example_link_layer.mpr
trunk/tests/pcap/mpr_out/arp_example_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/arp_example_mix.mpr
trunk/tests/pcap/mpr_out/arp_example_net_layer.mpr
trunk/tests/pcap/mpr_out/arp_example_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/arp_example_relative_time.mpr
trunk/tests/pcap/mpr_out/arp_example_sip_stream.mpr
trunk/tests/pcap/mpr_out/arp_example_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/arp_example_time-aggreg.mpr
trunk/tests/pcap/mpr_out/arp_example_trans_layer.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_all_info.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_app_layer.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_config.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_ignore.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_link_layer.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_mix.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_net_layer.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_relative_time.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_sip_stream.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_time-aggreg.mpr
trunk/tests/pcap/mpr_out/bfd-raw-auth-simple_trans_layer.mpr
trunk/tests/pcap/mpr_out/dhcp_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/dhcp_all_info.mpr
trunk/tests/pcap/mpr_out/dhcp_app_layer.mpr
trunk/tests/pcap/mpr_out/dhcp_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/dhcp_config.mpr
trunk/tests/pcap/mpr_out/dhcp_ignore.mpr
trunk/tests/pcap/mpr_out/dhcp_link_layer.mpr
trunk/tests/pcap/mpr_out/dhcp_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/dhcp_mix.mpr
trunk/tests/pcap/mpr_out/dhcp_net_layer.mpr
trunk/tests/pcap/mpr_out/dhcp_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/dhcp_relative_time.mpr
trunk/tests/pcap/mpr_out/dhcp_sip_stream.mpr
trunk/tests/pcap/mpr_out/dhcp_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/dhcp_time-aggreg.mpr
trunk/tests/pcap/mpr_out/dhcp_trans_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_all_info.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_app_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_config.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_ignore.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_link_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_mix.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_net_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_relative_time.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_sip_stream.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_time-aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part1_trans_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_all_info.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_app_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_config.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_ignore.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_link_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_mix.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_net_layer.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_relative_time.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_sip_stream.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_time-aggreg.mpr
trunk/tests/pcap/mpr_out/ftpv6_part2_trans_layer.mpr
trunk/tests/pcap/mpr_out/http_gzip_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/http_gzip_all_info.mpr
trunk/tests/pcap/mpr_out/http_gzip_app_layer.mpr
trunk/tests/pcap/mpr_out/http_gzip_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/http_gzip_config.mpr
trunk/tests/pcap/mpr_out/http_gzip_ignore.mpr
trunk/tests/pcap/mpr_out/http_gzip_link_layer.mpr
trunk/tests/pcap/mpr_out/http_gzip_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/http_gzip_mix.mpr
trunk/tests/pcap/mpr_out/http_gzip_net_layer.mpr
trunk/tests/pcap/mpr_out/http_gzip_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/http_gzip_relative_time.mpr
trunk/tests/pcap/mpr_out/http_gzip_sip_stream.mpr
trunk/tests/pcap/mpr_out/http_gzip_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/http_gzip_time-aggreg.mpr
trunk/tests/pcap/mpr_out/http_gzip_trans_layer.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_all_info.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_app_layer.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_config.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_ignore.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_link_layer.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_mix.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_net_layer.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_relative_time.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_sip_stream.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_time-aggreg.mpr
trunk/tests/pcap/mpr_out/ipv4_cipso_option_trans_layer.mpr
trunk/tests/pcap/mpr_out/sample_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/sample_all_info.mpr
trunk/tests/pcap/mpr_out/sample_app_layer.mpr
trunk/tests/pcap/mpr_out/sample_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sample_config.mpr
trunk/tests/pcap/mpr_out/sample_ignore.mpr
trunk/tests/pcap/mpr_out/sample_link_layer.mpr
trunk/tests/pcap/mpr_out/sample_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/sample_mix.mpr
trunk/tests/pcap/mpr_out/sample_net_layer.mpr
trunk/tests/pcap/mpr_out/sample_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sample_relative_time.mpr
trunk/tests/pcap/mpr_out/sample_sip_stream.mpr
trunk/tests/pcap/mpr_out/sample_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/sample_time-aggreg.mpr
trunk/tests/pcap/mpr_out/sample_trans_layer.mpr
trunk/tests/pcap/mpr_out/sip_call_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_call_all_info.mpr
trunk/tests/pcap/mpr_out/sip_call_app_layer.mpr
trunk/tests/pcap/mpr_out/sip_call_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_call_config.mpr
trunk/tests/pcap/mpr_out/sip_call_ignore.mpr
trunk/tests/pcap/mpr_out/sip_call_link_layer.mpr
trunk/tests/pcap/mpr_out/sip_call_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_call_mix.mpr
trunk/tests/pcap/mpr_out/sip_call_net_layer.mpr
trunk/tests/pcap/mpr_out/sip_call_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_call_relative_time.mpr
trunk/tests/pcap/mpr_out/sip_call_sip_stream.mpr
trunk/tests/pcap/mpr_out/sip_call_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/sip_call_time-aggreg.mpr
trunk/tests/pcap/mpr_out/sip_call_trans_layer.mpr
trunk/tests/pcap/mpr_out/sip_example_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_example_all_info.mpr
trunk/tests/pcap/mpr_out/sip_example_app_layer.mpr
trunk/tests/pcap/mpr_out/sip_example_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_example_config.mpr
trunk/tests/pcap/mpr_out/sip_example_ignore.mpr
trunk/tests/pcap/mpr_out/sip_example_link_layer.mpr
trunk/tests/pcap/mpr_out/sip_example_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_example_mix.mpr
trunk/tests/pcap/mpr_out/sip_example_net_layer.mpr
trunk/tests/pcap/mpr_out/sip_example_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_example_relative_time.mpr
trunk/tests/pcap/mpr_out/sip_example_sip_stream.mpr
trunk/tests/pcap/mpr_out/sip_example_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/sip_example_time-aggreg.mpr
trunk/tests/pcap/mpr_out/sip_example_trans_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_all_info.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_app_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_config.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_ignore.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_link_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_mix.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_net_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_relative_time.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_sip_stream.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_time-aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part1_trans_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_all_info.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_app_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_config.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_ignore.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_link_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_mix.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_net_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_relative_time.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_sip_stream.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_time-aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_part2_trans_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_all_info.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_app_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_config.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_ignore.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_link_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_mix.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_net_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_relative_time.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_sip_stream.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_time-aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sample_trans_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_all_info.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_app_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_config.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_ignore.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_link_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_mix.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_net_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_relative_time.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_sip_stream.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_time-aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part1_trans_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_all_info.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_app_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_config.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_ignore.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_link_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_mix.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_net_layer.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_relative_time.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_sip_stream.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_time-aggreg.mpr
trunk/tests/pcap/mpr_out/skypeIRC_part2_trans_layer.mpr
trunk/tests/pcap/mpr_out/smtp_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/smtp_all_info.mpr
trunk/tests/pcap/mpr_out/smtp_app_layer.mpr
trunk/tests/pcap/mpr_out/smtp_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/smtp_config.mpr
trunk/tests/pcap/mpr_out/smtp_ignore.mpr
trunk/tests/pcap/mpr_out/smtp_link_layer.mpr
trunk/tests/pcap/mpr_out/smtp_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/smtp_mix.mpr
trunk/tests/pcap/mpr_out/smtp_net_layer.mpr
trunk/tests/pcap/mpr_out/smtp_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/smtp_relative_time.mpr
trunk/tests/pcap/mpr_out/smtp_sip_stream.mpr
trunk/tests/pcap/mpr_out/smtp_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/smtp_time-aggreg.mpr
trunk/tests/pcap/mpr_out/smtp_trans_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_all_info.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_app_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_config.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_ignore.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_link_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_mix.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_net_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_relative_time.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_sip_stream.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_time-aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_trans_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_all_info.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_app_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_config.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_ignore.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_link_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_mix.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_net_layer.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_relative_time.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_sip_stream.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_time-aggreg.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_trans_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_all_info.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_app_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_config.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_ignore.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_link_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_mix.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_net_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_relative_time.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_sip_stream.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_time-aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part1_trans_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_all_info.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_app_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_config.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_ignore.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_link_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_mix.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_net_layer.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_relative_time.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_sip_stream.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_time-aggreg.mpr
trunk/tests/pcap/mpr_out/telnet_raw_part2_trans_layer.mpr
trunk/tests/pcap/mpr_out/v6_part1_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part1_all_info.mpr
trunk/tests/pcap/mpr_out/v6_part1_app_layer.mpr
trunk/tests/pcap/mpr_out/v6_part1_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part1_config.mpr
trunk/tests/pcap/mpr_out/v6_part1_ignore.mpr
trunk/tests/pcap/mpr_out/v6_part1_link_layer.mpr
trunk/tests/pcap/mpr_out/v6_part1_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part1_mix.mpr
trunk/tests/pcap/mpr_out/v6_part1_net_layer.mpr
trunk/tests/pcap/mpr_out/v6_part1_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part1_relative_time.mpr
trunk/tests/pcap/mpr_out/v6_part1_sip_stream.mpr
trunk/tests/pcap/mpr_out/v6_part1_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/v6_part1_time-aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part1_trans_layer.mpr
trunk/tests/pcap/mpr_out/v6_part2_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part2_all_info.mpr
trunk/tests/pcap/mpr_out/v6_part2_app_layer.mpr
trunk/tests/pcap/mpr_out/v6_part2_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part2_config.mpr
trunk/tests/pcap/mpr_out/v6_part2_ignore.mpr
trunk/tests/pcap/mpr_out/v6_part2_link_layer.mpr
trunk/tests/pcap/mpr_out/v6_part2_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part2_mix.mpr
trunk/tests/pcap/mpr_out/v6_part2_net_layer.mpr
trunk/tests/pcap/mpr_out/v6_part2_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part2_relative_time.mpr
trunk/tests/pcap/mpr_out/v6_part2_sip_stream.mpr
trunk/tests/pcap/mpr_out/v6_part2_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/v6_part2_time-aggreg.mpr
trunk/tests/pcap/mpr_out/v6_part2_trans_layer.mpr
trunk/tests/pcap/pcap_diff.py
trunk/tests/pcap/reload_mprs.py
trunk/tests/pcap/reload_texs.py
trunk/tests/z120_test/CMakeLists.txt
trunk/tests/z120_test/z120_time50.mpr
Added Paths:
-----------
trunk/tests/pcap/mpr_out/dns_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/dns_all_info.mpr
trunk/tests/pcap/mpr_out/dns_app_layer.mpr
trunk/tests/pcap/mpr_out/dns_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/dns_config.mpr
trunk/tests/pcap/mpr_out/dns_ignore.mpr
trunk/tests/pcap/mpr_out/dns_link_layer.mpr
trunk/tests/pcap/mpr_out/dns_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/dns_mix.mpr
trunk/tests/pcap/mpr_out/dns_net_layer.mpr
trunk/tests/pcap/mpr_out/dns_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/dns_relative_time.mpr
trunk/tests/pcap/mpr_out/dns_sip_stream.mpr
trunk/tests/pcap/mpr_out/dns_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/dns_time-aggreg.mpr
trunk/tests/pcap/mpr_out/dns_trans_layer.mpr
trunk/tests/pcap/mpr_out/http_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/http_all_info.mpr
trunk/tests/pcap/mpr_out/http_app_layer.mpr
trunk/tests/pcap/mpr_out/http_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/http_config.mpr
trunk/tests/pcap/mpr_out/http_ignore.mpr
trunk/tests/pcap/mpr_out/http_link_layer.mpr
trunk/tests/pcap/mpr_out/http_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/http_mix.mpr
trunk/tests/pcap/mpr_out/http_net_layer.mpr
trunk/tests/pcap/mpr_out/http_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/http_relative_time.mpr
trunk/tests/pcap/mpr_out/http_sip_stream.mpr
trunk/tests/pcap/mpr_out/http_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/http_time-aggreg.mpr
trunk/tests/pcap/mpr_out/http_trans_layer.mpr
trunk/tests/pcap/mpr_out/v6-http_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-http_all_info.mpr
trunk/tests/pcap/mpr_out/v6-http_app_layer.mpr
trunk/tests/pcap/mpr_out/v6-http_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-http_config.mpr
trunk/tests/pcap/mpr_out/v6-http_ignore.mpr
trunk/tests/pcap/mpr_out/v6-http_link_layer.mpr
trunk/tests/pcap/mpr_out/v6-http_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-http_mix.mpr
trunk/tests/pcap/mpr_out/v6-http_net_layer.mpr
trunk/tests/pcap/mpr_out/v6-http_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-http_relative_time.mpr
trunk/tests/pcap/mpr_out/v6-http_sip_stream.mpr
trunk/tests/pcap/mpr_out/v6-http_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/v6-http_time-aggreg.mpr
trunk/tests/pcap/mpr_out/v6-http_trans_layer.mpr
trunk/tests/pcap/pcap_in/dns.pcap
trunk/tests/pcap/pcap_in/http.pcap
trunk/tests/pcap/pcap_in/v6-http.pcap
trunk/tests/z120_test/z120_time50.mpr.result
trunk/tests/z120_test/z120_time51.mpr
trunk/tests/z120_test/z120_time51.mpr.result
trunk/tests/z120_test/z120_time52.mpr
trunk/tests/z120_test/z120_time52.mpr.result
Removed Paths:
-------------
trunk/tests/pcap/mpr_out/dn_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/dn_all_info.mpr
trunk/tests/pcap/mpr_out/dn_app_layer.mpr
trunk/tests/pcap/mpr_out/dn_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/dn_config.mpr
trunk/tests/pcap/mpr_out/dn_ignore.mpr
trunk/tests/pcap/mpr_out/dn_link_layer.mpr
trunk/tests/pcap/mpr_out/dn_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/dn_mix.mpr
trunk/tests/pcap/mpr_out/dn_net_layer.mpr
trunk/tests/pcap/mpr_out/dn_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/dn_relative_time.mpr
trunk/tests/pcap/mpr_out/dn_sip_stream.mpr
trunk/tests/pcap/mpr_out/dn_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/dn_time-aggreg.mpr
trunk/tests/pcap/mpr_out/dn_trans_layer.mpr
trunk/tests/pcap/mpr_out/htt_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/htt_all_info.mpr
trunk/tests/pcap/mpr_out/htt_app_layer.mpr
trunk/tests/pcap/mpr_out/htt_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/htt_config.mpr
trunk/tests/pcap/mpr_out/htt_ignore.mpr
trunk/tests/pcap/mpr_out/htt_link_layer.mpr
trunk/tests/pcap/mpr_out/htt_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/htt_mix.mpr
trunk/tests/pcap/mpr_out/htt_net_layer.mpr
trunk/tests/pcap/mpr_out/htt_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/htt_relative_time.mpr
trunk/tests/pcap/mpr_out/htt_sip_stream.mpr
trunk/tests/pcap/mpr_out/htt_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/htt_time-aggreg.mpr
trunk/tests/pcap/mpr_out/htt_trans_layer.mpr
trunk/tests/pcap/mpr_out/v6-htt_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-htt_all_info.mpr
trunk/tests/pcap/mpr_out/v6-htt_app_layer.mpr
trunk/tests/pcap/mpr_out/v6-htt_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-htt_config.mpr
trunk/tests/pcap/mpr_out/v6-htt_ignore.mpr
trunk/tests/pcap/mpr_out/v6-htt_link_layer.mpr
trunk/tests/pcap/mpr_out/v6-htt_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-htt_mix.mpr
trunk/tests/pcap/mpr_out/v6-htt_net_layer.mpr
trunk/tests/pcap/mpr_out/v6-htt_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/v6-htt_relative_time.mpr
trunk/tests/pcap/mpr_out/v6-htt_sip_stream.mpr
trunk/tests/pcap/mpr_out/v6-htt_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/v6-htt_time-aggreg.mpr
trunk/tests/pcap/mpr_out/v6-htt_trans_layer.mpr
trunk/tests/pcap/pcap_in/dns.cap
trunk/tests/pcap/pcap_in/http.cap
trunk/tests/pcap/pcap_in/v6-http.cap
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/CMakeLists.txt 2013-03-23 13:45:40 UTC (rev 1734)
@@ -97,7 +97,6 @@
#pcap setup
SET(BUILD_PCAP ON)
IF(BUILD_PCAP)
- MESSAGE("BUILD PCAP")
SET(OSIP_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/libosip2-3.6.0" CACHE PATH "The SIP parser root." )
ADD_SUBDIRECTORY(${OSIP_ROOT})
SET(HTTP_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/http_parser" CACHE PATH
Modified: trunk/src/data/pcap/flow.cpp
===================================================================
--- trunk/src/data/pcap/flow.cpp 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/src/data/pcap/flow.cpp 2013-03-23 13:45:40 UTC (rev 1734)
@@ -36,13 +36,12 @@
std::stringstream ss;
msg_id id = it->first;
- if(!pcap_settings->is_aggregation_active() || it->second.get_smart_label() == "")
+ if(settings->type != AGGREG_FLOW || it->second.get_smart_label() == "")
{
ss << id.data.get_label() << " ";
}
else // USE ONLY FOR REASSEMBLING MOSLTY
{
- //ss << "X " << id.data.get_label() << "X ";
std::string label = it->second.get_smart_label();
// if this is a smart reassembling (HTTP,TCP,SIP), the size is allready included at the end of smart label -> delete it!
size_t pos = label.find("SIZE");
Modified: trunk/src/data/pcap/flow_stats.cpp
===================================================================
--- trunk/src/data/pcap/flow_stats.cpp 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/src/data/pcap/flow_stats.cpp 2013-03-23 13:45:40 UTC (rev 1734)
@@ -69,7 +69,7 @@
if(!(settings->is_aggregation_active(agr_level))) // this aggregation is not active
return result;
- result.level = agr_level;
+ result.level = agr_level;
result.ports = packet->get_ports();
TcpPacket* tcp_p = NULL;
@@ -96,16 +96,24 @@
SpecData fill_specdata(PcapSettings* settings,Packet* packet,FlowLevel f_lev,FlowLevel agr_lev,bool sip_flush)
{
SpecData result;
- if(settings->flow_settings == NULL)
+
+ // the bigger priority has message flow before aggregations (HTTP,SIP,TCP...)
+ if(settings->is_aggregation_active())
{
+ if(settings->flow_settings->type == AGGREG_FLOW)
+ {
+ result = fill_specdata_aggreg(settings,packet,agr_lev,sip_flush);
+ }
+ else // no reassembling flow
+ {
+ result = fill_specdata_byflow(settings,packet,f_lev);
+ }
+ }
+ else // no aggregation
+ {
result.level = NO_FLOW;
- return result;
}
-
- if(settings->is_aggregation_active())
- return fill_specdata_aggreg(settings,packet,agr_lev,sip_flush);
- else
- return fill_specdata_byflow(settings,packet,f_lev);
+ return result;
}
Modified: trunk/src/data/pcap/pcap_settings.cpp
===================================================================
--- trunk/src/data/pcap/pcap_settings.cpp 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/src/data/pcap/pcap_settings.cpp 2013-03-23 13:45:40 UTC (rev 1734)
@@ -14,7 +14,7 @@
ignore_packets = view_settings->ignore_packets;
}
- if(flow_settings->apply_aggreg) // BIGGER PRIORITY IN SETTINGS !!!!
+ if(flow_settings->apply_aggreg) // BIGGER PRIORITY IN SETTINGS THAN REASSEMBLING -> for message sequence flow !!!!
{
this->ignore_packets = flow_settings->ignore_packets;
view_settings->show_data_size = flow_settings->show_data_size;
@@ -28,7 +28,7 @@
default : parse_layer = APP_LAYER;
}
}
- else if(is_aggregation_active()) // for aggreagation
+ else if(is_aggregation_active()) // for reassembling, if smart flow is not active
{
flow_settings->apply_aggreg = true;
flow_settings->type = AGGREG_FLOW;
@@ -104,11 +104,8 @@
bool PcapSettings::is_aggregation_active()
{
- if(flow_settings->apply_aggreg)
- return false;
-
- return (adv_settings->http_settings->reassembly || adv_settings->tcp_settings->reassembly
- || adv_settings->sip_settings->reassembly);
+ return (flow_settings->apply_aggreg || adv_settings->http_settings->reassembly ||
+ adv_settings->tcp_settings->reassembly || adv_settings->sip_settings->reassembly);
}
bool PcapSettings::is_aggregation_active(FlowLevel level)
@@ -130,7 +127,11 @@
http_set->show_packet_part = get_config_long(L"Pcap", L"HttpUseSplitted", 1) != 0;
http_set->show_version = get_config_long(L"Pcap", L"HttpVersion", 0) != 0;
http_set->reassembly = get_config_long(L"Pcap", L"HttpUseReassemble", 0) != 0;
- //reg->setRegistry<DWORD>(GetRegistryFolder(), _T("HttpSpecific"), (DWORD)m_http_specific);
+ //validation
+ if(http_set->reassembly)
+ {
+ http_set->show_packet_part = false;
+ }
SipSettings* sip_set = new SipSettings();
sip_set->show_from_to = get_config_long(L"Pcap", L"SipFromTo", 1) != 0;
@@ -144,6 +145,11 @@
tcp_set->show_seqack = get_config_long(L"Pcap", L"TcpSeqack", 0) != 0;
tcp_set->show_segments = get_config_long(L"Pcap", L"TcpUseSplitted", 0) != 0;
tcp_set->reassembly = get_config_long(L"Pcap", L"TcpUseReassemble", 0) != 0;
+ // validation
+ if(tcp_set->reassembly)
+ {
+ tcp_set->show_segments = false;
+ }
adv_settings = new AdvancedSettings(http_set,sip_set,tcp_set);
Modified: trunk/src/data/pcap/protocols.h
===================================================================
--- trunk/src/data/pcap/protocols.h 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/src/data/pcap/protocols.h 2013-03-23 13:45:40 UTC (rev 1734)
@@ -202,8 +202,8 @@
static const std::map<int,const char*> ports_names = boost::assign::map_list_of
(20,"FTP_T") // File Transfer Protocol - data transfer
- (21,"FTP_C") // File Transfer Protocol - control (command)
- (22,"SSH") // Secure Shell
+ (21,"FTP_C") // File Transfer Protocol - control (command)
+ (22,"SSH") // Secure Shell
(23,"TELNET") // Tellenet remote login service
(25,"SMTP") // Simple mail trnasfer protocol
(53,"DNS") // Domain name system
Modified: trunk/tests/CMakeLists.txt
===================================================================
--- trunk/tests/CMakeLists.txt 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/tests/CMakeLists.txt 2013-03-23 13:45:40 UTC (rev 1734)
@@ -126,6 +126,33 @@
MATH(EXPR EXPORTTEX_SEQUENCE ${EXPORTTEX_SEQUENCE}+1)
ENDMACRO(ADD_EXPORTTEX_TEST)
+SET(EXPORTTEX_SEQUENCE 0)
+MACRO(ADD_EXPORTTEX_TEST FILE SATISFIED)
+ GET_TARGET_PROPERTY(EXPORTTEX_TEST_EXECUTABLE exporttex_test LOCATION)
+ # Replace the "$(IntDir)", "$(OutDir)", or "$(CONFIGURATION)"
+ # depending on the generator being used with the test-time variable.
+ STRING(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}"
+ EXPORTTEX_TEST_EXECUTABLE "${EXPORTTEX_TEST_EXECUTABLE}")
+
+ ADD_TEST("EXPORTTEX_test-${EXPORTTEX_SEQUENCE}-${FILE}"
+ ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/tests/exporttex_test/exporttex_diff.py" "${EXPORTTEX_TEST_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}" ${SATISFIED})
+ MATH(EXPR EXPORTTEX_SEQUENCE ${EXPORTTEX_SEQUENCE}+1)
+ENDMACRO(ADD_EXPORTTEX_TEST)
+
+SET(PCAP_SEQUENCE 0)
+MACRO(ADD_PCAP_TEST FILE1 FILE SATISFIED)
+ GET_TARGET_PROPERTY(PCAP_TEST_EXECUTABLE pcap_test LOCATION)
+ #Replace the "$(IntDir)", "$(OutDir)", or "$(CONFIGURATION)"
+ # depending on the generator being used with the test-time variable.
+ STRING(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}"
+ PCAP_TEST_EXECUTABLE "${PCAP_TEST_EXECUTABLE}")
+
+ ADD_TEST("PCAP_test-${PCAP_SEQUENCE}-${FILE1}-${FILE}"
+ ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/tests/pcap/pcap_diff.py" "${PCAP_TEST_EXECUTABLE}" "${FILE1}" "${FILE}" ${SATISFIED})
+ MATH(EXPR PCAP_SEQUENCE ${PCAP_SEQUENCE}+1)
+ENDMACRO(ADD_PCAP_TEST)
+ADD_SUBDIRECTORY(pcap)
+
# ADD_SUBDIRECTORY(exporttex_test)
# Exporttex test with known coordinates (test doesn't depends on beautify)
@@ -177,9 +204,6 @@
ADD_SUBDIRECTORY(diff)
-IF(BUILD_PCAP)
- ADD_SUBDIRECTORY(pcap)
-ENDIF(BUILD_PCAP)
SET(TIGHTEN_SEQUENCE 0)
MACRO(ADD_TIGHTEN_TEST FILE SATISFIED)
Modified: trunk/tests/pcap/CMakeLists.txt
===================================================================
--- trunk/tests/pcap/CMakeLists.txt 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/tests/pcap/CMakeLists.txt 2013-03-23 13:45:40 UTC (rev 1734)
@@ -1,14 +1,414 @@
-FIND_PACKAGE(PythonInterp REQUIRED)
-
-ADD_EXECUTABLE(pcap_test
- pcap_test.cpp
-)
-INCLUDE_DIRECTORIES(${PCAP_INCLUDE_DIR} ${OSIP_ROOT}/include ${HTTP_ROOT})
-
-TARGET_LINK_LIBRARIES(pcap_test
- scpcap
- scpseudocode
- scmsc
- scZ120
-)
-
+FIND_PACKAGE(PythonInterp REQUIRED)
+
+ADD_EXECUTABLE(pcap_test
+ pcap_test.cpp
+)
+INCLUDE_DIRECTORIES(${PCAP_INCLUDE_DIR} ${OSIP_ROOT}/include ${HTTP_ROOT})
+
+TARGET_LINK_LIBRARIES(pcap_test
+ scpcap
+ scpseudocode
+ scmsc
+ scZ120
+)
+
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini arp_example.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini dhcp.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini dns.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini http.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini sample.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini sip_call.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini sip_example.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini smtp.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini v6-http.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(all_eq_packets_aggreg.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(all_info.ini arp_example.pcap 1)
+ADD_PCAP_TEST(all_info.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(all_info.ini dhcp.pcap 1)
+ADD_PCAP_TEST(all_info.ini dns.pcap 1)
+ADD_PCAP_TEST(all_info.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(all_info.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(all_info.ini http.pcap 1)
+ADD_PCAP_TEST(all_info.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(all_info.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(all_info.ini sample.pcap 1)
+ADD_PCAP_TEST(all_info.ini sip_call.pcap 1)
+ADD_PCAP_TEST(all_info.ini sip_example.pcap 1)
+ADD_PCAP_TEST(all_info.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(all_info.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(all_info.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(all_info.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(all_info.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(all_info.ini smtp.pcap 1)
+ADD_PCAP_TEST(all_info.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(all_info.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(all_info.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(all_info.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(all_info.ini v6-http.pcap 1)
+ADD_PCAP_TEST(all_info.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(all_info.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(app_layer.ini arp_example.pcap 1)
+ADD_PCAP_TEST(app_layer.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(app_layer.ini dhcp.pcap 1)
+ADD_PCAP_TEST(app_layer.ini dns.pcap 1)
+ADD_PCAP_TEST(app_layer.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(app_layer.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(app_layer.ini http.pcap 1)
+ADD_PCAP_TEST(app_layer.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(app_layer.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(app_layer.ini sample.pcap 1)
+ADD_PCAP_TEST(app_layer.ini sip_call.pcap 1)
+ADD_PCAP_TEST(app_layer.ini sip_example.pcap 1)
+ADD_PCAP_TEST(app_layer.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(app_layer.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(app_layer.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(app_layer.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(app_layer.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(app_layer.ini smtp.pcap 1)
+ADD_PCAP_TEST(app_layer.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(app_layer.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(app_layer.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(app_layer.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(app_layer.ini v6-http.pcap 1)
+ADD_PCAP_TEST(app_layer.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(app_layer.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini arp_example.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini dhcp.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini dns.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini http.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini sample.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini sip_call.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini sip_example.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini smtp.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini v6-http.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(bw_con_com_aggreg.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(config.ini arp_example.pcap 1)
+ADD_PCAP_TEST(config.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(config.ini dhcp.pcap 1)
+ADD_PCAP_TEST(config.ini dns.pcap 1)
+ADD_PCAP_TEST(config.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(config.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(config.ini http.pcap 1)
+ADD_PCAP_TEST(config.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(config.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(config.ini sample.pcap 1)
+ADD_PCAP_TEST(config.ini sip_call.pcap 1)
+ADD_PCAP_TEST(config.ini sip_example.pcap 1)
+ADD_PCAP_TEST(config.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(config.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(config.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(config.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(config.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(config.ini smtp.pcap 1)
+ADD_PCAP_TEST(config.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(config.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(config.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(config.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(config.ini v6-http.pcap 1)
+ADD_PCAP_TEST(config.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(config.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(ignore.ini arp_example.pcap 1)
+ADD_PCAP_TEST(ignore.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(ignore.ini dhcp.pcap 1)
+ADD_PCAP_TEST(ignore.ini dns.pcap 1)
+ADD_PCAP_TEST(ignore.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(ignore.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(ignore.ini http.pcap 1)
+ADD_PCAP_TEST(ignore.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(ignore.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(ignore.ini sample.pcap 1)
+ADD_PCAP_TEST(ignore.ini sip_call.pcap 1)
+ADD_PCAP_TEST(ignore.ini sip_example.pcap 1)
+ADD_PCAP_TEST(ignore.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(ignore.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(ignore.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(ignore.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(ignore.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(ignore.ini smtp.pcap 1)
+ADD_PCAP_TEST(ignore.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(ignore.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(ignore.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(ignore.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(ignore.ini v6-http.pcap 1)
+ADD_PCAP_TEST(ignore.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(ignore.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(link_layer.ini arp_example.pcap 1)
+ADD_PCAP_TEST(link_layer.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(link_layer.ini dhcp.pcap 1)
+ADD_PCAP_TEST(link_layer.ini dns.pcap 1)
+ADD_PCAP_TEST(link_layer.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(link_layer.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(link_layer.ini http.pcap 1)
+ADD_PCAP_TEST(link_layer.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(link_layer.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(link_layer.ini sample.pcap 1)
+ADD_PCAP_TEST(link_layer.ini sip_call.pcap 1)
+ADD_PCAP_TEST(link_layer.ini sip_example.pcap 1)
+ADD_PCAP_TEST(link_layer.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(link_layer.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(link_layer.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(link_layer.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(link_layer.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(link_layer.ini smtp.pcap 1)
+ADD_PCAP_TEST(link_layer.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(link_layer.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(link_layer.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(link_layer.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(link_layer.ini v6-http.pcap 1)
+ADD_PCAP_TEST(link_layer.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(link_layer.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini arp_example.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini dhcp.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini dns.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini http.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini sample.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini sip_call.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini sip_example.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini smtp.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini v6-http.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(lst_aggreg.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(mix.ini arp_example.pcap 1)
+ADD_PCAP_TEST(mix.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(mix.ini dhcp.pcap 1)
+ADD_PCAP_TEST(mix.ini dns.pcap 1)
+ADD_PCAP_TEST(mix.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(mix.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(mix.ini http.pcap 1)
+ADD_PCAP_TEST(mix.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(mix.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(mix.ini sample.pcap 1)
+ADD_PCAP_TEST(mix.ini sip_call.pcap 1)
+ADD_PCAP_TEST(mix.ini sip_example.pcap 1)
+ADD_PCAP_TEST(mix.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(mix.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(mix.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(mix.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(mix.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(mix.ini smtp.pcap 1)
+ADD_PCAP_TEST(mix.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(mix.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(mix.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(mix.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(mix.ini v6-http.pcap 1)
+ADD_PCAP_TEST(mix.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(mix.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(net_layer.ini arp_example.pcap 1)
+ADD_PCAP_TEST(net_layer.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(net_layer.ini dhcp.pcap 1)
+ADD_PCAP_TEST(net_layer.ini dns.pcap 1)
+ADD_PCAP_TEST(net_layer.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(net_layer.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(net_layer.ini http.pcap 1)
+ADD_PCAP_TEST(net_layer.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(net_layer.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(net_layer.ini sample.pcap 1)
+ADD_PCAP_TEST(net_layer.ini sip_call.pcap 1)
+ADD_PCAP_TEST(net_layer.ini sip_example.pcap 1)
+ADD_PCAP_TEST(net_layer.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(net_layer.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(net_layer.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(net_layer.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(net_layer.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(net_layer.ini smtp.pcap 1)
+ADD_PCAP_TEST(net_layer.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(net_layer.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(net_layer.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(net_layer.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(net_layer.ini v6-http.pcap 1)
+ADD_PCAP_TEST(net_layer.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(net_layer.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini arp_example.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini dhcp.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini dns.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini http.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini sample.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini sip_call.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini sip_example.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini smtp.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini v6-http.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(ow_con_com_aggreg.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(relative_time.ini arp_example.pcap 1)
+ADD_PCAP_TEST(relative_time.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(relative_time.ini dhcp.pcap 1)
+ADD_PCAP_TEST(relative_time.ini dns.pcap 1)
+ADD_PCAP_TEST(relative_time.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(relative_time.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(relative_time.ini http.pcap 1)
+ADD_PCAP_TEST(relative_time.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(relative_time.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(relative_time.ini sample.pcap 1)
+ADD_PCAP_TEST(relative_time.ini sip_call.pcap 1)
+ADD_PCAP_TEST(relative_time.ini sip_example.pcap 1)
+ADD_PCAP_TEST(relative_time.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(relative_time.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(relative_time.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(relative_time.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(relative_time.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(relative_time.ini smtp.pcap 1)
+ADD_PCAP_TEST(relative_time.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(relative_time.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(relative_time.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(relative_time.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(relative_time.ini v6-http.pcap 1)
+ADD_PCAP_TEST(relative_time.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(relative_time.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini arp_example.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini dhcp.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini dns.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini http.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini sample.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini sip_call.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini sip_example.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini smtp.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini v6-http.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(sip_stream.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini arp_example.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini dhcp.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini dns.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini http.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini sample.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini sip_call.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini sip_example.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini smtp.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini v6-http.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(tcp_http_reasembly.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini arp_example.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini dhcp.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini dns.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini http.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini sample.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini sip_call.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini sip_example.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini smtp.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini v6-http.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(time-aggreg.ini v6_part2.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini arp_example.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini bfd-raw-auth-simple.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini dhcp.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini dns.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini ftpv6_part1.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini ftpv6_part2.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini http.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini http_gzip.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini ipv4_cipso_option.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini sample.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini sip_call.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini sip_example.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini sip_rtp_part1.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini sip_rtp_part2.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini sip_rtp_sample.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini skypeIRC_part1.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini skypeIRC_part2.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini smtp.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini tcp_ecn_sample_part1.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini tcp_ecn_sample_part2.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini telnet_raw_part1.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini telnet_raw_part2.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini v6-http.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini v6_part1.pcap 1)
+ADD_PCAP_TEST(trans_layer.ini v6_part2.pcap 1)
Modified: trunk/tests/pcap/config/mix.ini
===================================================================
--- trunk/tests/pcap/config/mix.ini 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/tests/pcap/config/mix.ini 2013-03-23 13:45:40 UTC (rev 1734)
@@ -8,7 +8,7 @@
ShowTimestamps = true
; ABSOLUT_TIMES:0 | RELATIVE_INTERVALS:1
-TimeFormat = 1
+TimeFormat = 0
; Second:1 | Milisecond:1000 | Microsecond:1000000
TimeUnit = 1000
@@ -21,7 +21,7 @@
AllLayersInfo = false
; ignore packet, if don´t contain selected layer data
-IgnorePackets = true
+IgnorePackets = false
;; show
DataSize = false
Modified: trunk/tests/pcap/mpr_out/arp_example_all_eq_packets_aggreg.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_all_eq_packets_aggreg.mpr 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/tests/pcap/mpr_out/arp_example_all_eq_packets_aggreg.mpr 2013-03-23 13:45:40 UTC (rev 1734)
@@ -1,17 +1,24 @@
-mscdocument arp_example;
-msc Pcap;
-inst 192.168.1.2;
-inst 192.168.1.1;
-192.168.1.2: instance;
-out ARP_5_packets,0 to 192.168.1.1;
-time [@0];
-in ARP_7_packets,1 from 192.168.1.1;
-time [@392.248];
-endinstance;
-192.168.1.1: instance;
-out ARP_7_packets,1 to 192.168.1.2;
-time [@0.000664];
-in ARP_5_packets,0 from 192.168.1.2;
-time [@279.001];
-endinstance;
-endmsc;
+mscdocument arp_example;
+msc Pcap;
+inst 00.e0.ed.01.6e.bd;
+inst ff.ff.ff.ff.ff.ff;
+inst 00.30.54.00.34.56;
+00.e0.ed.01.6e.bd: instance;
+out ARP_2_packets_,0 to ff.ff.ff.ff.ff.ff;
+time [@0];
+out ARP_3_packets_,1 to 00.30.54.00.34.56;
+time [@8.16732];
+in ARP_7_packets_,2 from 00.30.54.00.34.56;
+time [@392.248];
+endinstance;
+ff.ff.ff.ff.ff.ff: instance;
+in ARP_2_packets_,0 from 00.e0.ed.01.6e.bd;
+time [@279.001];
+endinstance;
+00.30.54.00.34.56: instance;
+out ARP_7_packets_,2 to 00.e0.ed.01.6e.bd;
+time [@0.000664];
+in ARP_3_packets_,1 from 00.e0.ed.01.6e.bd;
+time [@150.798];
+endinstance;
+endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_all_info.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_all_info.mpr 2013-03-22 22:08:07 UTC (rev 1733)
+++ trunk/tests/pcap/mpr_out/arp_example_all_info.mpr 2013-03-23 13:45:40 UTC (rev 1734)
@@ -1,57 +1,60 @@
-mscdocument arp_example;
-msc Pcap;
-inst 192.168.1.2;
-inst 192.168.1.1;
-192.168.1.2: instance;
-out 1_ETHERNET_ARP_Who_has_192.168.1.1_,0 to 192.168.1.1;
-time [@0];
-in 2_ETHERNET_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 from 192.168.1.1;
-time [@0.000664];
-in 3_ETHERNET_ARP_Who_has_192.168.1.2_,2 from 192.168.1.1;
-time [@8.16728];
-out 4_ETHERNET_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 to 192.168.1.1;
-time [@8.16732];
-in 5_ETHERNET_ARP_Who_has_192.168.1.2_,4 from 192.168.1.1;
-time [@88.1775];
-out 6_ETHERNET_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 to 192.168.1.1;
-time [@88.1776];
-in 7_ETHERNET_ARP_Who_has_192.168.1.2_,6 from 192.168.1.1;
-time [@150.798];
-out 8_ETHERNET_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 to 192.168.1.1;
-time [@150.798];
-out 9_ETHERNET_ARP_Who_has_192.168.1.1_,8 to 192.168.1.1;
-time [@279.001];
-in 10_ETHERNET_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 from 192.168.1.1;
-time [@279.002];
-in 11_ETHERNET_ARP_Who_has_192.168.1.2_,10 from 192.168.1.1;
-time [@301.008];
-in 12_ETHERNET_ARP_Who_has_192.168.1.2_,11 from 192.168.1.1;
-time [@392.248];
-endinstance;
-192.168.1.1: instance;
-in 1_ETHERNET_ARP_Who_has_192.168.1.1_,0 from 192.168.1.2;
-time [@0];
-out 2_ETHERNET_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 to 192.168.1.2;
-time [@0.000664];
-out 3_ETHERNET_ARP_Who_has_192.168.1.2_,2 to 192.168.1.2;
-time [@8.16728];
-in 4_ETHERNET_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 from 192.168.1.2;
-time [@8.16732];
-out 5_ETHERNET_ARP_Who_has_192.168.1.2_,4 to 192.168.1.2;
-time [@88.1775];
-in 6_ETHERNET_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 from 192.168.1.2;
-time [@88.1776];
-out 7_ETHERNET_ARP_Who_has_192.168.1.2_,6 to 192.168.1.2;
-time [@150.798];
-in 8_ETHERNET_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 from 192.168.1.2;
-time [@150.798];
-in 9_ETHERNET_ARP_Who_has_192.168.1.1_,8 from 192.168.1.2;
-time [@279.001];
-out 10_ETHERNET_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 to 192.168.1.2;
-time [@279.002];
-out 11_ETHERNET_ARP_Who_has_192.168.1.2_,10 to 192.168.1.2;
-time [@301.008];
-out 12_ETHERNET_A...
[truncated message content] |
