diff options
144 files changed, 157 insertions, 120 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index c235bbe7d1..09d0390af5 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -22,6 +22,16 @@ used for troubleshooting, analysis, development and education. === New and Updated Features The following features are new (or have been significantly updated) +since version 1.99.2: + +* Qt port: + +** Several bugs have been fixed. +** You can now open a packet in a new window. +** The Bluetooth ATT Server Attributes dialog has been added. +** The Coloring Rules dialog has been added. + +The following features are new (or have been significantly updated) since version 1.99.1: * Qt port: diff --git a/docbook/wsdg_graphics/ws-capture-sync.png b/docbook/wsdg_graphics/ws-capture-sync.png Binary files differindex 319b18df9a..d46e1e94c3 100644 --- a/docbook/wsdg_graphics/ws-capture-sync.png +++ b/docbook/wsdg_graphics/ws-capture-sync.png diff --git a/docbook/wsdg_graphics/ws-capture_internals.png b/docbook/wsdg_graphics/ws-capture_internals.png Binary files differindex 14ecbce3bd..21f07a6cb8 100644 --- a/docbook/wsdg_graphics/ws-capture_internals.png +++ b/docbook/wsdg_graphics/ws-capture_internals.png diff --git a/docbook/wsdg_graphics/ws-function-blocks.png b/docbook/wsdg_graphics/ws-function-blocks.png Binary files differindex 04e6efc460..5a2801167a 100644 --- a/docbook/wsdg_graphics/ws-function-blocks.png +++ b/docbook/wsdg_graphics/ws-function-blocks.png diff --git a/docbook/wsdg_graphics/ws-logo.png b/docbook/wsdg_graphics/ws-logo.png Binary files differindex 5c74162440..a203727019 100644 --- a/docbook/wsdg_graphics/ws-logo.png +++ b/docbook/wsdg_graphics/ws-logo.png diff --git a/docbook/wsug_graphics/captureOptions.png b/docbook/wsug_graphics/captureOptions.png Binary files differindex 4cb2e97449..8fefd5a409 100644 --- a/docbook/wsug_graphics/captureOptions.png +++ b/docbook/wsug_graphics/captureOptions.png diff --git a/docbook/wsug_graphics/toolbar/autoscroll_24.png b/docbook/wsug_graphics/toolbar/autoscroll_24.png Binary files differindex c80d544163..dea6fa2493 100644 --- a/docbook/wsug_graphics/toolbar/autoscroll_24.png +++ b/docbook/wsug_graphics/toolbar/autoscroll_24.png diff --git a/docbook/wsug_graphics/toolbar/capture_filter_24.png b/docbook/wsug_graphics/toolbar/capture_filter_24.png Binary files differindex bbe86eaf99..367b2afdd1 100644 --- a/docbook/wsug_graphics/toolbar/capture_filter_24.png +++ b/docbook/wsug_graphics/toolbar/capture_filter_24.png diff --git a/docbook/wsug_graphics/toolbar/capture_interfaces_24.png b/docbook/wsug_graphics/toolbar/capture_interfaces_24.png Binary files differindex 98d2e3a312..1573a47941 100644 --- a/docbook/wsug_graphics/toolbar/capture_interfaces_24.png +++ b/docbook/wsug_graphics/toolbar/capture_interfaces_24.png diff --git a/docbook/wsug_graphics/toolbar/capture_options_24.png b/docbook/wsug_graphics/toolbar/capture_options_24.png Binary files differindex 8f1e299ec8..f105124ae5 100644 --- a/docbook/wsug_graphics/toolbar/capture_options_24.png +++ b/docbook/wsug_graphics/toolbar/capture_options_24.png diff --git a/docbook/wsug_graphics/toolbar/capture_restart_24.png b/docbook/wsug_graphics/toolbar/capture_restart_24.png Binary files differindex 4f6eab20e1..e8d3c28666 100644 --- a/docbook/wsug_graphics/toolbar/capture_restart_24.png +++ b/docbook/wsug_graphics/toolbar/capture_restart_24.png diff --git a/docbook/wsug_graphics/toolbar/capture_start_24.png b/docbook/wsug_graphics/toolbar/capture_start_24.png Binary files differindex 99c1487d1b..bf8be1340a 100644 --- a/docbook/wsug_graphics/toolbar/capture_start_24.png +++ b/docbook/wsug_graphics/toolbar/capture_start_24.png diff --git a/docbook/wsug_graphics/toolbar/capture_stop_24.png b/docbook/wsug_graphics/toolbar/capture_stop_24.png Binary files differindex dc19c367cc..68d2b4f47e 100644 --- a/docbook/wsug_graphics/toolbar/capture_stop_24.png +++ b/docbook/wsug_graphics/toolbar/capture_stop_24.png diff --git a/docbook/wsug_graphics/toolbar/colorize_24.png b/docbook/wsug_graphics/toolbar/colorize_24.png Binary files differindex 9110a79125..9dd7de1a16 100644 --- a/docbook/wsug_graphics/toolbar/colorize_24.png +++ b/docbook/wsug_graphics/toolbar/colorize_24.png diff --git a/docbook/wsug_graphics/toolbar/display_filter_24.png b/docbook/wsug_graphics/toolbar/display_filter_24.png Binary files differindex a56dacbb83..897aee21a9 100644 --- a/docbook/wsug_graphics/toolbar/display_filter_24.png +++ b/docbook/wsug_graphics/toolbar/display_filter_24.png diff --git a/docbook/wsug_graphics/toolbar/resize_columns_24.png b/docbook/wsug_graphics/toolbar/resize_columns_24.png Binary files differindex aba92db83f..efe1c2002f 100644 --- a/docbook/wsug_graphics/toolbar/resize_columns_24.png +++ b/docbook/wsug_graphics/toolbar/resize_columns_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_add_24.png b/docbook/wsug_graphics/toolbar/stock_add_24.png Binary files differindex 5450b6ac8a..647d1559fc 100644 --- a/docbook/wsug_graphics/toolbar/stock_add_24.png +++ b/docbook/wsug_graphics/toolbar/stock_add_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_apply_20.png b/docbook/wsug_graphics/toolbar/stock_apply_20.png Binary files differindex c85da18937..4e430ef28d 100644 --- a/docbook/wsug_graphics/toolbar/stock_apply_20.png +++ b/docbook/wsug_graphics/toolbar/stock_apply_20.png diff --git a/docbook/wsug_graphics/toolbar/stock_bottom_24.png b/docbook/wsug_graphics/toolbar/stock_bottom_24.png Binary files differindex 87c63c99d4..87bd26d05a 100644 --- a/docbook/wsug_graphics/toolbar/stock_bottom_24.png +++ b/docbook/wsug_graphics/toolbar/stock_bottom_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_clear_24.png b/docbook/wsug_graphics/toolbar/stock_clear_24.png Binary files differindex 0609dace49..301b3f50b3 100644 --- a/docbook/wsug_graphics/toolbar/stock_clear_24.png +++ b/docbook/wsug_graphics/toolbar/stock_clear_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_close_24.png b/docbook/wsug_graphics/toolbar/stock_close_24.png Binary files differindex 70581b25ff..cd30aba4d5 100644 --- a/docbook/wsug_graphics/toolbar/stock_close_24.png +++ b/docbook/wsug_graphics/toolbar/stock_close_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_colorselector_24.png b/docbook/wsug_graphics/toolbar/stock_colorselector_24.png Binary files differindex ce312cdf6a..efbfe7d3ce 100644 --- a/docbook/wsug_graphics/toolbar/stock_colorselector_24.png +++ b/docbook/wsug_graphics/toolbar/stock_colorselector_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_help_24.png b/docbook/wsug_graphics/toolbar/stock_help_24.png Binary files differindex 8097840e74..6d1bee61b3 100644 --- a/docbook/wsug_graphics/toolbar/stock_help_24.png +++ b/docbook/wsug_graphics/toolbar/stock_help_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_jump_to_24.png b/docbook/wsug_graphics/toolbar/stock_jump_to_24.png Binary files differindex 47b42000af..a106a99e07 100644 --- a/docbook/wsug_graphics/toolbar/stock_jump_to_24.png +++ b/docbook/wsug_graphics/toolbar/stock_jump_to_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_left_arrow_24.png b/docbook/wsug_graphics/toolbar/stock_left_arrow_24.png Binary files differindex 190c53eca4..608df1bcda 100644 --- a/docbook/wsug_graphics/toolbar/stock_left_arrow_24.png +++ b/docbook/wsug_graphics/toolbar/stock_left_arrow_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_open_24.png b/docbook/wsug_graphics/toolbar/stock_open_24.png Binary files differindex be90d2f6bd..7be8ffc8b0 100644 --- a/docbook/wsug_graphics/toolbar/stock_open_24.png +++ b/docbook/wsug_graphics/toolbar/stock_open_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_preferences_24.png b/docbook/wsug_graphics/toolbar/stock_preferences_24.png Binary files differindex 104426f217..cf4e9448f7 100644 --- a/docbook/wsug_graphics/toolbar/stock_preferences_24.png +++ b/docbook/wsug_graphics/toolbar/stock_preferences_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_print_24.png b/docbook/wsug_graphics/toolbar/stock_print_24.png Binary files differindex 5e4ef2bcab..31f7d405dc 100644 --- a/docbook/wsug_graphics/toolbar/stock_print_24.png +++ b/docbook/wsug_graphics/toolbar/stock_print_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_properties_24.png b/docbook/wsug_graphics/toolbar/stock_properties_24.png Binary files differindex 8fd188e343..e383207874 100644 --- a/docbook/wsug_graphics/toolbar/stock_properties_24.png +++ b/docbook/wsug_graphics/toolbar/stock_properties_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_refresh_24.png b/docbook/wsug_graphics/toolbar/stock_refresh_24.png Binary files differindex f4b4922004..2afb211d67 100644 --- a/docbook/wsug_graphics/toolbar/stock_refresh_24.png +++ b/docbook/wsug_graphics/toolbar/stock_refresh_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_right_arrow_24.png b/docbook/wsug_graphics/toolbar/stock_right_arrow_24.png Binary files differindex 4ecb0bc68d..4f9b29d291 100644 --- a/docbook/wsug_graphics/toolbar/stock_right_arrow_24.png +++ b/docbook/wsug_graphics/toolbar/stock_right_arrow_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_save_24.png b/docbook/wsug_graphics/toolbar/stock_save_24.png Binary files differindex 4aeab2a8bc..fd86c9ef0c 100644 --- a/docbook/wsug_graphics/toolbar/stock_save_24.png +++ b/docbook/wsug_graphics/toolbar/stock_save_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_save_as_24.png b/docbook/wsug_graphics/toolbar/stock_save_as_24.png Binary files differindex 8c6d95ef9f..ec08b04e81 100644 --- a/docbook/wsug_graphics/toolbar/stock_save_as_24.png +++ b/docbook/wsug_graphics/toolbar/stock_save_as_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_search_24.png b/docbook/wsug_graphics/toolbar/stock_search_24.png Binary files differindex 42f1e251ef..fda79dd451 100644 --- a/docbook/wsug_graphics/toolbar/stock_search_24.png +++ b/docbook/wsug_graphics/toolbar/stock_search_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_stop_24.png b/docbook/wsug_graphics/toolbar/stock_stop_24.png Binary files differindex 2b14bb99d2..5c9ba690e3 100644 --- a/docbook/wsug_graphics/toolbar/stock_stop_24.png +++ b/docbook/wsug_graphics/toolbar/stock_stop_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_top_24.png b/docbook/wsug_graphics/toolbar/stock_top_24.png Binary files differindex 664211bf4e..251fce3218 100644 --- a/docbook/wsug_graphics/toolbar/stock_top_24.png +++ b/docbook/wsug_graphics/toolbar/stock_top_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_zoom_1_24.png b/docbook/wsug_graphics/toolbar/stock_zoom_1_24.png Binary files differindex b1ac89b5ed..0e5de1c022 100644 --- a/docbook/wsug_graphics/toolbar/stock_zoom_1_24.png +++ b/docbook/wsug_graphics/toolbar/stock_zoom_1_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_zoom_in_24.png b/docbook/wsug_graphics/toolbar/stock_zoom_in_24.png Binary files differindex 20eb9bb793..d41894f2ed 100644 --- a/docbook/wsug_graphics/toolbar/stock_zoom_in_24.png +++ b/docbook/wsug_graphics/toolbar/stock_zoom_in_24.png diff --git a/docbook/wsug_graphics/toolbar/stock_zoom_out_24.png b/docbook/wsug_graphics/toolbar/stock_zoom_out_24.png Binary files differindex fab02d524c..bd98f3a069 100644 --- a/docbook/wsug_graphics/toolbar/stock_zoom_out_24.png +++ b/docbook/wsug_graphics/toolbar/stock_zoom_out_24.png diff --git a/docbook/wsug_graphics/ws-analyze-menu.png b/docbook/wsug_graphics/ws-analyze-menu.png Binary files differindex 756b1a3d39..ad1c2a76fc 100644 --- a/docbook/wsug_graphics/ws-analyze-menu.png +++ b/docbook/wsug_graphics/ws-analyze-menu.png diff --git a/docbook/wsug_graphics/ws-bytes-pane-tabs.png b/docbook/wsug_graphics/ws-bytes-pane-tabs.png Binary files differindex a7886d4452..2954cd7f38 100644 --- a/docbook/wsug_graphics/ws-bytes-pane-tabs.png +++ b/docbook/wsug_graphics/ws-bytes-pane-tabs.png diff --git a/docbook/wsug_graphics/ws-bytes-pane.png b/docbook/wsug_graphics/ws-bytes-pane.png Binary files differindex cb7ddbedf2..195963851a 100644 --- a/docbook/wsug_graphics/ws-bytes-pane.png +++ b/docbook/wsug_graphics/ws-bytes-pane.png diff --git a/docbook/wsug_graphics/ws-capture-info.png b/docbook/wsug_graphics/ws-capture-info.png Binary files differindex e303b55696..ce886df8b8 100644 --- a/docbook/wsug_graphics/ws-capture-info.png +++ b/docbook/wsug_graphics/ws-capture-info.png diff --git a/docbook/wsug_graphics/ws-capture-interface-details.png b/docbook/wsug_graphics/ws-capture-interface-details.png Binary files differindex ff2bf11d9a..a8952be331 100644 --- a/docbook/wsug_graphics/ws-capture-interface-details.png +++ b/docbook/wsug_graphics/ws-capture-interface-details.png diff --git a/docbook/wsug_graphics/ws-capture-interfaces-win32.png b/docbook/wsug_graphics/ws-capture-interfaces-win32.png Binary files differindex 4594eeee2a..dfb6b50222 100644 --- a/docbook/wsug_graphics/ws-capture-interfaces-win32.png +++ b/docbook/wsug_graphics/ws-capture-interfaces-win32.png diff --git a/docbook/wsug_graphics/ws-capture-interfaces.png b/docbook/wsug_graphics/ws-capture-interfaces.png Binary files differindex 50c3e415f3..72dc3bc3ea 100644 --- a/docbook/wsug_graphics/ws-capture-interfaces.png +++ b/docbook/wsug_graphics/ws-capture-interfaces.png diff --git a/docbook/wsug_graphics/ws-capture-menu.png b/docbook/wsug_graphics/ws-capture-menu.png Binary files differindex 7769173733..fcec593f4b 100644 --- a/docbook/wsug_graphics/ws-capture-menu.png +++ b/docbook/wsug_graphics/ws-capture-menu.png diff --git a/docbook/wsug_graphics/ws-capture-options-compile-selected-bpfs.png b/docbook/wsug_graphics/ws-capture-options-compile-selected-bpfs.png Binary files differindex 9c66c05dad..9441a4ebbe 100644 --- a/docbook/wsug_graphics/ws-capture-options-compile-selected-bpfs.png +++ b/docbook/wsug_graphics/ws-capture-options-compile-selected-bpfs.png diff --git a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-local.png b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-local.png Binary files differindex 04f85677f4..365d9e2727 100644 --- a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-local.png +++ b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-local.png diff --git a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-pipes.png b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-pipes.png Binary files differindex 3f5a3efd64..e1573549a6 100644 --- a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-pipes.png +++ b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-pipes.png diff --git a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote-plus.png b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote-plus.png Binary files differindex a02d80cdf6..02d0d28b0d 100644 --- a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote-plus.png +++ b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote-plus.png diff --git a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote.png b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote.png Binary files differindex bbdc869167..07ef69b64d 100644 --- a/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote.png +++ b/docbook/wsug_graphics/ws-capture-options-manage-interfaces-remote.png diff --git a/docbook/wsug_graphics/ws-capture-options-manage-interfaces.png b/docbook/wsug_graphics/ws-capture-options-manage-interfaces.png Binary files differindex b857224d7c..cfb5aa14d5 100644 --- a/docbook/wsug_graphics/ws-capture-options-manage-interfaces.png +++ b/docbook/wsug_graphics/ws-capture-options-manage-interfaces.png diff --git a/docbook/wsug_graphics/ws-capture-options-remote-capture.png b/docbook/wsug_graphics/ws-capture-options-remote-capture.png Binary files differindex d51b10f563..dfcdd94a58 100644 --- a/docbook/wsug_graphics/ws-capture-options-remote-capture.png +++ b/docbook/wsug_graphics/ws-capture-options-remote-capture.png diff --git a/docbook/wsug_graphics/ws-capture-options-remote-interface.png b/docbook/wsug_graphics/ws-capture-options-remote-interface.png Binary files differindex b95fbbf268..bb375ff1f4 100644 --- a/docbook/wsug_graphics/ws-capture-options-remote-interface.png +++ b/docbook/wsug_graphics/ws-capture-options-remote-interface.png diff --git a/docbook/wsug_graphics/ws-capture-options-remote-settings.png b/docbook/wsug_graphics/ws-capture-options-remote-settings.png Binary files differindex 6733da714c..6f9ca5d831 100644 --- a/docbook/wsug_graphics/ws-capture-options-remote-settings.png +++ b/docbook/wsug_graphics/ws-capture-options-remote-settings.png diff --git a/docbook/wsug_graphics/ws-capture-options-settings.png b/docbook/wsug_graphics/ws-capture-options-settings.png Binary files differindex d7a2a614e1..a3d33a0e3d 100644 --- a/docbook/wsug_graphics/ws-capture-options-settings.png +++ b/docbook/wsug_graphics/ws-capture-options-settings.png diff --git a/docbook/wsug_graphics/ws-capture-options.png b/docbook/wsug_graphics/ws-capture-options.png Binary files differindex 4cb2e97449..8fefd5a409 100644 --- a/docbook/wsug_graphics/ws-capture-options.png +++ b/docbook/wsug_graphics/ws-capture-options.png diff --git a/docbook/wsug_graphics/ws-capture-preferences.png b/docbook/wsug_graphics/ws-capture-preferences.png Binary files differindex f48e664351..e2d4582fce 100644 --- a/docbook/wsug_graphics/ws-capture-preferences.png +++ b/docbook/wsug_graphics/ws-capture-preferences.png diff --git a/docbook/wsug_graphics/ws-choose-color-rule.png b/docbook/wsug_graphics/ws-choose-color-rule.png Binary files differindex f690a825b2..97bbec1228 100644 --- a/docbook/wsug_graphics/ws-choose-color-rule.png +++ b/docbook/wsug_graphics/ws-choose-color-rule.png diff --git a/docbook/wsug_graphics/ws-coloring-fields.png b/docbook/wsug_graphics/ws-coloring-fields.png Binary files differindex 0f67ff63fa..9a5171ab48 100644 --- a/docbook/wsug_graphics/ws-coloring-fields.png +++ b/docbook/wsug_graphics/ws-coloring-fields.png diff --git a/docbook/wsug_graphics/ws-coloring-rules-dialog.png b/docbook/wsug_graphics/ws-coloring-rules-dialog.png Binary files differindex 7894175b24..ac6d28e552 100644 --- a/docbook/wsug_graphics/ws-coloring-rules-dialog.png +++ b/docbook/wsug_graphics/ws-coloring-rules-dialog.png diff --git a/docbook/wsug_graphics/ws-column-header-popup-menu.png b/docbook/wsug_graphics/ws-column-header-popup-menu.png Binary files differindex a79f8f19ed..a3f88a9ac4 100644 --- a/docbook/wsug_graphics/ws-column-header-popup-menu.png +++ b/docbook/wsug_graphics/ws-column-header-popup-menu.png diff --git a/docbook/wsug_graphics/ws-decode-as-show.png b/docbook/wsug_graphics/ws-decode-as-show.png Binary files differindex c249b0bc72..849c1c6342 100644 --- a/docbook/wsug_graphics/ws-decode-as-show.png +++ b/docbook/wsug_graphics/ws-decode-as-show.png diff --git a/docbook/wsug_graphics/ws-decode-as.png b/docbook/wsug_graphics/ws-decode-as.png Binary files differindex 6741ab35b2..767945cce2 100644 --- a/docbook/wsug_graphics/ws-decode-as.png +++ b/docbook/wsug_graphics/ws-decode-as.png diff --git a/docbook/wsug_graphics/ws-details-pane-popup-menu.png b/docbook/wsug_graphics/ws-details-pane-popup-menu.png Binary files differindex a7801c2949..ada4c6a21b 100644 --- a/docbook/wsug_graphics/ws-details-pane-popup-menu.png +++ b/docbook/wsug_graphics/ws-details-pane-popup-menu.png diff --git a/docbook/wsug_graphics/ws-details-pane.png b/docbook/wsug_graphics/ws-details-pane.png Binary files differindex 835898455c..34cbe1d86c 100644 --- a/docbook/wsug_graphics/ws-details-pane.png +++ b/docbook/wsug_graphics/ws-details-pane.png diff --git a/docbook/wsug_graphics/ws-display-filter-tcp.png b/docbook/wsug_graphics/ws-display-filter-tcp.png Binary files differindex b3750f45a5..62616204b7 100644 --- a/docbook/wsug_graphics/ws-display-filter-tcp.png +++ b/docbook/wsug_graphics/ws-display-filter-tcp.png diff --git a/docbook/wsug_graphics/ws-edit-menu.png b/docbook/wsug_graphics/ws-edit-menu.png Binary files differindex f86a1e5e08..7cae653245 100644 --- a/docbook/wsug_graphics/ws-edit-menu.png +++ b/docbook/wsug_graphics/ws-edit-menu.png diff --git a/docbook/wsug_graphics/ws-enabled-protocols.png b/docbook/wsug_graphics/ws-enabled-protocols.png Binary files differindex 02ad8a25da..5dfda5310d 100644 --- a/docbook/wsug_graphics/ws-enabled-protocols.png +++ b/docbook/wsug_graphics/ws-enabled-protocols.png diff --git a/docbook/wsug_graphics/ws-expert-colored-tree.png b/docbook/wsug_graphics/ws-expert-colored-tree.png Binary files differindex 2897892d37..8bdf015404 100644 --- a/docbook/wsug_graphics/ws-expert-colored-tree.png +++ b/docbook/wsug_graphics/ws-expert-colored-tree.png diff --git a/docbook/wsug_graphics/ws-expert-column.png b/docbook/wsug_graphics/ws-expert-column.png Binary files differindex ecd1f5586a..810c27e69d 100644 --- a/docbook/wsug_graphics/ws-expert-column.png +++ b/docbook/wsug_graphics/ws-expert-column.png diff --git a/docbook/wsug_graphics/ws-expert-infos.png b/docbook/wsug_graphics/ws-expert-infos.png Binary files differindex 8d7f840010..c5c342705c 100644 --- a/docbook/wsug_graphics/ws-expert-infos.png +++ b/docbook/wsug_graphics/ws-expert-infos.png diff --git a/docbook/wsug_graphics/ws-export-objects.png b/docbook/wsug_graphics/ws-export-objects.png Binary files differindex b41f96406e..16aefe8c19 100644 --- a/docbook/wsug_graphics/ws-export-objects.png +++ b/docbook/wsug_graphics/ws-export-objects.png diff --git a/docbook/wsug_graphics/ws-export-pdml.png b/docbook/wsug_graphics/ws-export-pdml.png Binary files differindex e339a91bdc..fc296fa15c 100644 --- a/docbook/wsug_graphics/ws-export-pdml.png +++ b/docbook/wsug_graphics/ws-export-pdml.png diff --git a/docbook/wsug_graphics/ws-export-plain.png b/docbook/wsug_graphics/ws-export-plain.png Binary files differindex e0e24e8d68..94e30d3cee 100644 --- a/docbook/wsug_graphics/ws-export-plain.png +++ b/docbook/wsug_graphics/ws-export-plain.png diff --git a/docbook/wsug_graphics/ws-export-ps.png b/docbook/wsug_graphics/ws-export-ps.png Binary files differindex d9105b79e4..a751d84457 100644 --- a/docbook/wsug_graphics/ws-export-ps.png +++ b/docbook/wsug_graphics/ws-export-ps.png diff --git a/docbook/wsug_graphics/ws-export-psml.png b/docbook/wsug_graphics/ws-export-psml.png Binary files differindex 2b6a335a99..e14a9ed156 100644 --- a/docbook/wsug_graphics/ws-export-psml.png +++ b/docbook/wsug_graphics/ws-export-psml.png diff --git a/docbook/wsug_graphics/ws-export-selected.png b/docbook/wsug_graphics/ws-export-selected.png Binary files differindex 902e0d06d9..4312a3696e 100644 --- a/docbook/wsug_graphics/ws-export-selected.png +++ b/docbook/wsug_graphics/ws-export-selected.png diff --git a/docbook/wsug_graphics/ws-file-import.png b/docbook/wsug_graphics/ws-file-import.png Binary files differindex 10002fcb51..c06ee9babd 100644 --- a/docbook/wsug_graphics/ws-file-import.png +++ b/docbook/wsug_graphics/ws-file-import.png diff --git a/docbook/wsug_graphics/ws-file-menu.png b/docbook/wsug_graphics/ws-file-menu.png Binary files differindex a54a84e3ff..b728a85bd9 100644 --- a/docbook/wsug_graphics/ws-file-menu.png +++ b/docbook/wsug_graphics/ws-file-menu.png diff --git a/docbook/wsug_graphics/ws-file-set-dialog.png b/docbook/wsug_graphics/ws-file-set-dialog.png Binary files differindex 2847078e94..ce63ea1046 100644 --- a/docbook/wsug_graphics/ws-file-set-dialog.png +++ b/docbook/wsug_graphics/ws-file-set-dialog.png diff --git a/docbook/wsug_graphics/ws-filter-add-expression.png b/docbook/wsug_graphics/ws-filter-add-expression.png Binary files differindex 87199185c4..e95637ab55 100644 --- a/docbook/wsug_graphics/ws-filter-add-expression.png +++ b/docbook/wsug_graphics/ws-filter-add-expression.png diff --git a/docbook/wsug_graphics/ws-filter-toolbar.png b/docbook/wsug_graphics/ws-filter-toolbar.png Binary files differindex bcbef0fdf3..01396c61a8 100644 --- a/docbook/wsug_graphics/ws-filter-toolbar.png +++ b/docbook/wsug_graphics/ws-filter-toolbar.png diff --git a/docbook/wsug_graphics/ws-filters.png b/docbook/wsug_graphics/ws-filters.png Binary files differindex 2f20322d3d..b0510aae47 100644 --- a/docbook/wsug_graphics/ws-filters.png +++ b/docbook/wsug_graphics/ws-filters.png diff --git a/docbook/wsug_graphics/ws-find-packet.png b/docbook/wsug_graphics/ws-find-packet.png Binary files differindex b67d0ef6da..2c25d34fed 100644 --- a/docbook/wsug_graphics/ws-find-packet.png +++ b/docbook/wsug_graphics/ws-find-packet.png diff --git a/docbook/wsug_graphics/ws-follow-stream.png b/docbook/wsug_graphics/ws-follow-stream.png Binary files differindex 1c46e875b6..ad50f7c732 100644 --- a/docbook/wsug_graphics/ws-follow-stream.png +++ b/docbook/wsug_graphics/ws-follow-stream.png diff --git a/docbook/wsug_graphics/ws-go-menu.png b/docbook/wsug_graphics/ws-go-menu.png Binary files differindex af7eb076c1..ef1c06c9e1 100644 --- a/docbook/wsug_graphics/ws-go-menu.png +++ b/docbook/wsug_graphics/ws-go-menu.png diff --git a/docbook/wsug_graphics/ws-goto-packet.png b/docbook/wsug_graphics/ws-goto-packet.png Binary files differindex 8a507939c8..8fb1aef7e3 100644 --- a/docbook/wsug_graphics/ws-goto-packet.png +++ b/docbook/wsug_graphics/ws-goto-packet.png diff --git a/docbook/wsug_graphics/ws-gui-colors-preferences.png b/docbook/wsug_graphics/ws-gui-colors-preferences.png Binary files differindex 44033da2e6..c4d3dab0fb 100644 --- a/docbook/wsug_graphics/ws-gui-colors-preferences.png +++ b/docbook/wsug_graphics/ws-gui-colors-preferences.png diff --git a/docbook/wsug_graphics/ws-gui-columns-preferences.png b/docbook/wsug_graphics/ws-gui-columns-preferences.png Binary files differindex 2fe5dc7a0d..f95a4421fa 100644 --- a/docbook/wsug_graphics/ws-gui-columns-preferences.png +++ b/docbook/wsug_graphics/ws-gui-columns-preferences.png diff --git a/docbook/wsug_graphics/ws-gui-config-profiles.png b/docbook/wsug_graphics/ws-gui-config-profiles.png Binary files differindex 366750cb6b..d698dc0734 100644 --- a/docbook/wsug_graphics/ws-gui-config-profiles.png +++ b/docbook/wsug_graphics/ws-gui-config-profiles.png diff --git a/docbook/wsug_graphics/ws-gui-font-preferences.png b/docbook/wsug_graphics/ws-gui-font-preferences.png Binary files differindex a301a837db..9c97025a08 100644 --- a/docbook/wsug_graphics/ws-gui-font-preferences.png +++ b/docbook/wsug_graphics/ws-gui-font-preferences.png diff --git a/docbook/wsug_graphics/ws-gui-interface-options.png b/docbook/wsug_graphics/ws-gui-interface-options.png Binary files differindex 59c70490e4..64b041e496 100644 --- a/docbook/wsug_graphics/ws-gui-interface-options.png +++ b/docbook/wsug_graphics/ws-gui-interface-options.png diff --git a/docbook/wsug_graphics/ws-gui-layout-preferences.png b/docbook/wsug_graphics/ws-gui-layout-preferences.png Binary files differindex 23af3ec904..139bd01eea 100644 --- a/docbook/wsug_graphics/ws-gui-layout-preferences.png +++ b/docbook/wsug_graphics/ws-gui-layout-preferences.png diff --git a/docbook/wsug_graphics/ws-gui-preferences.png b/docbook/wsug_graphics/ws-gui-preferences.png Binary files differindex 8f9aa26a44..a2b7658b9e 100644 --- a/docbook/wsug_graphics/ws-gui-preferences.png +++ b/docbook/wsug_graphics/ws-gui-preferences.png diff --git a/docbook/wsug_graphics/ws-help-menu.png b/docbook/wsug_graphics/ws-help-menu.png Binary files differindex 90ccd9ad22..f329c6859f 100644 --- a/docbook/wsug_graphics/ws-help-menu.png +++ b/docbook/wsug_graphics/ws-help-menu.png diff --git a/docbook/wsug_graphics/ws-internals-menu.png b/docbook/wsug_graphics/ws-internals-menu.png Binary files differindex be91d06a54..d51eca3ac5 100644 --- a/docbook/wsug_graphics/ws-internals-menu.png +++ b/docbook/wsug_graphics/ws-internals-menu.png diff --git a/docbook/wsug_graphics/ws-list-pane.png b/docbook/wsug_graphics/ws-list-pane.png Binary files differindex b32fd8bc30..5a4056e2f6 100644 --- a/docbook/wsug_graphics/ws-list-pane.png +++ b/docbook/wsug_graphics/ws-list-pane.png diff --git a/docbook/wsug_graphics/ws-logo.png b/docbook/wsug_graphics/ws-logo.png Binary files differindex f4a6ed1d6c..a203727019 100644 --- a/docbook/wsug_graphics/ws-logo.png +++ b/docbook/wsug_graphics/ws-logo.png diff --git a/docbook/wsug_graphics/ws-main-toolbar.png b/docbook/wsug_graphics/ws-main-toolbar.png Binary files differindex 8e2cbaa042..1e5243111d 100644 --- a/docbook/wsug_graphics/ws-main-toolbar.png +++ b/docbook/wsug_graphics/ws-main-toolbar.png diff --git a/docbook/wsug_graphics/ws-main.png b/docbook/wsug_graphics/ws-main.png Binary files differindex e6e6c7e391..3d8a78b3ec 100644 --- a/docbook/wsug_graphics/ws-main.png +++ b/docbook/wsug_graphics/ws-main.png diff --git a/docbook/wsug_graphics/ws-menu.png b/docbook/wsug_graphics/ws-menu.png Binary files differindex 7efaf44f75..010d8c779a 100644 --- a/docbook/wsug_graphics/ws-menu.png +++ b/docbook/wsug_graphics/ws-menu.png diff --git a/docbook/wsug_graphics/ws-merge-gtk24.png b/docbook/wsug_graphics/ws-merge-gtk24.png Binary files differindex ab7d03cf40..e9dd5284dc 100644 --- a/docbook/wsug_graphics/ws-merge-gtk24.png +++ b/docbook/wsug_graphics/ws-merge-gtk24.png diff --git a/docbook/wsug_graphics/ws-merge-win32.png b/docbook/wsug_graphics/ws-merge-win32.png Binary files differindex f234c4df17..f25d079b7c 100644 --- a/docbook/wsug_graphics/ws-merge-win32.png +++ b/docbook/wsug_graphics/ws-merge-win32.png diff --git a/docbook/wsug_graphics/ws-nameresolution-preferences.png b/docbook/wsug_graphics/ws-nameresolution-preferences.png Binary files differindex 0ae1d846c9..a96e82bce3 100644 --- a/docbook/wsug_graphics/ws-nameresolution-preferences.png +++ b/docbook/wsug_graphics/ws-nameresolution-preferences.png diff --git a/docbook/wsug_graphics/ws-open-gtk24.png b/docbook/wsug_graphics/ws-open-gtk24.png Binary files differindex d2f8652f1c..ab5cff4422 100644 --- a/docbook/wsug_graphics/ws-open-gtk24.png +++ b/docbook/wsug_graphics/ws-open-gtk24.png diff --git a/docbook/wsug_graphics/ws-open-win32.png b/docbook/wsug_graphics/ws-open-win32.png Binary files differindex 40125af81b..b762c9883a 100644 --- a/docbook/wsug_graphics/ws-open-win32.png +++ b/docbook/wsug_graphics/ws-open-win32.png diff --git a/docbook/wsug_graphics/ws-packet-format.png b/docbook/wsug_graphics/ws-packet-format.png Binary files differindex 3a9e499209..7f53b330e7 100644 --- a/docbook/wsug_graphics/ws-packet-format.png +++ b/docbook/wsug_graphics/ws-packet-format.png diff --git a/docbook/wsug_graphics/ws-packet-pane-popup-menu.png b/docbook/wsug_graphics/ws-packet-pane-popup-menu.png Binary files differindex 09022fb3f4..18b7b0c985 100644 --- a/docbook/wsug_graphics/ws-packet-pane-popup-menu.png +++ b/docbook/wsug_graphics/ws-packet-pane-popup-menu.png diff --git a/docbook/wsug_graphics/ws-packet-range.png b/docbook/wsug_graphics/ws-packet-range.png Binary files differindex cf72349cbb..365ec73263 100644 --- a/docbook/wsug_graphics/ws-packet-range.png +++ b/docbook/wsug_graphics/ws-packet-range.png diff --git a/docbook/wsug_graphics/ws-packet-selected.png b/docbook/wsug_graphics/ws-packet-selected.png Binary files differindex a5481790ff..6c51c3c500 100644 --- a/docbook/wsug_graphics/ws-packet-selected.png +++ b/docbook/wsug_graphics/ws-packet-selected.png diff --git a/docbook/wsug_graphics/ws-packet-sep-win.png b/docbook/wsug_graphics/ws-packet-sep-win.png Binary files differindex 21739a4c4d..f9e507ff20 100755..100644 --- a/docbook/wsug_graphics/ws-packet-sep-win.png +++ b/docbook/wsug_graphics/ws-packet-sep-win.png diff --git a/docbook/wsug_graphics/ws-print.png b/docbook/wsug_graphics/ws-print.png Binary files differindex 360fca6b4f..be4af9331e 100644 --- a/docbook/wsug_graphics/ws-print.png +++ b/docbook/wsug_graphics/ws-print.png diff --git a/docbook/wsug_graphics/ws-printing-preferences.png b/docbook/wsug_graphics/ws-printing-preferences.png Binary files differindex c57b238f72..63b12cb4b2 100644 --- a/docbook/wsug_graphics/ws-printing-preferences.png +++ b/docbook/wsug_graphics/ws-printing-preferences.png diff --git a/docbook/wsug_graphics/ws-save-as-gtk24.png b/docbook/wsug_graphics/ws-save-as-gtk24.png Binary files differindex 2d2ecb1789..45b2f62d87 100644 --- a/docbook/wsug_graphics/ws-save-as-gtk24.png +++ b/docbook/wsug_graphics/ws-save-as-gtk24.png diff --git a/docbook/wsug_graphics/ws-save-as-win32.png b/docbook/wsug_graphics/ws-save-as-win32.png Binary files differindex dd9bd8d926..d3444ecf11 100644 --- a/docbook/wsug_graphics/ws-save-as-win32.png +++ b/docbook/wsug_graphics/ws-save-as-win32.png diff --git a/docbook/wsug_graphics/ws-statistics-menu.png b/docbook/wsug_graphics/ws-statistics-menu.png Binary files differindex 628850e419..dcd9409c1b 100644 --- a/docbook/wsug_graphics/ws-statistics-menu.png +++ b/docbook/wsug_graphics/ws-statistics-menu.png diff --git a/docbook/wsug_graphics/ws-stats-compare.png b/docbook/wsug_graphics/ws-stats-compare.png Binary files differindex 1433cd3074..1058ac1072 100644 --- a/docbook/wsug_graphics/ws-stats-compare.png +++ b/docbook/wsug_graphics/ws-stats-compare.png diff --git a/docbook/wsug_graphics/ws-stats-conversations.png b/docbook/wsug_graphics/ws-stats-conversations.png Binary files differindex 12458c1c7c..2849e5b5ef 100644 --- a/docbook/wsug_graphics/ws-stats-conversations.png +++ b/docbook/wsug_graphics/ws-stats-conversations.png diff --git a/docbook/wsug_graphics/ws-stats-endpoints.png b/docbook/wsug_graphics/ws-stats-endpoints.png Binary files differindex 60af554ba0..e4292024fd 100644 --- a/docbook/wsug_graphics/ws-stats-endpoints.png +++ b/docbook/wsug_graphics/ws-stats-endpoints.png diff --git a/docbook/wsug_graphics/ws-stats-hierarchy.png b/docbook/wsug_graphics/ws-stats-hierarchy.png Binary files differindex a34d4a13cc..e8a9958746 100644 --- a/docbook/wsug_graphics/ws-stats-hierarchy.png +++ b/docbook/wsug_graphics/ws-stats-hierarchy.png diff --git a/docbook/wsug_graphics/ws-stats-iographs.png b/docbook/wsug_graphics/ws-stats-iographs.png Binary files differindex f805a21ae0..8a7dfedc64 100644 --- a/docbook/wsug_graphics/ws-stats-iographs.png +++ b/docbook/wsug_graphics/ws-stats-iographs.png diff --git a/docbook/wsug_graphics/ws-stats-lte-mac-traffic.png b/docbook/wsug_graphics/ws-stats-lte-mac-traffic.png Binary files differindex afdd2785d2..441ab970a7 100644 --- a/docbook/wsug_graphics/ws-stats-lte-mac-traffic.png +++ b/docbook/wsug_graphics/ws-stats-lte-mac-traffic.png diff --git a/docbook/wsug_graphics/ws-stats-lte-rlc-traffic.png b/docbook/wsug_graphics/ws-stats-lte-rlc-traffic.png Binary files differindex e97431f68f..9fb13647f2 100644 --- a/docbook/wsug_graphics/ws-stats-lte-rlc-traffic.png +++ b/docbook/wsug_graphics/ws-stats-lte-rlc-traffic.png diff --git a/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png b/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png Binary files differindex e9e8cea441..e742367e82 100644 --- a/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png +++ b/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png diff --git a/docbook/wsug_graphics/ws-stats-srt-dcerpc.png b/docbook/wsug_graphics/ws-stats-srt-dcerpc.png Binary files differindex 2760f003ef..bc9bf10987 100644 --- a/docbook/wsug_graphics/ws-stats-srt-dcerpc.png +++ b/docbook/wsug_graphics/ws-stats-srt-dcerpc.png diff --git a/docbook/wsug_graphics/ws-stats-summary.png b/docbook/wsug_graphics/ws-stats-summary.png Binary files differindex 3a341b0317..9016bdf1a3 100644 --- a/docbook/wsug_graphics/ws-stats-summary.png +++ b/docbook/wsug_graphics/ws-stats-summary.png diff --git a/docbook/wsug_graphics/ws-stats-wlan-traffic.png b/docbook/wsug_graphics/ws-stats-wlan-traffic.png Binary files differindex ac1378a318..e2b44b2ebf 100644 --- a/docbook/wsug_graphics/ws-stats-wlan-traffic.png +++ b/docbook/wsug_graphics/ws-stats-wlan-traffic.png diff --git a/docbook/wsug_graphics/ws-statusbar-empty.png b/docbook/wsug_graphics/ws-statusbar-empty.png Binary files differindex e3c18dd371..b6afd353bd 100644 --- a/docbook/wsug_graphics/ws-statusbar-empty.png +++ b/docbook/wsug_graphics/ws-statusbar-empty.png diff --git a/docbook/wsug_graphics/ws-statusbar-filter.png b/docbook/wsug_graphics/ws-statusbar-filter.png Binary files differindex 9e8a99f0bd..eca87f014d 100644 --- a/docbook/wsug_graphics/ws-statusbar-filter.png +++ b/docbook/wsug_graphics/ws-statusbar-filter.png diff --git a/docbook/wsug_graphics/ws-statusbar-loaded.png b/docbook/wsug_graphics/ws-statusbar-loaded.png Binary files differindex 8be6d7353c..90defe768a 100644 --- a/docbook/wsug_graphics/ws-statusbar-loaded.png +++ b/docbook/wsug_graphics/ws-statusbar-loaded.png diff --git a/docbook/wsug_graphics/ws-statusbar-profile.png b/docbook/wsug_graphics/ws-statusbar-profile.png Binary files differindex 2618927aa9..6004807593 100644 --- a/docbook/wsug_graphics/ws-statusbar-profile.png +++ b/docbook/wsug_graphics/ws-statusbar-profile.png diff --git a/docbook/wsug_graphics/ws-statusbar-selected.png b/docbook/wsug_graphics/ws-statusbar-selected.png Binary files differindex 3e403c38dc..b955267973 100644 --- a/docbook/wsug_graphics/ws-statusbar-selected.png +++ b/docbook/wsug_graphics/ws-statusbar-selected.png diff --git a/docbook/wsug_graphics/ws-tel-rtpstream-analysis.png b/docbook/wsug_graphics/ws-tel-rtpstream-analysis.png Binary files differindex 8cb088cf61..1000cd4a51 100644 --- a/docbook/wsug_graphics/ws-tel-rtpstream-analysis.png +++ b/docbook/wsug_graphics/ws-tel-rtpstream-analysis.png diff --git a/docbook/wsug_graphics/ws-telephony-menu.png b/docbook/wsug_graphics/ws-telephony-menu.png Binary files differindex e6ce045c9c..551c7a3e89 100644 --- a/docbook/wsug_graphics/ws-telephony-menu.png +++ b/docbook/wsug_graphics/ws-telephony-menu.png diff --git a/docbook/wsug_graphics/ws-time-reference.png b/docbook/wsug_graphics/ws-time-reference.png Binary files differindex ad624e6bd8..fc628f0700 100644 --- a/docbook/wsug_graphics/ws-time-reference.png +++ b/docbook/wsug_graphics/ws-time-reference.png diff --git a/docbook/wsug_graphics/ws-tools-menu.png b/docbook/wsug_graphics/ws-tools-menu.png Binary files differindex 541c96cf99..e4aa0cf311 100644 --- a/docbook/wsug_graphics/ws-tools-menu.png +++ b/docbook/wsug_graphics/ws-tools-menu.png diff --git a/docbook/wsug_graphics/ws-view-menu.png b/docbook/wsug_graphics/ws-view-menu.png Binary files differindex 58d520c543..58d3a8a4d7 100644 --- a/docbook/wsug_graphics/ws-view-menu.png +++ b/docbook/wsug_graphics/ws-view-menu.png diff --git a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc b/docbook/wsug_src/WSUG_chapter_statistics.asciidoc index 406727365f..3755159d90 100644 --- a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc +++ b/docbook/wsug_src/WSUG_chapter_statistics.asciidoc @@ -54,13 +54,22 @@ image::wsug_graphics/ws-stats-summary.png[] * __File__: general information about the capture file. -* __Time__: the timestamps when the first and the last packet were captured (and the time between them). +* __Time__: the timestamps when the first and the last packet were captured (and + the time between them). -* __Capture__: information from the time when the capture was done (only available if the packet data was captured from the network and not loaded from a file). +* __Capture__: information from the time when the capture was done (only + available if the packet data was captured from the network and not loaded from + a file). * __Display__: some display related information. -* __Traffic__: some statistics of the network traffic seen. If a display filter is set, you will see values in the Captured column, and if any packages are marked, you will see values in the Marked column. The values in the _Captured_ column will remain the same as before, while the values in the _Displayed_ column will reflect the values corresponding to the packets shown in the display. The values in the _Marked_ column will reflect the values corresponding to the marked packages. +* __Traffic__: some statistics of the network traffic seen. If a display filter + is set, you will see values in the Captured column, and if any packages are + marked, you will see values in the Marked column. The values in the _Captured_ + column will remain the same as before, while the values in the _Displayed_ + column will reflect the values corresponding to the packets shown in the + display. The values in the _Marked_ column will reflect the values + corresponding to the marked packages. [[ChStatHierarchy]] @@ -71,67 +80,56 @@ The protocol hierarchy of the captured packets. .The "Protocol Hierarchy" window image::wsug_graphics/ws-stats-hierarchy.png[] -This is a tree of all the protocols in the capture. You can collapse or expand -subtrees, by clicking on the plus / minus icons. By default, all trees are -expanded. +This is a tree of all the protocols in the capture. Each row contains the +statistical values of one protocol. Two of the columns (_Percent Packets_ and +_Percent Bytes_) serve double duty as bar graphs. If a display filter is set it +will be shown at the bottom. -Each row contains the statistical values of one protocol. The _Display filter_ -will show the current display filter. +The button:[Copy] button will let you copy the window contents as CSV or YAML. -The following columns containing the statistical values are available: +.Protocol hierarchy columns -* __Protocol__: this protocol's name +_Protocol_:: This protocol's name -* __% Packets__: the percentage of protocol packets, relative to all packets in +_Percent Packets_:: The percentage of protocol packets relative to all packets in the capture -* __Packets__: the absolute number of packets of this protocol +_Packets_:: The total number of packets of this protocol -* __Bytes__: the absolute number of bytes of this protocol +_Percent Bytes_:: The percentage of protocol bytes relative to the total bytes in + the capture -* __MBit/s__: the bandwidth of this protocol, relative to the capture time +_Bytes_:: The total number of bytes of this protocol -* __End Packets__: the absolute number of packets of this protocol (where this - protocol was the highest protocol to decode) +_Bits/s_:: The bandwidth of this protocol relative to the capture time -* __End Bytes__: the absolute number of bytes of this protocol (where this - protocol was the highest protocol to decode) +_End Packets_:: The absolute number of packets of this protocol where it + was the highest protocol in the stack (last dissected) -* __End MBit/s__: the bandwidth of this protocol, relative to the capture time - (where this protocol was the highest protocol to decode) +_End Bytes_:: The absolute number of bytes of this protocol where it + was the highest protocol in the stack (last dissected) +_End Bits/s_:: The bandwidth of this protocol relative to the capture time where + was the highest protocol in the stack (last dissected) -[NOTE] -==== -Packets will usually contain multiple protocols, so more than one protocol will -be counted for each packet. Example: In the screenshot IP has 99,17% and TCP -85,83% (which is together much more than 100%). -==== +Packets usually contain multiple protocols. As a result more than one protocol will +be counted for each packet. Example: In the screenshot IP has 99.9% and TCP +98.5% (which is together much more than 100%). -[NOTE] -==== Protocol layers can consist of packets that won't contain any higher layer protocol, so the sum of all higher layer packets may not sum up to the protocols -packet count. Example: In the screenshot TCP has 85,83% but the sum of the -subprotocols (HTTP, ...) is much less. This may be caused by TCP protocol -overhead, e.g. TCP ACK packets won't be counted as packets of the higher layer). -==== +packet count. Example: In the screenshot TCP has 98.5% but the sum of the +subprotocols (SSL, HTTP, etc) is much less. This can be caused by continuation +frames, TCP protocol overhead, and other undissected data. -[NOTE] -==== A single packet can contain the same protocol more than once. In this case, the -protocol is counted more than once. For example: in some tunneling -configurations the IP layer can appear twice. -==== +protocol is counted more than once. For example ICMP replies and many tunneling +protocols will carry more than one IP header. [[ChStatConversations]] === Conversations -Statistics of the captured conversations. - -==== What is a Conversation? - A network conversation is the traffic between two specific endpoints. For example, an IP conversation is all the traffic between two IP addresses. The description of the known endpoint types can be found in @@ -139,9 +137,9 @@ description of the known endpoint types can be found in [[ChStatConversationsWindow]] -==== The "Conversations" window +==== The ``Conversations'' window -The conversations window is similar to the endpoint Window; see +The conversations window is similar to the endpoint Window. See <<ChStatEndpointsWindow>> for a description of their common features. Along with addresses, packet counters, and byte counters the conversation window adds four columns: the time in seconds between the start of the capture and the start of @@ -149,19 +147,23 @@ the conversation ("Rel Start"), the duration of the conversation in seconds, and the average bits (not bytes) per second in each direction. .The "Conversations" window -image::wsug_graphics/ws-stats-conversations.png[] +image::wsug_graphics/ws-stats-conversations.png[scaledwidth="100%"] Each row in the list shows the statistical values for exactly one conversation. _Name resolution_ will be done if selected in the window and if it is active for the specific protocol layer (MAC layer for the selected Ethernet endpoints -page). +page). _Limit to display filter_ will only show conversations matching the +current display filter. -_Limit to display filter_ will only show conversations matching the current -display filter. +The button:[Copy] button will copy the list values to the clipboard in CSV +(Comma Separated Values) or YAML format. The button:[Follow Stream...] button +will show the stream contents as described in <<ChAdvFollowStream>> dialog. The +button:[Graph...] button will show a graph as described in <<ChStatIOGraphs>>. -The button:[Copy] button will copy the list values to the clipboard in CSV (Comma -Separated Values) format. +button:[Conversation Types] lets you choose which traffic type tabs are shown. +See <<ChStatEndpointDefinition>> for a list of endpoint types. The enabled types +are saved in your profile settings. [TIP] ==== @@ -169,22 +171,18 @@ This window will be updated frequently so it will be useful even if you open it before (or while) you are doing a live capture. ==== -[[ChStatConversationListWindow]] - -==== The protocol specific "Conversation List" windows - -Before the combined window described above was available, each of its pages was -shown as a separate window. Even though the combined window is much more -convenient to use, these separate windows are still available. The main reason -is that they might process faster for very large capture files. However, as the -functionality is exactly the same as in the combined window, they won't be -discussed in detail here. +// Removed: +// [[ChStatConversationListWindow]] [[ChStatEndpoints]] === Endpoints -Statistics of the endpoints captured. +[[ChStatEndpointDefinition]] + +A network endpoint is the logical endpoint of separate protocol traffic of a +specific protocol layer. The endpoint statistics of Wireshark will take the +following endpoints into account: [TIP] ==== @@ -193,46 +191,52 @@ the right place to look. The list of Ethernet or IP endpoints is usually what you're looking for. ==== -[[ChStatEndpointDefinition]] +.Endpoint and Conversation types -==== What is an Endpoint? +_Bluetooth_:: A MAC-48 address similar to Ethernet. -A network endpoint is the logical endpoint of separate protocol traffic of a specific protocol layer. The endpoint statistics of Wireshark will take the following endpoints into account: +_Ethernet_:: Identical to the Ethernet device's MAC-48 identifier. -* __Ethernet__: an Ethernet endpoint is identical to the Ethernet's MAC address. +_Fibre Channel_:: A MAC-48 address similar to Ethernet. -* __Fibre Channel__: XXX - insert info here. +_IEEE 802.11_:: A MAC-48 address similar to Ethernet. -* __FDDI__: a FDDI endpoint is identical to the FDDI MAC address. +_FDDI_:: Identical to the FDDI MAC-48 address. -* __IPv4__: an IP endpoint is identical to its IP address. +_IPv4_:: Identical to the 32-bit IPv4 address. -* __IPX__: an IPX endpoint is concatenation of a 32 bit network number and 48 bit node address, be default the Ethernets' MAC address. +_IPv6_:: Identical to the 128-bit IPv6 address. -* __JXTA__: a JXTA endpoint is a 160 bit SHA-1 URN. +_IPX_:: A concatenation of a 32 bit network number and 48 bit node address, by +default the Ethernet interface's MAC-48 address. -* __NCP__: XXX - insert info here. +_JXTA_:: A 160 bit SHA-1 URN. -* __RSVP__: XXX - insert info here. +_NCP_:: Similar to IPX. -* __SCTP__: a SCTP endpoint is a combination of the host IP addresses (plural) and the SCTP port used. So different SCTP ports on the same IP address are different SCTP endpoints, but the same SCTP port on different IP addresses of the same host are still the same endpoint. +_RSVP_:: A combination of varios RSVP session attributes and IPv4 addresses. -* __TCP__: a TCP endpoint is a combination of the IP address and the TCP port used, so different TCP ports on the same IP address are different TCP endpoints. +_SCTP_:: A combination of the host IP addresses (plural) and +the SCTP port used. So different SCTP ports on the same IP address are different +SCTP endpoints, but the same SCTP port on different IP addresses of the same +host are still the same endpoint. -* __Token Ring__: a Token Ring endpoint is identical to the Token Ring MAC address. +_TCP_:: A combination of the IP address and the TCP port used. +Different TCP ports on the same IP address are different TCP endpoints. -* __UDP__: a UDP endpoint is a combination of the IP address and the UDP port used, so different UDP ports on the same IP address are different UDP endpoints. +_Token Ring_:: Identical to the Token Ring MAC-48 address. -* __USB__: XXX - insert info here. +_UDP_:: A combination of the IP address and the UDP port used, so different UDP +ports on the same IP address are different UDP endpoints. -* __WLAN__: XXX - insert info here. +_USB_:: Identical to the 7-bit USB address. [NOTE] -.Broadcast / multicast endpoints +.Broadcast and multicast endpoints ==== -Broadcast / multicast traffic will be shown separately as additional endpoints. -Of course, as these endpoints are virtual endpoints, the real traffic will be -received by all (multicast: some) of the listed unicast endpoints. +Broadcast and multicast traffic will be shown separately as additional +endpoints. Of course, as these aren't physical endpoints the real traffic +will be received by some or all of the listed unicast endpoints. ==== [[ChStatEndpointsWindow]] @@ -241,36 +245,39 @@ received by all (multicast: some) of the listed unicast endpoints. This window shows statistics about the endpoints captured. -.The "Endpoints" window -image::wsug_graphics/ws-stats-endpoints.png[] +.The ``Endpoints'' window +image::wsug_graphics/ws-stats-endpoints.png[scaledwidth="100%"] -For each supported protocol, a tab is shown in this window. Each tab label shows the number of endpoints captured (e.g. the tab label "Ethernet: 5" tells you that five ethernet endpoints have been captured). If no endpoints of a specific protocol were captured, the tab label will be greyed out (although the related page can still be selected). +For each supported protocol, a tab is shown in this window. Each tab label shows +the number of endpoints captured (e.g. the tab label ``Ethernet · 4'' tells +you that four ethernet endpoints have been captured). If no endpoints of a +specific protocol were captured, the tab label will be greyed out (although the +related page can still be selected). Each row in the list shows the statistical values for exactly one endpoint. -_Name resolution_ will be done if selected in the window and if it is active for the specific protocol layer (MAC layer for the selected Ethernet endpoints page). As you might have noticed, the first row has a name resolution of the first three bytes "Netgear", the second row's address was resolved to an IP address (using ARP) and the third was resolved to a broadcast (unresolved this would still be: ff:ff:ff:ff:ff:ff); the last two Ethernet addresses remain unresolved. - -_Limit to display filter_ will only show conversations matching the current display filter. +_Name resolution_ will be done if selected in the window and if it is active for +the specific protocol layer (MAC layer for the selected Ethernet endpoints +page). _Limit to display filter_ will only show conversations matching the +current display filter. Note that in this example we have GeoIP configured which +gives us extra geographic columns. See <<ChGeoIPDbPaths>> for more information. -The button:[Copy] button will copy the list values to the clipboard in CSV (Comma Separated Values) format. +The button:[Copy] button will copy the list values to the clipboard in CSV +(Comma Separated Values) or YAML format. The button:[Map] button will show the +endpoints mapped in your web browser. +button:[Endpoint Types] lets you choose which traffic type tabs are shown. See +<<ChStatEndpointDefinition>> above for a list of endpoint types. The enabled +types are saved in your profile settings. [TIP] ==== -This window will be updated frequently, so it will be useful, even if you open +This window will be updated frequently, so it will be useful even if you open it before (or while) you are doing a live capture. ==== -[[ChStatEndpointListWindow]] - -==== The protocol specific "Endpoint List" windows - -Before the combined window described above was available, each of its pages was -shown as a separate window. Even though the combined window is much more -convenient to use, these separate windows are still available. The main reason -is that they might process faster for very large capture files. However, as the -functionality is exactly the same as in the combined window, they won't be -discussed in detail here. +// Removed: +// [[ChStatEndpointListWindow]] [[ChStatIOGraphs]] diff --git a/image/compress-pngs b/image/compress-pngs deleted file mode 100755 index 3872363672..0000000000 --- a/image/compress-pngs +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -FILE_LIST_CMD="find . -type f -name \"*.png\"" - -if [ -n "$1" ] ; then - FILE_LIST_CMD="echo $1" -fi - -bash -c "$FILE_LIST_CMD" | while read PNG_FILE ; do - echo Compressing $PNG_FILE - hash optipng 2>/dev/null && optipng -o3 -quiet "$PNG_FILE" - hash advpng 2>/dev/null && advpng -z -4 "$PNG_FILE" - hash advdef 2>/dev/null && advdef -z -4 "$PNG_FILE" - hash pngcrush 2>/dev/null && pngcrush -q -ow -brute "$PNG_FILE" -done diff --git a/tools/compress-pngs.sh b/tools/compress-pngs.sh new file mode 100755 index 0000000000..ea93f3d753 --- /dev/null +++ b/tools/compress-pngs.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# +# compress-pngs.sh +# Run various compression and optimization utilities on one or more PNGs +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 2013 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +FILE_LIST_CMD="find . -type f -name \"*.png\"" + +if [ -n "$1" ] ; then + FILE_LIST_CMD="echo $1" +fi + +bash -c "$FILE_LIST_CMD" | while read PNG_FILE ; do + echo Compressing $PNG_FILE + hash optipng 2>/dev/null && optipng -o3 -quiet "$PNG_FILE" + hash advpng 2>/dev/null && advpng -z -4 "$PNG_FILE" + hash advdef 2>/dev/null && advdef -z -4 "$PNG_FILE" + hash pngcrush 2>/dev/null && pngcrush -q -ow -brute "$PNG_FILE" +done diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp index b44487ed7f..6bfa41b4a2 100644 --- a/ui/qt/traffic_table_dialog.cpp +++ b/ui/qt/traffic_table_dialog.cpp @@ -62,11 +62,9 @@ TrafficTableDialog::TrafficTableDialog(QWidget &parent, CaptureFile &cf, const c filter_(filter) { ui->setupUi(this); -// setAttribute(Qt::WA_DeleteOnClose, true); - QString window_name = QString("%1s").arg(table_name); - setWindowSubtitle(window_name); - ui->enabledTypesPushButton->setText(tr("%1 Types").arg(window_name)); + ui->enabledTypesPushButton->setText(tr("%1 Types").arg(table_name)); + setWindowSubtitle(QString("%1s").arg(table_name)); // XXX Use recent settings instead resize(parent.width(), parent.height() * 3 / 4); diff --git a/ui/traffic_table_ui.c b/ui/traffic_table_ui.c index 07895aaf97..5ee28f510c 100644 --- a/ui/traffic_table_ui.c +++ b/ui/traffic_table_ui.c @@ -62,8 +62,8 @@ const char *conv_column_titles[CONV_NUM_COLUMNS] = { "Bytes B " UTF8_RIGHTWARDS_ARROW " A", "Rel Start", "Duration", - "bps A " UTF8_RIGHTWARDS_ARROW " B", - "bps B " UTF8_RIGHTWARDS_ARROW " A" + "Bits/s A " UTF8_RIGHTWARDS_ARROW " B", + "Bits/s B " UTF8_RIGHTWARDS_ARROW " A" }; const char *conv_conn_a_title = "Connection A"; |
