Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1751] trunk
|
From: <xb...@us...> - 2013-05-11 22:36:10
|
Revision: 1751
http://sourceforge.net/p/scstudio/code/1751
Author: xborza
Date: 2013-05-11 22:36:05 +0000 (Sat, 11 May 2013)
Log Message:
-----------
some new pcap tests + relative interval rounding (6,3,0 decimal digits - according to time unit)
Modified Paths:
--------------
trunk/src/data/pcap/aggreg_handler.cpp
trunk/src/data/pcap/aggregation_formats.cpp
trunk/src/data/pcap/aggregation_formats.h
trunk/src/data/pcap/application_layer.cpp
trunk/src/data/pcap/pcap_handler.cpp
trunk/src/data/pcap/pcap_settings.cpp
trunk/src/data/pcap/pcap_settings.h
trunk/tests/pcap/CMakeLists.txt
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_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/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/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_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_gzip_mix.mpr
trunk/tests/pcap/mpr_out/http_gzip_relative_time.mpr
trunk/tests/pcap/mpr_out/http_gzip_tcp_http_reasembly.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/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_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_mix.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_relative_time.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part1_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_mix.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_relative_time.mpr
trunk/tests/pcap/mpr_out/tcp_ecn_sample_part2_tcp_http_reasembly.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-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/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
Added Paths:
-----------
trunk/tests/pcap/mpr_out/rarp_request_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/rarp_request_all_info.mpr
trunk/tests/pcap/mpr_out/rarp_request_app_layer.mpr
trunk/tests/pcap/mpr_out/rarp_request_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/rarp_request_config.mpr
trunk/tests/pcap/mpr_out/rarp_request_ignore.mpr
trunk/tests/pcap/mpr_out/rarp_request_link_layer.mpr
trunk/tests/pcap/mpr_out/rarp_request_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/rarp_request_mix.mpr
trunk/tests/pcap/mpr_out/rarp_request_net_layer.mpr
trunk/tests/pcap/mpr_out/rarp_request_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/rarp_request_relative_time.mpr
trunk/tests/pcap/mpr_out/rarp_request_sip_stream.mpr
trunk/tests/pcap/mpr_out/rarp_request_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/rarp_request_time-aggreg.mpr
trunk/tests/pcap/mpr_out/rarp_request_trans_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_all_eq_packets_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_all_info.mpr
trunk/tests/pcap/mpr_out/sip_rtp_app_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_bw_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_config.mpr
trunk/tests/pcap/mpr_out/sip_rtp_ignore.mpr
trunk/tests/pcap/mpr_out/sip_rtp_link_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_lst_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_mix.mpr
trunk/tests/pcap/mpr_out/sip_rtp_net_layer.mpr
trunk/tests/pcap/mpr_out/sip_rtp_ow_con_com_aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_relative_time.mpr
trunk/tests/pcap/mpr_out/sip_rtp_sip_stream.mpr
trunk/tests/pcap/mpr_out/sip_rtp_tcp_http_reasembly.mpr
trunk/tests/pcap/mpr_out/sip_rtp_time-aggreg.mpr
trunk/tests/pcap/mpr_out/sip_rtp_trans_layer.mpr
trunk/tests/pcap/pcap_in/rarp_request.pcap
trunk/tests/pcap/pcap_in/sip_rtp.pcap
Modified: trunk/src/data/pcap/aggreg_handler.cpp
===================================================================
--- trunk/src/data/pcap/aggreg_handler.cpp 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/src/data/pcap/aggreg_handler.cpp 2013-05-11 22:36:05 UTC (rev 1751)
@@ -229,7 +229,7 @@
}
return result;
- case CBW_AGGR : // full duplex -> bind the CONTINOUS communication between two nodes together
+ case CBW_AGGR : // full duplex -> bind the CONTINUOUS communication between two nodes together
interrupted = active_com_interrupt(default_id,false);
if(!interrupted.empty()) // interrupt active communications
@@ -289,7 +289,7 @@
if((it = active_aggregations.find(default_id)) != active_aggregations.end())
{
if(flow_data.http_msg->is_segment) // if its segment, update last values
- it->second.update_id_time_data(pkt_id,time,flow_data.data_size);
+ it->second.update_id_time_data(pkt_id,time,flow_data.data_size,smart_label);
add_to_defer_msg(it);
active_aggregations.erase(it);
@@ -306,7 +306,7 @@
{
if((it = active_aggregations.find(default_id)) != active_aggregations.end()) // communication already
{
- it->second.update_id_time_data(pkt_id,time,flow_data.data_size);
+ it->second.update_id_time_data(pkt_id,time,flow_data.data_size,smart_label);
}
else
{
@@ -320,7 +320,7 @@
{
if((it = active_aggregations.find(default_id)) != active_aggregations.end()) // communication already
{
- it->second.update_id_time_data(pkt_id,time,flow_data.data_size);
+ it->second.update_id_time_data(pkt_id,time,flow_data.data_size,smart_label);
}
else
{
@@ -372,4 +372,4 @@
}
default : return result;
}
-}
\ No newline at end of file
+}
Modified: trunk/src/data/pcap/aggregation_formats.cpp
===================================================================
--- trunk/src/data/pcap/aggregation_formats.cpp 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/src/data/pcap/aggregation_formats.cpp 2013-05-11 22:36:05 UTC (rev 1751)
@@ -167,12 +167,16 @@
return times;
}
-void AggregStatisitcs::update_id_time_data(int id,double time,u_short size)
+void AggregStatisitcs::update_id_time_data(int id,double time,u_short size,std::string label)
{
ids.second = id;
times.second = time;
packet_count++;
data_size += size;
+ if(label != "")
+ {
+ smart_label = label;
+ }
}
std::string AggregStatisitcs::get_smart_label()
Modified: trunk/src/data/pcap/aggregation_formats.h
===================================================================
--- trunk/src/data/pcap/aggregation_formats.h 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/src/data/pcap/aggregation_formats.h 2013-05-11 22:36:05 UTC (rev 1751)
@@ -266,7 +266,7 @@
/**
* Update statistics with last packets number, time and size
*/
- void update_id_time_data(int last_packet,double time,u_short size);
+ void update_id_time_data(int last_packet,double time,u_short size,std::string label = "");
/**
* Smart label is label put in this class via Constructor.
Modified: trunk/src/data/pcap/application_layer.cpp
===================================================================
--- trunk/src/data/pcap/application_layer.cpp 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/src/data/pcap/application_layer.cpp 2013-05-11 22:36:05 UTC (rev 1751)
@@ -276,7 +276,7 @@
m->is_segment = is_segment = (!erno && ((is_new_packet && !m->message_complete) || (!is_new_packet)));
// set state for http flow
- if(http_settings->show_packet_part)
+ if(http_settings->show_packet_part || http_settings->reassembly)
{
set_http_part(m,is_segment);
}
@@ -344,7 +344,7 @@
}
else
{
- if(http_settings->show_packet_part)
+ if(http_settings->show_packet_part || http_settings->reassembly)
{
ss << http_part_names[m->part] << " ";
}
Modified: trunk/src/data/pcap/pcap_handler.cpp
===================================================================
--- trunk/src/data/pcap/pcap_handler.cpp 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/src/data/pcap/pcap_handler.cpp 2013-05-11 22:36:05 UTC (rev 1751)
@@ -134,7 +134,7 @@
// set interval
MscTimeIntervalSet<double> new_rel_interval;
- new_rel_interval.insert(MscTimeInterval<double>(time - abs_last_time));
+ new_rel_interval.insert(MscTimeInterval<double>(settings->round_double(time - abs_last_time)));
TimeRelationEventPtr rel = new TimeRelationEvent(new_rel_interval);
rel->glue_events(prev_e.get(),new_e.get());
Modified: trunk/src/data/pcap/pcap_settings.cpp
===================================================================
--- trunk/src/data/pcap/pcap_settings.cpp 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/src/data/pcap/pcap_settings.cpp 2013-05-11 22:36:05 UTC (rev 1751)
@@ -46,11 +46,24 @@
case SECONDS: pom = ts.tv_sec + (double)ts.tv_usec/1000000; result = round(pom,6); break;
case MILISECONDS: pom = ts.tv_sec*1000 + (double)ts.tv_usec/1000; result = round(pom,3); break;
case MICROSECONDS: pom = ts.tv_sec*1000000 + (double)ts.tv_usec; result = pom; break;
- default: result = 0; break; // NOTE: result = 0; just to assign something reasonable, in fact the function return result unitialized
+ default: result = 0; break;
}
return result;
}
+double PcapSettings::round_double(double time)
+{
+ switch(time_unit)
+ {
+ case SECONDS: return round(time,6);
+ case MILISECONDS: return round(time,3);
+ case MICROSECONDS: return round(time,0);
+ default: return time;
+ }
+ return time;
+}
+
+
double PcapSettings::bytes_to_user_unit(u_short bytes)
{
double result;
Modified: trunk/src/data/pcap/pcap_settings.h
===================================================================
--- trunk/src/data/pcap/pcap_settings.h 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/src/data/pcap/pcap_settings.h 2013-05-11 22:36:05 UTC (rev 1751)
@@ -218,11 +218,16 @@
double bytes_to_user_unit(u_short bytes);
/**
- * Return timeval value in double format
+ * Return timeval value in rounded double format
*/
double timeval_to_double(timeval ts);
/**
+ * Return double rounded by time unit (added for relative times)
+ */
+ double round_double(double time);
+
+ /**
* Check if there is active aggregation or reassembling
*/
bool is_aggregation_active();
Modified: trunk/tests/pcap/CMakeLists.txt
===================================================================
--- trunk/tests/pcap/CMakeLists.txt 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/CMakeLists.txt 2013-05-11 22:36:05 UTC (rev 1751)
@@ -21,9 +21,11 @@
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 rarp_request.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.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)
@@ -46,9 +48,11 @@
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 rarp_request.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.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)
@@ -71,9 +75,11 @@
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 rarp_request.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.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)
@@ -96,9 +102,11 @@
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 rarp_request.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.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)
@@ -121,9 +129,11 @@
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 rarp_request.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.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)
@@ -146,9 +156,11 @@
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 rarp_request.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.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)
@@ -171,9 +183,11 @@
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 rarp_request.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.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)
@@ -196,9 +210,11 @@
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 rarp_request.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.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)
@@ -221,9 +237,11 @@
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 rarp_request.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.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)
@@ -246,9 +264,11 @@
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 rarp_request.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.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)
@@ -271,9 +291,11 @@
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 rarp_request.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.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)
@@ -296,9 +318,11 @@
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 rarp_request.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.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)
@@ -321,9 +345,11 @@
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 rarp_request.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.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)
@@ -346,9 +372,11 @@
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 rarp_request.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.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)
@@ -371,9 +399,11 @@
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 rarp_request.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.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)
@@ -396,9 +426,11 @@
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 rarp_request.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.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)
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-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_all_eq_packets_aggreg.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -7,18 +7,18 @@
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];
+time [@8.167325];
in ARP_7_packets_,2 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in ARP_2_packets_,0 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
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];
+time [@150.798007];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_all_info.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_all_info.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_all_info.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -9,52 +9,52 @@
in 2_Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 from 00.30.54.00.34.56;
time [@0.000664];
in 3_Ethernet_II._ARP_Who_has_192.168.1.2_,2 from 00.30.54.00.34.56;
-time [@8.16728];
+time [@8.167276];
out 4_Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 to 00.30.54.00.34.56;
-time [@8.16732];
+time [@8.167325];
in 5_Ethernet_II._ARP_Who_has_192.168.1.2_,4 from 00.30.54.00.34.56;
-time [@88.1775];
+time [@88.177533];
out 6_Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 to 00.30.54.00.34.56;
-time [@88.1776];
+time [@88.177584];
in 7_Ethernet_II._ARP_Who_has_192.168.1.2_,6 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out 8_Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 to 00.30.54.00.34.56;
-time [@150.798];
+time [@150.798007];
out 9_Ethernet_II._ARP_Who_has_192.168.1.1_,8 to ff.ff.ff.ff.ff.ff;
-time [@279.001];
+time [@279.001476];
in 10_Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 from 00.30.54.00.34.56;
-time [@279.002];
+time [@279.00215];
in 11_Ethernet_II._ARP_Who_has_192.168.1.2_,10 from 00.30.54.00.34.56;
-time [@301.008];
+time [@301.008171];
in 12_Ethernet_II._ARP_Who_has_192.168.1.2_,11 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in 1_Ethernet_II._ARP_Who_has_192.168.1.1_,0 from 00.e0.ed.01.6e.bd;
time [@0];
in 9_Ethernet_II._ARP_Who_has_192.168.1.1_,8 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out 2_Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 to 00.e0.ed.01.6e.bd;
time [@0.000664];
out 3_Ethernet_II._ARP_Who_has_192.168.1.2_,2 to 00.e0.ed.01.6e.bd;
-time [@8.16728];
+time [@8.167276];
in 4_Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 from 00.e0.ed.01.6e.bd;
-time [@8.16732];
+time [@8.167325];
out 5_Ethernet_II._ARP_Who_has_192.168.1.2_,4 to 00.e0.ed.01.6e.bd;
-time [@88.1775];
+time [@88.177533];
in 6_Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 from 00.e0.ed.01.6e.bd;
-time [@88.1776];
+time [@88.177584];
out 7_Ethernet_II._ARP_Who_has_192.168.1.2_,6 to 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.797955];
in 8_Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 from 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.798007];
out 10_Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
out 11_Ethernet_II._ARP_Who_has_192.168.1.2_,10 to 00.e0.ed.01.6e.bd;
-time [@301.008];
+time [@301.008171];
out 12_Ethernet_II._ARP_Who_has_192.168.1.2_,11 to 00.e0.ed.01.6e.bd;
-time [@392.248];
+time [@392.248457];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_app_layer.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_app_layer.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_app_layer.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -9,52 +9,52 @@
in 2_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 from 00.30.54.00.34.56;
time [@0.000664];
in 3_ARP_Who_has_192.168.1.2_,2 from 00.30.54.00.34.56;
-time [@8.16728];
+time [@8.167276];
out 4_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 to 00.30.54.00.34.56;
-time [@8.16732];
+time [@8.167325];
in 5_ARP_Who_has_192.168.1.2_,4 from 00.30.54.00.34.56;
-time [@88.1775];
+time [@88.177533];
out 6_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 to 00.30.54.00.34.56;
-time [@88.1776];
+time [@88.177584];
in 7_ARP_Who_has_192.168.1.2_,6 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out 8_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 to 00.30.54.00.34.56;
-time [@150.798];
+time [@150.798007];
out 9_ARP_Who_has_192.168.1.1_,8 to ff.ff.ff.ff.ff.ff;
-time [@279.001];
+time [@279.001476];
in 10_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 from 00.30.54.00.34.56;
-time [@279.002];
+time [@279.00215];
in 11_ARP_Who_has_192.168.1.2_,10 from 00.30.54.00.34.56;
-time [@301.008];
+time [@301.008171];
in 12_ARP_Who_has_192.168.1.2_,11 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in 1_ARP_Who_has_192.168.1.1_,0 from 00.e0.ed.01.6e.bd;
time [@0];
in 9_ARP_Who_has_192.168.1.1_,8 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out 2_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 to 00.e0.ed.01.6e.bd;
time [@0.000664];
out 3_ARP_Who_has_192.168.1.2_,2 to 00.e0.ed.01.6e.bd;
-time [@8.16728];
+time [@8.167276];
in 4_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 from 00.e0.ed.01.6e.bd;
-time [@8.16732];
+time [@8.167325];
out 5_ARP_Who_has_192.168.1.2_,4 to 00.e0.ed.01.6e.bd;
-time [@88.1775];
+time [@88.177533];
in 6_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 from 00.e0.ed.01.6e.bd;
-time [@88.1776];
+time [@88.177584];
out 7_ARP_Who_has_192.168.1.2_,6 to 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.797955];
in 8_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 from 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.798007];
out 10_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
out 11_ARP_Who_has_192.168.1.2_,10 to 00.e0.ed.01.6e.bd;
-time [@301.008];
+time [@301.008171];
out 12_ARP_Who_has_192.168.1.2_,11 to 00.e0.ed.01.6e.bd;
-time [@392.248];
+time [@392.248457];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_bw_con_com_aggreg.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_bw_con_com_aggreg.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_bw_con_com_aggreg.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -7,26 +7,26 @@
out ARP_,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];
+time [@8.167325];
in ARP_4_packets_,2 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out ARP_,3 to ff.ff.ff.ff.ff.ff;
-time [@279.001];
+time [@279.001476];
in ARP_3_packets_,4 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in ARP_,0 from 00.e0.ed.01.6e.bd;
time [@0];
in ARP_,3 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out ARP_4_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];
+time [@150.798007];
out ARP_3_packets_,4 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_config.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_config.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_config.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -9,52 +9,52 @@
in Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 from 00.30.54.00.34.56;
time [@0.000664];
in Ethernet_II._ARP_Who_has_192.168.1.2_,2 from 00.30.54.00.34.56;
-time [@8.16728];
+time [@8.167276];
out Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 to 00.30.54.00.34.56;
-time [@8.16732];
+time [@8.167325];
in Ethernet_II._ARP_Who_has_192.168.1.2_,4 from 00.30.54.00.34.56;
-time [@88.1775];
+time [@88.177533];
out Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 to 00.30.54.00.34.56;
-time [@88.1776];
+time [@88.177584];
in Ethernet_II._ARP_Who_has_192.168.1.2_,6 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 to 00.30.54.00.34.56;
-time [@150.798];
+time [@150.798007];
out Ethernet_II._ARP_Who_has_192.168.1.1_,8 to ff.ff.ff.ff.ff.ff;
-time [@279.001];
+time [@279.001476];
in Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 from 00.30.54.00.34.56;
-time [@279.002];
+time [@279.00215];
in Ethernet_II._ARP_Who_has_192.168.1.2_,10 from 00.30.54.00.34.56;
-time [@301.008];
+time [@301.008171];
in Ethernet_II._ARP_Who_has_192.168.1.2_,11 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in Ethernet_II._ARP_Who_has_192.168.1.1_,0 from 00.e0.ed.01.6e.bd;
time [@0];
in Ethernet_II._ARP_Who_has_192.168.1.1_,8 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 to 00.e0.ed.01.6e.bd;
time [@0.000664];
out Ethernet_II._ARP_Who_has_192.168.1.2_,2 to 00.e0.ed.01.6e.bd;
-time [@8.16728];
+time [@8.167276];
in Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 from 00.e0.ed.01.6e.bd;
-time [@8.16732];
+time [@8.167325];
out Ethernet_II._ARP_Who_has_192.168.1.2_,4 to 00.e0.ed.01.6e.bd;
-time [@88.1775];
+time [@88.177533];
in Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 from 00.e0.ed.01.6e.bd;
-time [@88.1776];
+time [@88.177584];
out Ethernet_II._ARP_Who_has_192.168.1.2_,6 to 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.797955];
in Ethernet_II._ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 from 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.798007];
out Ethernet_II._ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
out Ethernet_II._ARP_Who_has_192.168.1.2_,10 to 00.e0.ed.01.6e.bd;
-time [@301.008];
+time [@301.008171];
out Ethernet_II._ARP_Who_has_192.168.1.2_,11 to 00.e0.ed.01.6e.bd;
-time [@392.248];
+time [@392.248457];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_link_layer.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_link_layer.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_link_layer.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -9,52 +9,52 @@
in 2_Ethernet_II._,1 from 00.30.54.00.34.56;
time [@0.000664];
in 3_Ethernet_II._,2 from 00.30.54.00.34.56;
-time [@8.16728];
+time [@8.167276];
out 4_Ethernet_II._,3 to 00.30.54.00.34.56;
-time [@8.16732];
+time [@8.167325];
in 5_Ethernet_II._,4 from 00.30.54.00.34.56;
-time [@88.1775];
+time [@88.177533];
out 6_Ethernet_II._,5 to 00.30.54.00.34.56;
-time [@88.1776];
+time [@88.177584];
in 7_Ethernet_II._,6 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out 8_Ethernet_II._,7 to 00.30.54.00.34.56;
-time [@150.798];
+time [@150.798007];
out 9_Ethernet_II._,8 to ff.ff.ff.ff.ff.ff;
-time [@279.001];
+time [@279.001476];
in 10_Ethernet_II._,9 from 00.30.54.00.34.56;
-time [@279.002];
+time [@279.00215];
in 11_Ethernet_II._,10 from 00.30.54.00.34.56;
-time [@301.008];
+time [@301.008171];
in 12_Ethernet_II._,11 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in 1_Ethernet_II._,0 from 00.e0.ed.01.6e.bd;
time [@0];
in 9_Ethernet_II._,8 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out 2_Ethernet_II._,1 to 00.e0.ed.01.6e.bd;
time [@0.000664];
out 3_Ethernet_II._,2 to 00.e0.ed.01.6e.bd;
-time [@8.16728];
+time [@8.167276];
in 4_Ethernet_II._,3 from 00.e0.ed.01.6e.bd;
-time [@8.16732];
+time [@8.167325];
out 5_Ethernet_II._,4 to 00.e0.ed.01.6e.bd;
-time [@88.1775];
+time [@88.177533];
in 6_Ethernet_II._,5 from 00.e0.ed.01.6e.bd;
-time [@88.1776];
+time [@88.177584];
out 7_Ethernet_II._,6 to 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.797955];
in 8_Ethernet_II._,7 from 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.798007];
out 10_Ethernet_II._,9 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
out 11_Ethernet_II._,10 to 00.e0.ed.01.6e.bd;
-time [@301.008];
+time [@301.008171];
out 12_Ethernet_II._,11 to 00.e0.ed.01.6e.bd;
-time [@392.248];
+time [@392.248457];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_lst_aggreg.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_lst_aggreg.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_lst_aggreg.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -7,42 +7,42 @@
out ARP_,0 to ff.ff.ff.ff.ff.ff;
time [@0];
in ARP_2_packets_,1 from 00.30.54.00.34.56;
-time [@8.16728];
+time [@8.167276];
out ARP_,2 to 00.30.54.00.34.56;
-time [@8.16732];
+time [@8.167325];
in ARP_,3 from 00.30.54.00.34.56;
-time [@88.1775];
+time [@88.177533];
out ARP_,4 to 00.30.54.00.34.56;
-time [@88.1776];
+time [@88.177584];
in ARP_,5 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out ARP_,6 to 00.30.54.00.34.56;
-time [@150.798];
+time [@150.798007];
out ARP_,7 to ff.ff.ff.ff.ff.ff;
-time [@279.001];
+time [@279.001476];
in ARP_3_packets_,8 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in ARP_,0 from 00.e0.ed.01.6e.bd;
time [@0];
in ARP_,7 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out ARP_2_packets_,1 to 00.e0.ed.01.6e.bd;
time [@0.000664];
in ARP_,2 from 00.e0.ed.01.6e.bd;
-time [@8.16732];
+time [@8.167325];
out ARP_,3 to 00.e0.ed.01.6e.bd;
-time [@88.1775];
+time [@88.177533];
in ARP_,4 from 00.e0.ed.01.6e.bd;
-time [@88.1776];
+time [@88.177584];
out ARP_,5 to 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.797955];
in ARP_,6 from 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.798007];
out ARP_3_packets_,8 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_mix.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_mix.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_mix.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -9,52 +9,52 @@
in 2_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 from 00.30.54.00.34.56;
time [@0.664];
in 3_ARP_Who_has_192.168.1.2_,2 from 00.30.54.00.34.56;
-time [@8167.28];
+time [@8167.276];
out 4_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 to 00.30.54.00.34.56;
-time [@8167.32];
+time [@8167.325];
in 5_ARP_Who_has_192.168.1.2_,4 from 00.30.54.00.34.56;
-time [@88177.5];
+time [@88177.533];
out 6_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 to 00.30.54.00.34.56;
-time [@88177.6];
+time [@88177.584];
in 7_ARP_Who_has_192.168.1.2_,6 from 00.30.54.00.34.56;
-time [@150798];
+time [@150797.955];
out 8_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 to 00.30.54.00.34.56;
-time [@150798];
+time [@150798.007];
out 9_ARP_Who_has_192.168.1.1_,8 to ff.ff.ff.ff.ff.ff;
-time [@279001];
+time [@279001.476];
in 10_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 from 00.30.54.00.34.56;
-time [@279002];
+time [@279002.15];
in 11_ARP_Who_has_192.168.1.2_,10 from 00.30.54.00.34.56;
-time [@301008];
+time [@301008.171];
in 12_ARP_Who_has_192.168.1.2_,11 from 00.30.54.00.34.56;
-time [@392248];
+time [@392248.457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in 1_ARP_Who_has_192.168.1.1_,0 from 00.e0.ed.01.6e.bd;
time [@0];
in 9_ARP_Who_has_192.168.1.1_,8 from 00.e0.ed.01.6e.bd;
-time [@279001];
+time [@279001.476];
endinstance;
00.30.54.00.34.56: instance;
out 2_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 to 00.e0.ed.01.6e.bd;
time [@0.664];
out 3_ARP_Who_has_192.168.1.2_,2 to 00.e0.ed.01.6e.bd;
-time [@8167.28];
+time [@8167.276];
in 4_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 from 00.e0.ed.01.6e.bd;
-time [@8167.32];
+time [@8167.325];
out 5_ARP_Who_has_192.168.1.2_,4 to 00.e0.ed.01.6e.bd;
-time [@88177.5];
+time [@88177.533];
in 6_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 from 00.e0.ed.01.6e.bd;
-time [@88177.6];
+time [@88177.584];
out 7_ARP_Who_has_192.168.1.2_,6 to 00.e0.ed.01.6e.bd;
-time [@150798];
+time [@150797.955];
in 8_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 from 00.e0.ed.01.6e.bd;
-time [@150798];
+time [@150798.007];
out 10_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 to 00.e0.ed.01.6e.bd;
-time [@279002];
+time [@279002.15];
out 11_ARP_Who_has_192.168.1.2_,10 to 00.e0.ed.01.6e.bd;
-time [@301008];
+time [@301008.171];
out 12_ARP_Who_has_192.168.1.2_,11 to 00.e0.ed.01.6e.bd;
-time [@392248];
+time [@392248.457];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_net_layer.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_net_layer.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_net_layer.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -9,52 +9,52 @@
in 2_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 from 00.30.54.00.34.56;
time [@0.000664];
in 3_ARP_Who_has_192.168.1.2_,2 from 00.30.54.00.34.56;
-time [@8.16728];
+time [@8.167276];
out 4_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 to 00.30.54.00.34.56;
-time [@8.16732];
+time [@8.167325];
in 5_ARP_Who_has_192.168.1.2_,4 from 00.30.54.00.34.56;
-time [@88.1775];
+time [@88.177533];
out 6_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 to 00.30.54.00.34.56;
-time [@88.1776];
+time [@88.177584];
in 7_ARP_Who_has_192.168.1.2_,6 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out 8_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 to 00.30.54.00.34.56;
-time [@150.798];
+time [@150.798007];
out 9_ARP_Who_has_192.168.1.1_,8 to ff.ff.ff.ff.ff.ff;
-time [@279.001];
+time [@279.001476];
in 10_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 from 00.30.54.00.34.56;
-time [@279.002];
+time [@279.00215];
in 11_ARP_Who_has_192.168.1.2_,10 from 00.30.54.00.34.56;
-time [@301.008];
+time [@301.008171];
in 12_ARP_Who_has_192.168.1.2_,11 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in 1_ARP_Who_has_192.168.1.1_,0 from 00.e0.ed.01.6e.bd;
time [@0];
in 9_ARP_Who_has_192.168.1.1_,8 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out 2_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 to 00.e0.ed.01.6e.bd;
time [@0.000664];
out 3_ARP_Who_has_192.168.1.2_,2 to 00.e0.ed.01.6e.bd;
-time [@8.16728];
+time [@8.167276];
in 4_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 from 00.e0.ed.01.6e.bd;
-time [@8.16732];
+time [@8.167325];
out 5_ARP_Who_has_192.168.1.2_,4 to 00.e0.ed.01.6e.bd;
-time [@88.1775];
+time [@88.177533];
in 6_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 from 00.e0.ed.01.6e.bd;
-time [@88.1776];
+time [@88.177584];
out 7_ARP_Who_has_192.168.1.2_,6 to 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.797955];
in 8_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 from 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.798007];
out 10_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
out 11_ARP_Who_has_192.168.1.2_,10 to 00.e0.ed.01.6e.bd;
-time [@301.008];
+time [@301.008171];
out 12_ARP_Who_has_192.168.1.2_,11 to 00.e0.ed.01.6e.bd;
-time [@392.248];
+time [@392.248457];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_ow_con_com_aggreg.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_ow_con_com_aggreg.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_ow_con_com_aggreg.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -7,38 +7,38 @@
out ARP_2_packets_,0 to ff.ff.ff.ff.ff.ff;
time [@0];
in ARP_2_packets_,1 from 00.30.54.00.34.56;
-time [@8.16728];
+time [@8.167276];
out ARP_,2 to 00.30.54.00.34.56;
-time [@8.16732];
+time [@8.167325];
in ARP_,3 from 00.30.54.00.34.56;
-time [@88.1775];
+time [@88.177533];
out ARP_,4 to 00.30.54.00.34.56;
-time [@88.1776];
+time [@88.177584];
in ARP_,5 from 00.30.54.00.34.56;
-time [@150.798];
+time [@150.797955];
out ARP_,6 to 00.30.54.00.34.56;
-time [@150.798];
+time [@150.798007];
in ARP_3_packets_,7 from 00.30.54.00.34.56;
-time [@392.248];
+time [@392.248457];
endinstance;
ff.ff.ff.ff.ff.ff: instance;
in ARP_2_packets_,0 from 00.e0.ed.01.6e.bd;
-time [@279.001];
+time [@279.001476];
endinstance;
00.30.54.00.34.56: instance;
out ARP_2_packets_,1 to 00.e0.ed.01.6e.bd;
time [@0.000664];
in ARP_,2 from 00.e0.ed.01.6e.bd;
-time [@8.16732];
+time [@8.167325];
out ARP_,3 to 00.e0.ed.01.6e.bd;
-time [@88.1775];
+time [@88.177533];
in ARP_,4 from 00.e0.ed.01.6e.bd;
-time [@88.1776];
+time [@88.177584];
out ARP_,5 to 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.797955];
in ARP_,6 from 00.e0.ed.01.6e.bd;
-time [@150.798];
+time [@150.798007];
out ARP_3_packets_,7 to 00.e0.ed.01.6e.bd;
-time [@279.002];
+time [@279.00215];
endinstance;
endmsc;
Modified: trunk/tests/pcap/mpr_out/arp_example_relative_time.mpr
===================================================================
--- trunk/tests/pcap/mpr_out/arp_example_relative_time.mpr 2013-05-08 17:51:47 UTC (rev 1750)
+++ trunk/tests/pcap/mpr_out/arp_example_relative_time.mpr 2013-05-11 22:36:05 UTC (rev 1751)
@@ -9,72 +9,72 @@
time e1 [0.000664];
label e1;
in 2_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,1 from 00.30.54.00.34.56;
-time e2 [8.16661];
+time e2 [8.166612];
label e2;
in 3_ARP_Who_has_192.168.1.2_,2 from 00.30.54.00.34.56;
time e3 [4.9e-005];
label e3;
out 4_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,3 to 00.30.54.00.34.56;
-time e4 [80.0102];
+time e4 [80.010208];
label e4;
in 5_ARP_Who_has_192.168.1.2_,4 from 00.30.54.00.34.56;
time e5 [5.1e-005];
label e5;
out 6_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,5 to 00.30.54.00.34.56;
-time e6 [62.6204];
+time e6 [62.620371];
label e6;
in 7_ARP_Who_has_192.168.1.2_,6 from 00.30.54.00.34.56;
time e7 [5.2e-005];
label e7;
out 8_ARP_192.168.1.2_is_at_00.e0.ed.01.6e.bd_,7 to 00.30.54.00.34.56;
-time e8 [128.203];
+time e8 [128.203469];
label e8;
out 9_ARP_Who_has_192.168.1.1_,8 to ff.ff.ff.ff.ff.ff;
time e9 [0.000674];
label e9;
in 10_ARP_192.168.1.1_is_at_00.30.54.00.34.56_,9 from 00.30.54.00.34.56;
-time e10 [22.006];
+time e10 [22.006021];
label e10;
in 11_ARP_Who_has_192.168.1.2_,10 from 00.30.54.00.34.56;
-time e11 [91.2403];
+time e11 [91.240286];
label e11;
in 12_ARP_Who_has_192.168.1.2_,11 from 00.30.54.00.34.56;
endinstance;
ff.ff.ff.ff.ff.ff: instance;
label e12;
in 1_ARP_Who_has_192.168.1.1_,0 from 00.e0.ed.01.6e.bd;
-time e13 [279.001];
+time e13 [279.001476];
label e13;
in 9_ARP_Who_has...
[truncated message content] |
