From 53b2994b430c94ae1bc33f0fc0e694cf96c09bfd Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 10 Feb 2023 16:11:20 -0800 Subject: [PATCH] Docbook: Reorganize our guide directories Move the top-level user-guide.adoc and developer-guide.adoc to their respective source directores. This is in preparation for a future toolchain revamp. Move the wsug_graphics directory to wsug_src/images and wsdg_graphics directory to wsdg_src/images. Copy common_graphics/* to the each images directory and remove common_graphics. We only have five admonition graphics; duplicating them lets us remove some build config overhead. Rename wsluarm.adoc to wsdg_src/wsdg_lua_support.adoc. Remove a dummy file. Tested visually and by enabling `--failure-level=WARN`. --- cmake/modules/FindXSLTPROC.cmake | 23 +- docbook/CMakeLists.txt | 340 +++++++++--------- docbook/user-guide.adoc | 64 ---- docbook/wsdg_graphics/toolbar/dummy.dummy | 0 .../developer-guide-docinfo.xml | 0 docbook/{ => wsdg_src}/developer-guide.adoc | 36 +- .../images}/caution.svg | 0 .../images}/git-triangular-workflow.gv | 0 .../images}/git-triangular-workflow.svg | 0 .../images}/important.svg | 0 .../images}/note.svg | 0 .../images}/tip.svg | 0 .../images}/warning.svg | 0 .../images}/ws-capture-sync.dia | Bin .../images}/ws-capture-sync.png | Bin .../images}/ws-capture_internals.dia | Bin .../images}/ws-capture_internals.png | Bin .../images}/ws-dev-guide-cover.png | Bin .../images}/ws-function-blocks.dia | Bin .../images}/ws-function-blocks.png | Bin .../images}/ws-logo.png | Bin .../images}/wslua-new-dialog.png | Bin .../images}/wslua-progdlg.png | Bin .../images}/wslua-textwindow.png | Bin .../wsdg_lua_support.adoc} | 2 +- docbook/wsdg_src/wsdg_sources.adoc | 2 +- docbook/wsdg_src/wsdg_works.adoc | 2 +- docbook/wsug_src/images/caution.svg | 3 + docbook/wsug_src/images/important.svg | 4 + docbook/wsug_src/images/note.svg | 3 + .../images}/related-ack.png | Bin .../images}/related-current.png | Bin .../images}/related-dup-ack.png | Bin .../images}/related-first.png | Bin .../images}/related-last.png | Bin .../images}/related-other.png | Bin .../images}/related-request.png | Bin .../images}/related-response.png | Bin .../images}/related-segment.png | Bin docbook/wsug_src/images/tip.svg | 3 + .../images}/toolbar/document-open.png | Bin .../images}/toolbar/edit-find.png | Bin .../images}/toolbar/filter-toolbar-add.png | Bin .../images}/toolbar/filter-toolbar-apply.png | Bin .../toolbar/filter-toolbar-bookmark.png | Bin .../images}/toolbar/filter-toolbar-clear.png | Bin .../images}/toolbar/filter-toolbar-input.png | Bin .../images}/toolbar/filter-toolbar-recent.png | Bin .../images}/toolbar/go-first.png | Bin .../images}/toolbar/go-jump.png | Bin .../images}/toolbar/go-last.png | Bin .../images}/toolbar/go-next.png | Bin .../images}/toolbar/go-previous.png | Bin .../images}/toolbar/x-capture-file-close.png | Bin .../images}/toolbar/x-capture-file-reload.png | Bin .../images}/toolbar/x-capture-file-save.png | Bin .../images}/toolbar/x-capture-options.png | Bin .../images}/toolbar/x-capture-restart.png | Bin .../images}/toolbar/x-capture-start.png | Bin .../images}/toolbar/x-capture-stop.png | Bin .../images}/toolbar/x-colorize-packets.png | Bin .../images}/toolbar/x-resize-columns.png | Bin .../images}/toolbar/x-stay-last.png | Bin .../images}/toolbar/zoom-in.png | Bin .../images}/toolbar/zoom-original.png | Bin .../images}/toolbar/zoom-out.png | Bin docbook/wsug_src/images/warning.svg | 4 + .../images}/ws-about-codecs.png | Bin .../images}/ws-analyze-menu.png | Bin .../images}/ws-asap-statistics.png | Bin .../images}/ws-bluetooth-devices.png | Bin .../images}/ws-bt-hci-summary.png | Bin .../images}/ws-bytes-pane-popup-menu.png | Bin .../images}/ws-bytes-pane-tabs.png | Bin .../images}/ws-bytes-pane.png | Bin .../images}/ws-calcappprotocol-statistics.png | Bin .../images}/ws-capture-file-properties.png | Bin .../images}/ws-capture-info.png | Bin .../ws-capture-interfaces-main-macos.png | Bin .../ws-capture-interfaces-main-win32.png | Bin .../images}/ws-capture-menu.png | Bin ...-capture-options-compile-selected-bpfs.png | Bin .../images}/ws-capture-options-options.png | Bin .../images}/ws-capture-options-output.png | Bin .../images}/ws-capture-options.png | Bin .../images}/ws-choose-color-rule.png | Bin .../images}/ws-coloring-fields.png | Bin .../images}/ws-coloring-rules-dialog.png | Bin .../images}/ws-column-header-popup-menu.png | Bin .../images}/ws-csp-statistics.png | Bin .../images}/ws-decode-as.png | Bin .../images}/ws-details-pane-popup-menu.png | Bin .../images}/ws-details-pane.png | Bin .../images}/ws-diagram-pane-popup-menu.png | Bin .../images}/ws-diagram-pane.png | Bin .../images}/ws-display-filter-tcp.png | Bin .../images}/ws-dns.png | Bin .../images}/ws-edit-menu.png | Bin .../images}/ws-enabled-protocols.png | Bin .../images}/ws-enrp-statistics.png | Bin .../images}/ws-expert-colored-tree.png | Bin .../images}/ws-expert-column.png | Bin .../images}/ws-expert-information.png | Bin .../images}/ws-export-objects.png | Bin .../images}/ws-export-packet-dissections.png | Bin .../images}/ws-export-pdus-to-file.png | Bin .../images}/ws-export-selected.png | Bin .../images}/ws-export-specified-packets.png | Bin .../images}/ws-fgp-statistics.png | Bin .../images}/ws-file-import-regex.png | Bin .../images}/ws-file-import.png | Bin .../images}/ws-file-menu.png | Bin .../images}/ws-file-set-dialog.png | Bin .../images}/ws-filter-add-expression.png | Bin .../images}/ws-filter-macros.png | Bin .../images}/ws-filter-toolbar.png | Bin .../images}/ws-filters.png | Bin .../images}/ws-find-packet.png | Bin .../images}/ws-flow-graph.png | Bin .../images}/ws-follow-http2-stream.png | Bin .../images}/ws-follow-sip-stream.png | Bin .../images}/ws-follow-stream.png | Bin .../images}/ws-go-menu.png | Bin .../images}/ws-goto-packet.png | Bin .../images}/ws-gui-config-profiles.png | Bin .../images}/ws-gui-preferences-advanced.png | Bin .../images}/ws-gui-preferences.png | Bin .../images}/ws-help-menu.png | Bin .../images}/ws-list-pane.png | Bin .../images}/ws-main-toolbar.png | Bin .../images}/ws-main.png | Bin .../images}/ws-manage-interfaces.png | Bin .../images}/ws-mate-analysis.png | Bin .../images}/ws-mate-dns_pane.png | Bin .../images}/ws-mate-dns_pdu.png | Bin .../images}/ws-mate-ftp_over_gre.png | Bin .../images}/ws-mate-gop_analysis.png | Bin .../ws-mate-isup_over_mtp3_over_ip.png | Bin .../images}/ws-mate-mmse_over_http.png | Bin .../images}/ws-mate-pdu_analysis.png | Bin .../images}/ws-mate-tcp-output.png | Bin .../images}/ws-mate-transform.png | Bin .../images}/ws-menu.png | Bin .../images}/ws-merge-qt5.png | Bin .../images}/ws-merge-win32.png | Bin .../images}/ws-netperfmeter-statistics.png | Bin .../images}/ws-open-qt5.png | Bin .../images}/ws-open-win32.png | Bin .../images}/ws-packet-format.png | Bin .../images}/ws-packet-pane-popup-menu.png | Bin .../images}/ws-packet-range.png | Bin .../images}/ws-packet-selected.png | Bin .../images}/ws-packet-sep-win.png | Bin .../ws-pingpongprotocol-statistics.png | Bin .../images}/ws-print.png | Bin .../images}/ws-resolved-addr.png | Bin .../images}/ws-rlc-graph.png | Bin .../images}/ws-save-as-qt5.png | Bin .../images}/ws-save-as-win32.png | Bin .../images}/ws-sctp-1-association.png | Bin .../images}/ws-sctp.png | Bin .../images}/ws-ssp-statistics.png | Bin .../images}/ws-statistics-menu.png | Bin .../images}/ws-stats-conversations.png | Bin .../images}/ws-stats-endpoints.png | Bin .../images}/ws-stats-hierarchy.png | Bin .../ws-stats-http-requestsequences.png | Bin .../images}/ws-stats-iographs.png | Bin .../images}/ws-stats-lte-mac-traffic.png | Bin .../images}/ws-stats-lte-rlc-traffic.png | Bin .../images}/ws-stats-packet-lengths.png | Bin .../images}/ws-stats-srt-smb2.png | Bin .../images}/ws-stats-wlan-traffic.png | Bin .../images}/ws-statusbar-empty.png | Bin .../images}/ws-statusbar-filter.png | Bin .../images}/ws-statusbar-loaded.png | Bin .../images}/ws-statusbar-profile.png | Bin .../images}/ws-statusbar-selected.png | Bin .../images}/ws-tcp-analysis.png | Bin .../images}/ws-tel-playlist.dia | Bin .../images}/ws-tel-playlist.png | Bin .../images}/ws-tel-rtp-player_1.png | Bin .../images}/ws-tel-rtp-player_1.xcf | Bin .../images}/ws-tel-rtp-player_2.png | Bin .../images}/ws-tel-rtp-player_2.xcf | Bin .../images}/ws-tel-rtp-player_3.png | Bin .../images}/ws-tel-rtp-player_button.png | Bin .../images}/ws-tel-rtp-streams.png | Bin .../images}/ws-tel-rtpstream-analysis_1.png | Bin .../images}/ws-tel-rtpstream-analysis_2.png | Bin .../images}/ws-tel-rtpstream-analysis_3.png | Bin .../images}/ws-tel-seq-dialog.png | Bin .../images}/ws-tel-voip-calls.png | Bin .../images}/ws-telephony-menu.png | Bin .../images}/ws-time-reference.png | Bin .../images}/ws-tls-session-keys.png | Bin .../images}/ws-tools-menu.png | Bin .../images}/ws-udp-multicast-stream.png | Bin .../images}/ws-user-guide-cover.png | Bin .../images}/ws-view-menu.png | Bin .../images}/ws-wireless-menu.png | Bin docbook/{ => wsug_src}/user-guide-docinfo.xml | 0 docbook/wsug_src/user-guide.adoc | 64 ++++ docbook/wsug_src/wsug_advanced.adoc | 16 +- docbook/wsug_src/wsug_capture.adoc | 36 +- docbook/wsug_src/wsug_customize.adoc | 16 +- docbook/wsug_src/wsug_introduction.adoc | 2 +- docbook/wsug_src/wsug_io.adoc | 36 +- docbook/wsug_src/wsug_mate.adoc | 20 +- docbook/wsug_src/wsug_statistics.adoc | 42 +-- docbook/wsug_src/wsug_telephony.adoc | 32 +- docbook/wsug_src/wsug_use.adoc | 122 +++---- docbook/wsug_src/wsug_wireless.adoc | 6 +- docbook/wsug_src/wsug_work.adoc | 30 +- epan/wslua/wslua_gui.c | 6 +- 215 files changed, 468 insertions(+), 446 deletions(-) delete mode 100644 docbook/user-guide.adoc delete mode 100644 docbook/wsdg_graphics/toolbar/dummy.dummy rename docbook/{ => wsdg_src}/developer-guide-docinfo.xml (100%) rename docbook/{ => wsdg_src}/developer-guide.adoc (57%) rename docbook/{common_graphics => wsdg_src/images}/caution.svg (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/git-triangular-workflow.gv (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/git-triangular-workflow.svg (100%) rename docbook/{common_graphics => wsdg_src/images}/important.svg (100%) rename docbook/{common_graphics => wsdg_src/images}/note.svg (100%) rename docbook/{common_graphics => wsdg_src/images}/tip.svg (100%) rename docbook/{common_graphics => wsdg_src/images}/warning.svg (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-capture-sync.dia (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-capture-sync.png (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-capture_internals.dia (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-capture_internals.png (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-dev-guide-cover.png (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-function-blocks.dia (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-function-blocks.png (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/ws-logo.png (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/wslua-new-dialog.png (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/wslua-progdlg.png (100%) rename docbook/{wsdg_graphics => wsdg_src/images}/wslua-textwindow.png (100%) rename docbook/{wsluarm.adoc => wsdg_src/wsdg_lua_support.adoc} (99%) create mode 100644 docbook/wsug_src/images/caution.svg create mode 100644 docbook/wsug_src/images/important.svg create mode 100644 docbook/wsug_src/images/note.svg rename docbook/{wsug_graphics => wsug_src/images}/related-ack.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-current.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-dup-ack.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-first.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-last.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-other.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-request.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-response.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/related-segment.png (100%) create mode 100644 docbook/wsug_src/images/tip.svg rename docbook/{wsug_graphics => wsug_src/images}/toolbar/document-open.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/edit-find.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/filter-toolbar-add.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/filter-toolbar-apply.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/filter-toolbar-bookmark.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/filter-toolbar-clear.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/filter-toolbar-input.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/filter-toolbar-recent.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/go-first.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/go-jump.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/go-last.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/go-next.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/go-previous.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-capture-file-close.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-capture-file-reload.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-capture-file-save.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-capture-options.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-capture-restart.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-capture-start.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-capture-stop.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-colorize-packets.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-resize-columns.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/x-stay-last.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/zoom-in.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/zoom-original.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/toolbar/zoom-out.png (100%) create mode 100644 docbook/wsug_src/images/warning.svg rename docbook/{wsug_graphics => wsug_src/images}/ws-about-codecs.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-analyze-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-asap-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-bluetooth-devices.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-bt-hci-summary.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-bytes-pane-popup-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-bytes-pane-tabs.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-bytes-pane.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-calcappprotocol-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-file-properties.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-info.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-interfaces-main-macos.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-interfaces-main-win32.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-options-compile-selected-bpfs.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-options-options.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-options-output.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-capture-options.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-choose-color-rule.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-coloring-fields.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-coloring-rules-dialog.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-column-header-popup-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-csp-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-decode-as.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-details-pane-popup-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-details-pane.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-diagram-pane-popup-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-diagram-pane.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-display-filter-tcp.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-dns.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-edit-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-enabled-protocols.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-enrp-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-expert-colored-tree.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-expert-column.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-expert-information.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-export-objects.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-export-packet-dissections.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-export-pdus-to-file.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-export-selected.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-export-specified-packets.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-fgp-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-file-import-regex.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-file-import.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-file-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-file-set-dialog.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-filter-add-expression.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-filter-macros.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-filter-toolbar.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-filters.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-find-packet.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-flow-graph.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-follow-http2-stream.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-follow-sip-stream.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-follow-stream.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-go-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-goto-packet.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-gui-config-profiles.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-gui-preferences-advanced.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-gui-preferences.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-help-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-list-pane.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-main-toolbar.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-main.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-manage-interfaces.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-analysis.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-dns_pane.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-dns_pdu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-ftp_over_gre.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-gop_analysis.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-isup_over_mtp3_over_ip.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-mmse_over_http.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-pdu_analysis.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-tcp-output.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-mate-transform.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-merge-qt5.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-merge-win32.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-netperfmeter-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-open-qt5.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-open-win32.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-packet-format.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-packet-pane-popup-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-packet-range.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-packet-selected.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-packet-sep-win.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-pingpongprotocol-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-print.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-resolved-addr.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-rlc-graph.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-save-as-qt5.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-save-as-win32.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-sctp-1-association.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-sctp.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-ssp-statistics.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-statistics-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-conversations.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-endpoints.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-hierarchy.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-http-requestsequences.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-iographs.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-lte-mac-traffic.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-lte-rlc-traffic.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-packet-lengths.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-srt-smb2.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-stats-wlan-traffic.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-statusbar-empty.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-statusbar-filter.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-statusbar-loaded.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-statusbar-profile.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-statusbar-selected.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tcp-analysis.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-playlist.dia (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-playlist.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtp-player_1.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtp-player_1.xcf (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtp-player_2.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtp-player_2.xcf (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtp-player_3.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtp-player_button.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtp-streams.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtpstream-analysis_1.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtpstream-analysis_2.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-rtpstream-analysis_3.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-seq-dialog.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tel-voip-calls.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-telephony-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-time-reference.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tls-session-keys.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-tools-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-udp-multicast-stream.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-user-guide-cover.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-view-menu.png (100%) rename docbook/{wsug_graphics => wsug_src/images}/ws-wireless-menu.png (100%) rename docbook/{ => wsug_src}/user-guide-docinfo.xml (100%) create mode 100644 docbook/wsug_src/user-guide.adoc diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index b4f0ac857d..ff4120baed 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -105,27 +105,21 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources) set(_gfx_deps ${CMAKE_CURRENT_SOURCE_DIR}/${_tmpgfx}) ENDFOREACH() - SET(_gfx_dir ${_dir_pfx}_graphics) + SET(_gfx_src_dir ${_dir_pfx}_src/images) ADD_CUSTOM_COMMAND( OUTPUT ${_output} COMMAND ${CMAKE_COMMAND} -E make_directory ${_out_dir} COMMAND ${CMAKE_COMMAND} - -E make_directory ${_out_dir}/${_gfx_dir}/toolbar - COMMAND ${CMAKE_COMMAND} - -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_dir} ${_out_dir}/${_gfx_dir} - COMMAND ${CMAKE_COMMAND} - -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics ${_out_dir}/${_gfx_dir} - COMMAND ${CMAKE_COMMAND} - -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_dir}/toolbar ${_out_dir}/${_gfx_dir}/toolbar + -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_src_dir} ${_out_dir}/images COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/ws.css ${_out_dir} COMMAND ${XSLTPROC_EXECUTABLE} --path "${_xsltproc_path}" --stringparam base.dir ${_basedir}/ ${_common_xsltproc_args} - --stringparam admon.graphics.path ${_gfx_dir}/ + --stringparam admon.graphics.path images/ ${_modeparams} --noout ${_stylesheet} ${_dbk_source} @@ -135,6 +129,17 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources) ${_gfx_deps} custom_layer_single_html.xsl ) + if(${_dir_pfx} STREQUAL wsug) + ADD_CUSTOM_COMMAND( + OUTPUT + ${_output} + COMMAND ${CMAKE_COMMAND} + -E make_directory ${_out_dir}/images/toolbar + COMMAND ${CMAKE_COMMAND} + -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_src_dir}/toolbar ${_out_dir}/images/toolbar + APPEND + ) + endif() IF(NOT WIN32) ADD_CUSTOM_COMMAND( OUTPUT diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index f1ee572754..7de5431ec6 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -26,14 +26,6 @@ set(COMMON_FILES common_src/typographic_conventions.adoc ) -set(COMMON_GRAPHICS - common_graphics/caution.svg - common_graphics/important.svg - common_graphics/note.svg - common_graphics/tip.svg - common_graphics/warning.svg -) - set(GUIDE_INSTALL_DIRS) set(WSUG_TITLE "Wireshark User's Guide") @@ -73,149 +65,153 @@ set(WSUG_FILES # Note: Images should be minimized using tools/compress-pngs.py. set(WSUG_GRAPHICS - wsug_graphics/related-ack.png - wsug_graphics/related-current.png - wsug_graphics/related-dup-ack.png - wsug_graphics/related-first.png - wsug_graphics/related-last.png - wsug_graphics/related-other.png - wsug_graphics/related-request.png - wsug_graphics/related-response.png - wsug_graphics/related-segment.png - wsug_graphics/ws-about-codecs.png - wsug_graphics/ws-analyze-menu.png - wsug_graphics/ws-bytes-pane-popup-menu.png - wsug_graphics/ws-bytes-pane-tabs.png - wsug_graphics/ws-bytes-pane.png - wsug_graphics/ws-capture-file-properties.png - wsug_graphics/ws-capture-info.png - wsug_graphics/ws-capture-interfaces-main-macos.png - wsug_graphics/ws-capture-interfaces-main-win32.png - wsug_graphics/ws-capture-menu.png - wsug_graphics/ws-capture-options.png - wsug_graphics/ws-capture-options-output.png - wsug_graphics/ws-capture-options-options.png - wsug_graphics/ws-capture-options-compile-selected-bpfs.png - wsug_graphics/ws-capture-options-output.png - wsug_graphics/ws-choose-color-rule.png - wsug_graphics/ws-coloring-fields.png - wsug_graphics/ws-coloring-rules-dialog.png - wsug_graphics/ws-column-header-popup-menu.png - wsug_graphics/ws-decode-as.png - wsug_graphics/ws-details-pane-popup-menu.png - wsug_graphics/ws-details-pane.png - wsug_graphics/ws-diagram-pane.png - wsug_graphics/ws-diagram-pane-popup-menu.png - wsug_graphics/ws-display-filter-tcp.png # GTK+ - wsug_graphics/ws-edit-menu.png - wsug_graphics/ws-enabled-protocols.png - wsug_graphics/ws-expert-colored-tree.png - wsug_graphics/ws-expert-column.png - wsug_graphics/ws-expert-information.png - wsug_graphics/ws-export-objects.png - wsug_graphics/ws-export-packet-dissections.png - wsug_graphics/ws-export-specified-packets.png - wsug_graphics/ws-export-selected.png - wsug_graphics/ws-file-import.png - wsug_graphics/ws-file-menu.png - wsug_graphics/ws-file-set-dialog.png # GTK+ - wsug_graphics/ws-filter-add-expression.png # GTK+ - wsug_graphics/ws-filter-toolbar.png - wsug_graphics/ws-filters.png # GTK+ - wsug_graphics/ws-find-packet.png - wsug_graphics/ws-follow-sip-stream.png - wsug_graphics/ws-follow-stream.png - wsug_graphics/ws-follow-http2-stream.png - wsug_graphics/ws-go-menu.png - wsug_graphics/ws-goto-packet.png - wsug_graphics/ws-gui-preferences.png - wsug_graphics/ws-gui-preferences-advanced.png - wsug_graphics/ws-help-menu.png - wsug_graphics/ws-list-pane.png # Outdated - wsug_graphics/ws-main-toolbar.png - wsug_graphics/ws-main.png - wsug_graphics/ws-manage-interfaces.png - wsug_graphics/ws-mate-analysis.png - wsug_graphics/ws-mate-dns_pane.png - wsug_graphics/ws-mate-dns_pdu.png - wsug_graphics/ws-mate-ftp_over_gre.png - wsug_graphics/ws-mate-gop_analysis.png - wsug_graphics/ws-mate-isup_over_mtp3_over_ip.png - wsug_graphics/ws-mate-mmse_over_http.png - wsug_graphics/ws-mate-pdu_analysis.png - wsug_graphics/ws-mate-tcp-output.png - wsug_graphics/ws-mate-transform.png - wsug_graphics/ws-menu.png - wsug_graphics/ws-merge-qt5.png - wsug_graphics/ws-merge-win32.png - wsug_graphics/ws-open-qt5.png - wsug_graphics/ws-open-win32.png - wsug_graphics/ws-packet-format.png - wsug_graphics/ws-packet-pane-popup-menu.png - wsug_graphics/ws-packet-range.png - wsug_graphics/ws-packet-selected.png - wsug_graphics/ws-packet-sep-win.png - wsug_graphics/ws-print.png - wsug_graphics/ws-save-as-qt5.png - wsug_graphics/ws-save-as-win32.png - wsug_graphics/ws-statistics-menu.png - wsug_graphics/ws-stats-conversations.png - wsug_graphics/ws-stats-endpoints.png - wsug_graphics/ws-stats-hierarchy.png - wsug_graphics/ws-stats-iographs.png - wsug_graphics/ws-stats-packet-lengths.png - wsug_graphics/ws-stats-srt-smb2.png - wsug_graphics/ws-stats-lte-mac-traffic.png - wsug_graphics/ws-stats-lte-rlc-traffic.png - wsug_graphics/ws-stats-wlan-traffic.png # GTK+ - wsug_graphics/ws-statusbar-empty.png - wsug_graphics/ws-statusbar-filter.png - wsug_graphics/ws-statusbar-loaded.png - wsug_graphics/ws-statusbar-profile.png - wsug_graphics/ws-statusbar-selected.png - wsug_graphics/ws-tcp-analysis.png - wsug_graphics/ws-tel-playlist.png - wsug_graphics/ws-tel-rtp-player_1.png - wsug_graphics/ws-tel-rtp-player_2.png - wsug_graphics/ws-tel-rtp-player_3.png - wsug_graphics/ws-tel-rtp-player_button.png - wsug_graphics/ws-tel-rtp-streams.png - wsug_graphics/ws-tel-rtpstream-analysis_1.png - wsug_graphics/ws-tel-rtpstream-analysis_2.png - wsug_graphics/ws-tel-rtpstream-analysis_3.png - wsug_graphics/ws-tel-seq-dialog.png - wsug_graphics/ws-tel-voip-calls.png - wsug_graphics/ws-telephony-menu.png - wsug_graphics/ws-time-reference.png # GTK+ - wsug_graphics/ws-tools-menu.png - wsug_graphics/ws-view-menu.png - wsug_graphics/toolbar/document-open.png - wsug_graphics/toolbar/edit-find.png - wsug_graphics/toolbar/filter-toolbar-add.png - wsug_graphics/toolbar/filter-toolbar-apply.png - wsug_graphics/toolbar/filter-toolbar-bookmark.png - wsug_graphics/toolbar/filter-toolbar-clear.png - wsug_graphics/toolbar/filter-toolbar-input.png - wsug_graphics/toolbar/filter-toolbar-recent.png - wsug_graphics/toolbar/go-first.png - wsug_graphics/toolbar/go-jump.png - wsug_graphics/toolbar/go-last.png - wsug_graphics/toolbar/go-next.png - wsug_graphics/toolbar/go-previous.png - wsug_graphics/toolbar/x-capture-file-close.png - wsug_graphics/toolbar/x-capture-file-reload.png - wsug_graphics/toolbar/x-capture-file-save.png - wsug_graphics/toolbar/x-capture-options.png - wsug_graphics/toolbar/x-capture-restart.png - wsug_graphics/toolbar/x-capture-start.png - wsug_graphics/toolbar/x-capture-stop.png - wsug_graphics/toolbar/x-colorize-packets.png - wsug_graphics/toolbar/x-resize-columns.png - wsug_graphics/toolbar/x-stay-last.png - wsug_graphics/toolbar/zoom-in.png - wsug_graphics/toolbar/zoom-original.png - wsug_graphics/toolbar/zoom-out.png - ${COMMON_GRAPHICS} + wsug_src/images/caution.svg + wsug_src/images/important.svg + wsug_src/images/note.svg + wsug_src/images/related-ack.png + wsug_src/images/related-current.png + wsug_src/images/related-dup-ack.png + wsug_src/images/related-first.png + wsug_src/images/related-last.png + wsug_src/images/related-other.png + wsug_src/images/related-request.png + wsug_src/images/related-response.png + wsug_src/images/related-segment.png + wsug_src/images/tip.svg + wsug_src/images/toolbar/document-open.png + wsug_src/images/toolbar/edit-find.png + wsug_src/images/toolbar/filter-toolbar-add.png + wsug_src/images/toolbar/filter-toolbar-apply.png + wsug_src/images/toolbar/filter-toolbar-bookmark.png + wsug_src/images/toolbar/filter-toolbar-clear.png + wsug_src/images/toolbar/filter-toolbar-input.png + wsug_src/images/toolbar/filter-toolbar-recent.png + wsug_src/images/toolbar/go-first.png + wsug_src/images/toolbar/go-jump.png + wsug_src/images/toolbar/go-last.png + wsug_src/images/toolbar/go-next.png + wsug_src/images/toolbar/go-previous.png + wsug_src/images/toolbar/x-capture-file-close.png + wsug_src/images/toolbar/x-capture-file-reload.png + wsug_src/images/toolbar/x-capture-file-save.png + wsug_src/images/toolbar/x-capture-options.png + wsug_src/images/toolbar/x-capture-restart.png + wsug_src/images/toolbar/x-capture-start.png + wsug_src/images/toolbar/x-capture-stop.png + wsug_src/images/toolbar/x-colorize-packets.png + wsug_src/images/toolbar/x-resize-columns.png + wsug_src/images/toolbar/x-stay-last.png + wsug_src/images/toolbar/zoom-in.png + wsug_src/images/toolbar/zoom-original.png + wsug_src/images/toolbar/zoom-out.png + wsug_src/images/warning.svg + wsug_src/images/ws-about-codecs.png + wsug_src/images/ws-analyze-menu.png + wsug_src/images/ws-bytes-pane-popup-menu.png + wsug_src/images/ws-bytes-pane-tabs.png + wsug_src/images/ws-bytes-pane.png + wsug_src/images/ws-capture-file-properties.png + wsug_src/images/ws-capture-info.png + wsug_src/images/ws-capture-interfaces-main-macos.png + wsug_src/images/ws-capture-interfaces-main-win32.png + wsug_src/images/ws-capture-menu.png + wsug_src/images/ws-capture-options-compile-selected-bpfs.png + wsug_src/images/ws-capture-options-options.png + wsug_src/images/ws-capture-options-output.png + wsug_src/images/ws-capture-options-output.png + wsug_src/images/ws-capture-options.png + wsug_src/images/ws-choose-color-rule.png + wsug_src/images/ws-coloring-fields.png + wsug_src/images/ws-coloring-rules-dialog.png + wsug_src/images/ws-column-header-popup-menu.png + wsug_src/images/ws-decode-as.png + wsug_src/images/ws-details-pane-popup-menu.png + wsug_src/images/ws-details-pane.png + wsug_src/images/ws-diagram-pane-popup-menu.png + wsug_src/images/ws-diagram-pane.png + wsug_src/images/ws-display-filter-tcp.png # GTK+ + wsug_src/images/ws-edit-menu.png + wsug_src/images/ws-enabled-protocols.png + wsug_src/images/ws-expert-colored-tree.png + wsug_src/images/ws-expert-column.png + wsug_src/images/ws-expert-information.png + wsug_src/images/ws-export-objects.png + wsug_src/images/ws-export-packet-dissections.png + wsug_src/images/ws-export-selected.png + wsug_src/images/ws-export-specified-packets.png + wsug_src/images/ws-file-import.png + wsug_src/images/ws-file-menu.png + wsug_src/images/ws-file-set-dialog.png # GTK+ + wsug_src/images/ws-filter-add-expression.png # GTK+ + wsug_src/images/ws-filter-toolbar.png + wsug_src/images/ws-filters.png # GTK+ + wsug_src/images/ws-find-packet.png + wsug_src/images/ws-follow-http2-stream.png + wsug_src/images/ws-follow-sip-stream.png + wsug_src/images/ws-follow-stream.png + wsug_src/images/ws-go-menu.png + wsug_src/images/ws-goto-packet.png + wsug_src/images/ws-gui-preferences-advanced.png + wsug_src/images/ws-gui-preferences.png + wsug_src/images/ws-help-menu.png + wsug_src/images/ws-list-pane.png # Outdated + wsug_src/images/ws-main-toolbar.png + wsug_src/images/ws-main.png + wsug_src/images/ws-manage-interfaces.png + wsug_src/images/ws-mate-analysis.png + wsug_src/images/ws-mate-dns_pane.png + wsug_src/images/ws-mate-dns_pdu.png + wsug_src/images/ws-mate-ftp_over_gre.png + wsug_src/images/ws-mate-gop_analysis.png + wsug_src/images/ws-mate-isup_over_mtp3_over_ip.png + wsug_src/images/ws-mate-mmse_over_http.png + wsug_src/images/ws-mate-pdu_analysis.png + wsug_src/images/ws-mate-tcp-output.png + wsug_src/images/ws-mate-transform.png + wsug_src/images/ws-menu.png + wsug_src/images/ws-merge-qt5.png + wsug_src/images/ws-merge-win32.png + wsug_src/images/ws-open-qt5.png + wsug_src/images/ws-open-win32.png + wsug_src/images/ws-packet-format.png + wsug_src/images/ws-packet-pane-popup-menu.png + wsug_src/images/ws-packet-range.png + wsug_src/images/ws-packet-selected.png + wsug_src/images/ws-packet-sep-win.png + wsug_src/images/ws-print.png + wsug_src/images/ws-save-as-qt5.png + wsug_src/images/ws-save-as-win32.png + wsug_src/images/ws-statistics-menu.png + wsug_src/images/ws-stats-conversations.png + wsug_src/images/ws-stats-endpoints.png + wsug_src/images/ws-stats-hierarchy.png + wsug_src/images/ws-stats-iographs.png + wsug_src/images/ws-stats-lte-mac-traffic.png + wsug_src/images/ws-stats-lte-rlc-traffic.png + wsug_src/images/ws-stats-packet-lengths.png + wsug_src/images/ws-stats-srt-smb2.png + wsug_src/images/ws-stats-wlan-traffic.png # GTK+ + wsug_src/images/ws-statusbar-empty.png + wsug_src/images/ws-statusbar-filter.png + wsug_src/images/ws-statusbar-loaded.png + wsug_src/images/ws-statusbar-profile.png + wsug_src/images/ws-statusbar-selected.png + wsug_src/images/ws-tcp-analysis.png + wsug_src/images/ws-tel-playlist.png + wsug_src/images/ws-tel-rtp-player_1.png + wsug_src/images/ws-tel-rtp-player_2.png + wsug_src/images/ws-tel-rtp-player_3.png + wsug_src/images/ws-tel-rtp-player_button.png + wsug_src/images/ws-tel-rtp-streams.png + wsug_src/images/ws-tel-rtpstream-analysis_1.png + wsug_src/images/ws-tel-rtpstream-analysis_2.png + wsug_src/images/ws-tel-rtpstream-analysis_3.png + wsug_src/images/ws-tel-seq-dialog.png + wsug_src/images/ws-tel-voip-calls.png + wsug_src/images/ws-telephony-menu.png + wsug_src/images/ws-time-reference.png # GTK+ + wsug_src/images/ws-tools-menu.png + wsug_src/images/ws-view-menu.png ) set(WSDG_TITLE "Wireshark Developer's Guide") @@ -227,29 +223,33 @@ set(WSDG_FILES wsdg_src/wsdg_dissection.adoc wsdg_src/wsdg_env_intro.adoc wsdg_src/wsdg_libraries.adoc + wsdg_src/wsdg_lua_support.adoc + wsdg_src/wsdg_preface.adoc wsdg_src/wsdg_quick_setup.adoc wsdg_src/wsdg_sources.adoc wsdg_src/wsdg_tests.adoc wsdg_src/wsdg_tools.adoc wsdg_src/wsdg_userinterface.adoc wsdg_src/wsdg_works.adoc - wsdg_src/wsdg_preface.adoc - wsluarm.adoc ${COMMON_FILES} ) set(WSDG_GRAPHICS - wsdg_graphics/git-triangular-workflow.gv - wsdg_graphics/git-triangular-workflow.svg - wsdg_graphics/ws-capture-sync.png - wsdg_graphics/ws-capture-sync.dia - wsdg_graphics/ws-capture-sync.png - wsdg_graphics/ws-capture_internals.dia - wsdg_graphics/ws-capture_internals.png - wsdg_graphics/ws-function-blocks.dia - wsdg_graphics/ws-function-blocks.png - wsdg_graphics/ws-logo.png - ${COMMON_GRAPHICS} + wsdg_src/images/caution.svg + wsdg_src/images/git-triangular-workflow.gv + wsdg_src/images/git-triangular-workflow.svg + wsdg_src/images/important.svg + wsdg_src/images/note.svg + wsdg_src/images/tip.svg + wsdg_src/images/warning.svg + wsdg_src/images/ws-capture_internals.dia + wsdg_src/images/ws-capture_internals.png + wsdg_src/images/ws-capture-sync.dia + wsdg_src/images/ws-capture-sync.png + wsdg_src/images/ws-capture-sync.png + wsdg_src/images/ws-function-blocks.dia + wsdg_src/images/ws-function-blocks.png + wsdg_src/images/ws-logo.png ) set(WSUG_SOURCE @@ -336,11 +336,11 @@ set( ASCIIDOC_CONF_FILES if(ASCIIDOCTOR_FOUND) # Generate the DocBook sources of user and developer guides - ASCIIDOCTOR2DOCBOOK(user-guide.adoc ${ASCIIDOC_CONF_FILES} ${WSUG_SOURCE} ${WSUG_BUILT_DEPS}) + ASCIIDOCTOR2DOCBOOK(wsug_src/user-guide.adoc ${ASCIIDOC_CONF_FILES} ${WSUG_SOURCE} ${WSUG_BUILT_DEPS}) add_custom_target(user_guide_docbook DEPENDS generate_user-guide.xml) set_docbook_target_properties(user_guide_docbook) - ASCIIDOCTOR2DOCBOOK(developer-guide.adoc ${ASCIIDOC_CONF_FILES} ${WSDG_SOURCE} ${WSDG_BUILT_DEPS}) + ASCIIDOCTOR2DOCBOOK(wsdg_src/developer-guide.adoc ${ASCIIDOC_CONF_FILES} ${WSDG_SOURCE} ${WSDG_BUILT_DEPS}) add_custom_target(developer_guide_docbook DEPENDS generate_developer-guide.xml) set_docbook_target_properties(developer_guide_docbook) @@ -385,7 +385,7 @@ if(ASCIIDOCTOR_FOUND AND XSLTPROC_EXECUTABLE) endif() if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_PDF_EXECUTABLE) - ASCIIDOCTOR2PDF(${WSUG_TITLE} user-guide.adoc ${WSUG_SOURCE} ${WSUG_BUILT_DEPS}) + ASCIIDOCTOR2PDF(${WSUG_TITLE} wsug_src/user-guide.adoc ${WSUG_SOURCE} ${WSUG_BUILT_DEPS}) add_custom_target( user_guide_pdf @@ -397,7 +397,7 @@ if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_PDF_EXECUTABLE) endif() if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_EPUB_EXECUTABLE) - ASCIIDOCTOR2EPUB(${WSUG_TITLE} user-guide.adoc ${WSUG_SOURCE} ${WSUG_BUILT_DEPS}) + ASCIIDOCTOR2EPUB(${WSUG_TITLE} wsug_src/user-guide.adoc ${WSUG_SOURCE} ${WSUG_BUILT_DEPS}) add_custom_target( user_guide_epub @@ -437,7 +437,7 @@ if(ASCIIDOCTOR_FOUND AND XSLTPROC_EXECUTABLE) endif() if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_PDF_EXECUTABLE) - ASCIIDOCTOR2PDF(${WSDG_TITLE} developer-guide.adoc ${WSDG_SOURCE} ${WSDG_BUILT_DEPS}) + ASCIIDOCTOR2PDF(${WSDG_TITLE} wsdg_src/developer-guide.adoc ${WSDG_SOURCE} ${WSDG_BUILT_DEPS}) add_custom_target( developer_guide_pdf @@ -449,7 +449,7 @@ if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_PDF_EXECUTABLE) endif() if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_EPUB_EXECUTABLE) - ASCIIDOCTOR2EPUB(${WSDG_TITLE} developer-guide.adoc ${WSDG_SOURCE} ${WSDG_BUILT_DEPS}) + ASCIIDOCTOR2EPUB(${WSDG_TITLE} wsdg_src/developer-guide.adoc ${WSDG_SOURCE} ${WSDG_BUILT_DEPS}) add_custom_target( developer_guide_epub diff --git a/docbook/user-guide.adoc b/docbook/user-guide.adoc deleted file mode 100644 index a9a8e1135d..0000000000 --- a/docbook/user-guide.adoc +++ /dev/null @@ -1,64 +0,0 @@ -:doctype: book -include::attributes.adoc[] - -// Electronic book attributes -:author: Richard Sharpe, Ed Warnicke, Ulf Lamping -:description: Wireshark User’s Guide -:keywords: Wireshark User Guide -ifdef::ebook-format-epub3[] -:front-cover-image: wsug_graphics/ws-user-guide-cover.png -:toc: -endif::[] - -= Wireshark User’s Guide: Version {wireshark-version} - -:source-highlighter: coderay - -include::wsug_src/wsug_preface.adoc[] - -include::common_src/typographic_conventions.adoc[] - -// Chapters - -include::wsug_src/wsug_introduction.adoc[] - -include::wsug_src/wsug_build_install.adoc[] - -include::wsug_src/wsug_use.adoc[] - -include::wsug_src/wsug_capture.adoc[] - -include::wsug_src/wsug_io.adoc[] - -include::wsug_src/wsug_work.adoc[] - -include::wsug_src/wsug_advanced.adoc[] - -include::wsug_src/wsug_statistics.adoc[] - -include::wsug_src/wsug_telephony.adoc[] - -include::wsug_src/wsug_wireless.adoc[] - -include::wsug_src/wsug_customize.adoc[] - -include::wsug_src/wsug_mate.adoc[] - -// Needs to be reworked -//include::wsug_src/wsug_troubleshoot.adoc[] - -// Appendices -include::wsug_src/wsug_messages.adoc[] - -include::wsug_src/wsug_files.adoc[] - -include::wsug_src/wsug_protocols.adoc[] - -// Needs to be reworked -//include::wsug_src/wsug_howitworks.adoc[] - -include::wsug_src/wsug_tools.adoc[] - -// License - -include::common_src/gpl_appendix.adoc[] diff --git a/docbook/wsdg_graphics/toolbar/dummy.dummy b/docbook/wsdg_graphics/toolbar/dummy.dummy deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/docbook/developer-guide-docinfo.xml b/docbook/wsdg_src/developer-guide-docinfo.xml similarity index 100% rename from docbook/developer-guide-docinfo.xml rename to docbook/wsdg_src/developer-guide-docinfo.xml diff --git a/docbook/developer-guide.adoc b/docbook/wsdg_src/developer-guide.adoc similarity index 57% rename from docbook/developer-guide.adoc rename to docbook/wsdg_src/developer-guide.adoc index 8efe02b7c1..c288d012e8 100644 --- a/docbook/developer-guide.adoc +++ b/docbook/wsdg_src/developer-guide.adoc @@ -1,12 +1,12 @@ :doctype: book -include::attributes.adoc[] +include::../attributes.adoc[] // Electronic book attributes :author: Ulf Lamping, Graham Bloice :description: Wireshark Developer’s Guide :keywords: Wireshark Developer Guide ifdef::ebook-format-epub3[] -:front-cover-image: wsdg_graphics/ws-dev-guide-cover.png +:front-cover-image: images/ws-dev-guide-cover.png :toc: endif::[] @@ -19,9 +19,9 @@ endif::[] :qt6-lts-version: 6.2.4 :source-highlighter: coderay -include::wsdg_src/wsdg_preface.adoc[] +include::wsdg_preface.adoc[] -include::common_src/typographic_conventions.adoc[] +include::../common_src/typographic_conventions.adoc[] [#PartEnvironment] = Wireshark Build Environment @@ -33,15 +33,15 @@ The first part describes how to set up the tools, libraries and source needed to generate Wireshark and how to do some typical development tasks. -- -include::wsdg_src/wsdg_env_intro.adoc[] +include::wsdg_env_intro.adoc[] -include::wsdg_src/wsdg_quick_setup.adoc[] +include::wsdg_quick_setup.adoc[] -include::wsdg_src/wsdg_sources.adoc[] +include::wsdg_sources.adoc[] -include::wsdg_src/wsdg_tools.adoc[] +include::wsdg_tools.adoc[] -include::wsdg_src/wsdg_libraries.adoc[] +include::wsdg_libraries.adoc[] [#PartDevelopment] = Wireshark Development @@ -53,20 +53,20 @@ The second part describes how the Wireshark sources are structured and how to change the sources such as adding a new dissector. -- -include::wsdg_src/wsdg_works.adoc[] +include::wsdg_works.adoc[] -include::wsdg_src/wsdg_build_intro.adoc[] +include::wsdg_build_intro.adoc[] -include::wsdg_src/wsdg_capture.adoc[] +include::wsdg_capture.adoc[] -include::wsdg_src/wsdg_dissection.adoc[] +include::wsdg_dissection.adoc[] -include::wsluarm.adoc[] +include::wsdg_lua_support.adoc[] -include::wsdg_src/wsdg_userinterface.adoc[] +include::wsdg_userinterface.adoc[] -include::wsdg_src/wsdg_tests.adoc[] +include::wsdg_tests.adoc[] -include::wsdg_src/wsdg_asn2wrs.adoc[] +include::wsdg_asn2wrs.adoc[] -include::common_src/gpl_appendix.adoc[] +include::../common_src/gpl_appendix.adoc[] diff --git a/docbook/common_graphics/caution.svg b/docbook/wsdg_src/images/caution.svg similarity index 100% rename from docbook/common_graphics/caution.svg rename to docbook/wsdg_src/images/caution.svg diff --git a/docbook/wsdg_graphics/git-triangular-workflow.gv b/docbook/wsdg_src/images/git-triangular-workflow.gv similarity index 100% rename from docbook/wsdg_graphics/git-triangular-workflow.gv rename to docbook/wsdg_src/images/git-triangular-workflow.gv diff --git a/docbook/wsdg_graphics/git-triangular-workflow.svg b/docbook/wsdg_src/images/git-triangular-workflow.svg similarity index 100% rename from docbook/wsdg_graphics/git-triangular-workflow.svg rename to docbook/wsdg_src/images/git-triangular-workflow.svg diff --git a/docbook/common_graphics/important.svg b/docbook/wsdg_src/images/important.svg similarity index 100% rename from docbook/common_graphics/important.svg rename to docbook/wsdg_src/images/important.svg diff --git a/docbook/common_graphics/note.svg b/docbook/wsdg_src/images/note.svg similarity index 100% rename from docbook/common_graphics/note.svg rename to docbook/wsdg_src/images/note.svg diff --git a/docbook/common_graphics/tip.svg b/docbook/wsdg_src/images/tip.svg similarity index 100% rename from docbook/common_graphics/tip.svg rename to docbook/wsdg_src/images/tip.svg diff --git a/docbook/common_graphics/warning.svg b/docbook/wsdg_src/images/warning.svg similarity index 100% rename from docbook/common_graphics/warning.svg rename to docbook/wsdg_src/images/warning.svg diff --git a/docbook/wsdg_graphics/ws-capture-sync.dia b/docbook/wsdg_src/images/ws-capture-sync.dia similarity index 100% rename from docbook/wsdg_graphics/ws-capture-sync.dia rename to docbook/wsdg_src/images/ws-capture-sync.dia diff --git a/docbook/wsdg_graphics/ws-capture-sync.png b/docbook/wsdg_src/images/ws-capture-sync.png similarity index 100% rename from docbook/wsdg_graphics/ws-capture-sync.png rename to docbook/wsdg_src/images/ws-capture-sync.png diff --git a/docbook/wsdg_graphics/ws-capture_internals.dia b/docbook/wsdg_src/images/ws-capture_internals.dia similarity index 100% rename from docbook/wsdg_graphics/ws-capture_internals.dia rename to docbook/wsdg_src/images/ws-capture_internals.dia diff --git a/docbook/wsdg_graphics/ws-capture_internals.png b/docbook/wsdg_src/images/ws-capture_internals.png similarity index 100% rename from docbook/wsdg_graphics/ws-capture_internals.png rename to docbook/wsdg_src/images/ws-capture_internals.png diff --git a/docbook/wsdg_graphics/ws-dev-guide-cover.png b/docbook/wsdg_src/images/ws-dev-guide-cover.png similarity index 100% rename from docbook/wsdg_graphics/ws-dev-guide-cover.png rename to docbook/wsdg_src/images/ws-dev-guide-cover.png diff --git a/docbook/wsdg_graphics/ws-function-blocks.dia b/docbook/wsdg_src/images/ws-function-blocks.dia similarity index 100% rename from docbook/wsdg_graphics/ws-function-blocks.dia rename to docbook/wsdg_src/images/ws-function-blocks.dia diff --git a/docbook/wsdg_graphics/ws-function-blocks.png b/docbook/wsdg_src/images/ws-function-blocks.png similarity index 100% rename from docbook/wsdg_graphics/ws-function-blocks.png rename to docbook/wsdg_src/images/ws-function-blocks.png diff --git a/docbook/wsdg_graphics/ws-logo.png b/docbook/wsdg_src/images/ws-logo.png similarity index 100% rename from docbook/wsdg_graphics/ws-logo.png rename to docbook/wsdg_src/images/ws-logo.png diff --git a/docbook/wsdg_graphics/wslua-new-dialog.png b/docbook/wsdg_src/images/wslua-new-dialog.png similarity index 100% rename from docbook/wsdg_graphics/wslua-new-dialog.png rename to docbook/wsdg_src/images/wslua-new-dialog.png diff --git a/docbook/wsdg_graphics/wslua-progdlg.png b/docbook/wsdg_src/images/wslua-progdlg.png similarity index 100% rename from docbook/wsdg_graphics/wslua-progdlg.png rename to docbook/wsdg_src/images/wslua-progdlg.png diff --git a/docbook/wsdg_graphics/wslua-textwindow.png b/docbook/wsdg_src/images/wslua-textwindow.png similarity index 100% rename from docbook/wsdg_graphics/wslua-textwindow.png rename to docbook/wsdg_src/images/wslua-textwindow.png diff --git a/docbook/wsluarm.adoc b/docbook/wsdg_src/wsdg_lua_support.adoc similarity index 99% rename from docbook/wsluarm.adoc rename to docbook/wsdg_src/wsdg_lua_support.adoc index 14fb15b678..fd6db05135 100644 --- a/docbook/wsluarm.adoc +++ b/docbook/wsdg_src/wsdg_lua_support.adoc @@ -1,7 +1,7 @@ [#wsluarm] // Attributes -:build_dir: . +:build_dir: .. == Lua Support in Wireshark diff --git a/docbook/wsdg_src/wsdg_sources.adoc b/docbook/wsdg_src/wsdg_sources.adoc index 2914d48a9c..a85f5bc5d0 100644 --- a/docbook/wsdg_src/wsdg_sources.adoc +++ b/docbook/wsdg_src/wsdg_sources.adoc @@ -363,7 +363,7 @@ This requires you to set up git as described at <>. GitLab uses a https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html[forking workflow], which looks like this: .GitLab Workflow -image::wsdg_graphics/git-triangular-workflow.svg[] +image::images/git-triangular-workflow.svg[] In the diagram above, your fork can created by pressing the “Fork” button at {wireshark-gitlab-project-url}. Your local repository can be created as described in <>. diff --git a/docbook/wsdg_src/wsdg_works.adoc b/docbook/wsdg_src/wsdg_works.adoc index bb4c5fc81f..baa754037f 100644 --- a/docbook/wsdg_src/wsdg_works.adoc +++ b/docbook/wsdg_src/wsdg_works.adoc @@ -19,7 +19,7 @@ The following will give you a simplified overview of Wireshark’s function bloc [#ChWorksFigOverview] .Wireshark function blocks -image::wsdg_graphics/ws-function-blocks.png[{pdf-scaledwidth}] +image::images/ws-function-blocks.png[{pdf-scaledwidth}] The function blocks in more detail: diff --git a/docbook/wsug_src/images/caution.svg b/docbook/wsug_src/images/caution.svg new file mode 100644 index 0000000000..793c6020f8 --- /dev/null +++ b/docbook/wsug_src/images/caution.svg @@ -0,0 +1,3 @@ + + + diff --git a/docbook/wsug_src/images/important.svg b/docbook/wsug_src/images/important.svg new file mode 100644 index 0000000000..a2ee7012cd --- /dev/null +++ b/docbook/wsug_src/images/important.svg @@ -0,0 +1,4 @@ + + + + diff --git a/docbook/wsug_src/images/note.svg b/docbook/wsug_src/images/note.svg new file mode 100644 index 0000000000..803dc13ea3 --- /dev/null +++ b/docbook/wsug_src/images/note.svg @@ -0,0 +1,3 @@ + + + diff --git a/docbook/wsug_graphics/related-ack.png b/docbook/wsug_src/images/related-ack.png similarity index 100% rename from docbook/wsug_graphics/related-ack.png rename to docbook/wsug_src/images/related-ack.png diff --git a/docbook/wsug_graphics/related-current.png b/docbook/wsug_src/images/related-current.png similarity index 100% rename from docbook/wsug_graphics/related-current.png rename to docbook/wsug_src/images/related-current.png diff --git a/docbook/wsug_graphics/related-dup-ack.png b/docbook/wsug_src/images/related-dup-ack.png similarity index 100% rename from docbook/wsug_graphics/related-dup-ack.png rename to docbook/wsug_src/images/related-dup-ack.png diff --git a/docbook/wsug_graphics/related-first.png b/docbook/wsug_src/images/related-first.png similarity index 100% rename from docbook/wsug_graphics/related-first.png rename to docbook/wsug_src/images/related-first.png diff --git a/docbook/wsug_graphics/related-last.png b/docbook/wsug_src/images/related-last.png similarity index 100% rename from docbook/wsug_graphics/related-last.png rename to docbook/wsug_src/images/related-last.png diff --git a/docbook/wsug_graphics/related-other.png b/docbook/wsug_src/images/related-other.png similarity index 100% rename from docbook/wsug_graphics/related-other.png rename to docbook/wsug_src/images/related-other.png diff --git a/docbook/wsug_graphics/related-request.png b/docbook/wsug_src/images/related-request.png similarity index 100% rename from docbook/wsug_graphics/related-request.png rename to docbook/wsug_src/images/related-request.png diff --git a/docbook/wsug_graphics/related-response.png b/docbook/wsug_src/images/related-response.png similarity index 100% rename from docbook/wsug_graphics/related-response.png rename to docbook/wsug_src/images/related-response.png diff --git a/docbook/wsug_graphics/related-segment.png b/docbook/wsug_src/images/related-segment.png similarity index 100% rename from docbook/wsug_graphics/related-segment.png rename to docbook/wsug_src/images/related-segment.png diff --git a/docbook/wsug_src/images/tip.svg b/docbook/wsug_src/images/tip.svg new file mode 100644 index 0000000000..1a60b74a68 --- /dev/null +++ b/docbook/wsug_src/images/tip.svg @@ -0,0 +1,3 @@ + + + diff --git a/docbook/wsug_graphics/toolbar/document-open.png b/docbook/wsug_src/images/toolbar/document-open.png similarity index 100% rename from docbook/wsug_graphics/toolbar/document-open.png rename to docbook/wsug_src/images/toolbar/document-open.png diff --git a/docbook/wsug_graphics/toolbar/edit-find.png b/docbook/wsug_src/images/toolbar/edit-find.png similarity index 100% rename from docbook/wsug_graphics/toolbar/edit-find.png rename to docbook/wsug_src/images/toolbar/edit-find.png diff --git a/docbook/wsug_graphics/toolbar/filter-toolbar-add.png b/docbook/wsug_src/images/toolbar/filter-toolbar-add.png similarity index 100% rename from docbook/wsug_graphics/toolbar/filter-toolbar-add.png rename to docbook/wsug_src/images/toolbar/filter-toolbar-add.png diff --git a/docbook/wsug_graphics/toolbar/filter-toolbar-apply.png b/docbook/wsug_src/images/toolbar/filter-toolbar-apply.png similarity index 100% rename from docbook/wsug_graphics/toolbar/filter-toolbar-apply.png rename to docbook/wsug_src/images/toolbar/filter-toolbar-apply.png diff --git a/docbook/wsug_graphics/toolbar/filter-toolbar-bookmark.png b/docbook/wsug_src/images/toolbar/filter-toolbar-bookmark.png similarity index 100% rename from docbook/wsug_graphics/toolbar/filter-toolbar-bookmark.png rename to docbook/wsug_src/images/toolbar/filter-toolbar-bookmark.png diff --git a/docbook/wsug_graphics/toolbar/filter-toolbar-clear.png b/docbook/wsug_src/images/toolbar/filter-toolbar-clear.png similarity index 100% rename from docbook/wsug_graphics/toolbar/filter-toolbar-clear.png rename to docbook/wsug_src/images/toolbar/filter-toolbar-clear.png diff --git a/docbook/wsug_graphics/toolbar/filter-toolbar-input.png b/docbook/wsug_src/images/toolbar/filter-toolbar-input.png similarity index 100% rename from docbook/wsug_graphics/toolbar/filter-toolbar-input.png rename to docbook/wsug_src/images/toolbar/filter-toolbar-input.png diff --git a/docbook/wsug_graphics/toolbar/filter-toolbar-recent.png b/docbook/wsug_src/images/toolbar/filter-toolbar-recent.png similarity index 100% rename from docbook/wsug_graphics/toolbar/filter-toolbar-recent.png rename to docbook/wsug_src/images/toolbar/filter-toolbar-recent.png diff --git a/docbook/wsug_graphics/toolbar/go-first.png b/docbook/wsug_src/images/toolbar/go-first.png similarity index 100% rename from docbook/wsug_graphics/toolbar/go-first.png rename to docbook/wsug_src/images/toolbar/go-first.png diff --git a/docbook/wsug_graphics/toolbar/go-jump.png b/docbook/wsug_src/images/toolbar/go-jump.png similarity index 100% rename from docbook/wsug_graphics/toolbar/go-jump.png rename to docbook/wsug_src/images/toolbar/go-jump.png diff --git a/docbook/wsug_graphics/toolbar/go-last.png b/docbook/wsug_src/images/toolbar/go-last.png similarity index 100% rename from docbook/wsug_graphics/toolbar/go-last.png rename to docbook/wsug_src/images/toolbar/go-last.png diff --git a/docbook/wsug_graphics/toolbar/go-next.png b/docbook/wsug_src/images/toolbar/go-next.png similarity index 100% rename from docbook/wsug_graphics/toolbar/go-next.png rename to docbook/wsug_src/images/toolbar/go-next.png diff --git a/docbook/wsug_graphics/toolbar/go-previous.png b/docbook/wsug_src/images/toolbar/go-previous.png similarity index 100% rename from docbook/wsug_graphics/toolbar/go-previous.png rename to docbook/wsug_src/images/toolbar/go-previous.png diff --git a/docbook/wsug_graphics/toolbar/x-capture-file-close.png b/docbook/wsug_src/images/toolbar/x-capture-file-close.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-capture-file-close.png rename to docbook/wsug_src/images/toolbar/x-capture-file-close.png diff --git a/docbook/wsug_graphics/toolbar/x-capture-file-reload.png b/docbook/wsug_src/images/toolbar/x-capture-file-reload.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-capture-file-reload.png rename to docbook/wsug_src/images/toolbar/x-capture-file-reload.png diff --git a/docbook/wsug_graphics/toolbar/x-capture-file-save.png b/docbook/wsug_src/images/toolbar/x-capture-file-save.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-capture-file-save.png rename to docbook/wsug_src/images/toolbar/x-capture-file-save.png diff --git a/docbook/wsug_graphics/toolbar/x-capture-options.png b/docbook/wsug_src/images/toolbar/x-capture-options.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-capture-options.png rename to docbook/wsug_src/images/toolbar/x-capture-options.png diff --git a/docbook/wsug_graphics/toolbar/x-capture-restart.png b/docbook/wsug_src/images/toolbar/x-capture-restart.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-capture-restart.png rename to docbook/wsug_src/images/toolbar/x-capture-restart.png diff --git a/docbook/wsug_graphics/toolbar/x-capture-start.png b/docbook/wsug_src/images/toolbar/x-capture-start.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-capture-start.png rename to docbook/wsug_src/images/toolbar/x-capture-start.png diff --git a/docbook/wsug_graphics/toolbar/x-capture-stop.png b/docbook/wsug_src/images/toolbar/x-capture-stop.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-capture-stop.png rename to docbook/wsug_src/images/toolbar/x-capture-stop.png diff --git a/docbook/wsug_graphics/toolbar/x-colorize-packets.png b/docbook/wsug_src/images/toolbar/x-colorize-packets.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-colorize-packets.png rename to docbook/wsug_src/images/toolbar/x-colorize-packets.png diff --git a/docbook/wsug_graphics/toolbar/x-resize-columns.png b/docbook/wsug_src/images/toolbar/x-resize-columns.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-resize-columns.png rename to docbook/wsug_src/images/toolbar/x-resize-columns.png diff --git a/docbook/wsug_graphics/toolbar/x-stay-last.png b/docbook/wsug_src/images/toolbar/x-stay-last.png similarity index 100% rename from docbook/wsug_graphics/toolbar/x-stay-last.png rename to docbook/wsug_src/images/toolbar/x-stay-last.png diff --git a/docbook/wsug_graphics/toolbar/zoom-in.png b/docbook/wsug_src/images/toolbar/zoom-in.png similarity index 100% rename from docbook/wsug_graphics/toolbar/zoom-in.png rename to docbook/wsug_src/images/toolbar/zoom-in.png diff --git a/docbook/wsug_graphics/toolbar/zoom-original.png b/docbook/wsug_src/images/toolbar/zoom-original.png similarity index 100% rename from docbook/wsug_graphics/toolbar/zoom-original.png rename to docbook/wsug_src/images/toolbar/zoom-original.png diff --git a/docbook/wsug_graphics/toolbar/zoom-out.png b/docbook/wsug_src/images/toolbar/zoom-out.png similarity index 100% rename from docbook/wsug_graphics/toolbar/zoom-out.png rename to docbook/wsug_src/images/toolbar/zoom-out.png diff --git a/docbook/wsug_src/images/warning.svg b/docbook/wsug_src/images/warning.svg new file mode 100644 index 0000000000..80c0ba5c31 --- /dev/null +++ b/docbook/wsug_src/images/warning.svg @@ -0,0 +1,4 @@ + + + + diff --git a/docbook/wsug_graphics/ws-about-codecs.png b/docbook/wsug_src/images/ws-about-codecs.png similarity index 100% rename from docbook/wsug_graphics/ws-about-codecs.png rename to docbook/wsug_src/images/ws-about-codecs.png diff --git a/docbook/wsug_graphics/ws-analyze-menu.png b/docbook/wsug_src/images/ws-analyze-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-analyze-menu.png rename to docbook/wsug_src/images/ws-analyze-menu.png diff --git a/docbook/wsug_graphics/ws-asap-statistics.png b/docbook/wsug_src/images/ws-asap-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-asap-statistics.png rename to docbook/wsug_src/images/ws-asap-statistics.png diff --git a/docbook/wsug_graphics/ws-bluetooth-devices.png b/docbook/wsug_src/images/ws-bluetooth-devices.png similarity index 100% rename from docbook/wsug_graphics/ws-bluetooth-devices.png rename to docbook/wsug_src/images/ws-bluetooth-devices.png diff --git a/docbook/wsug_graphics/ws-bt-hci-summary.png b/docbook/wsug_src/images/ws-bt-hci-summary.png similarity index 100% rename from docbook/wsug_graphics/ws-bt-hci-summary.png rename to docbook/wsug_src/images/ws-bt-hci-summary.png diff --git a/docbook/wsug_graphics/ws-bytes-pane-popup-menu.png b/docbook/wsug_src/images/ws-bytes-pane-popup-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-bytes-pane-popup-menu.png rename to docbook/wsug_src/images/ws-bytes-pane-popup-menu.png diff --git a/docbook/wsug_graphics/ws-bytes-pane-tabs.png b/docbook/wsug_src/images/ws-bytes-pane-tabs.png similarity index 100% rename from docbook/wsug_graphics/ws-bytes-pane-tabs.png rename to docbook/wsug_src/images/ws-bytes-pane-tabs.png diff --git a/docbook/wsug_graphics/ws-bytes-pane.png b/docbook/wsug_src/images/ws-bytes-pane.png similarity index 100% rename from docbook/wsug_graphics/ws-bytes-pane.png rename to docbook/wsug_src/images/ws-bytes-pane.png diff --git a/docbook/wsug_graphics/ws-calcappprotocol-statistics.png b/docbook/wsug_src/images/ws-calcappprotocol-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-calcappprotocol-statistics.png rename to docbook/wsug_src/images/ws-calcappprotocol-statistics.png diff --git a/docbook/wsug_graphics/ws-capture-file-properties.png b/docbook/wsug_src/images/ws-capture-file-properties.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-file-properties.png rename to docbook/wsug_src/images/ws-capture-file-properties.png diff --git a/docbook/wsug_graphics/ws-capture-info.png b/docbook/wsug_src/images/ws-capture-info.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-info.png rename to docbook/wsug_src/images/ws-capture-info.png diff --git a/docbook/wsug_graphics/ws-capture-interfaces-main-macos.png b/docbook/wsug_src/images/ws-capture-interfaces-main-macos.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-interfaces-main-macos.png rename to docbook/wsug_src/images/ws-capture-interfaces-main-macos.png diff --git a/docbook/wsug_graphics/ws-capture-interfaces-main-win32.png b/docbook/wsug_src/images/ws-capture-interfaces-main-win32.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-interfaces-main-win32.png rename to docbook/wsug_src/images/ws-capture-interfaces-main-win32.png diff --git a/docbook/wsug_graphics/ws-capture-menu.png b/docbook/wsug_src/images/ws-capture-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-menu.png rename to docbook/wsug_src/images/ws-capture-menu.png diff --git a/docbook/wsug_graphics/ws-capture-options-compile-selected-bpfs.png b/docbook/wsug_src/images/ws-capture-options-compile-selected-bpfs.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-options-compile-selected-bpfs.png rename to docbook/wsug_src/images/ws-capture-options-compile-selected-bpfs.png diff --git a/docbook/wsug_graphics/ws-capture-options-options.png b/docbook/wsug_src/images/ws-capture-options-options.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-options-options.png rename to docbook/wsug_src/images/ws-capture-options-options.png diff --git a/docbook/wsug_graphics/ws-capture-options-output.png b/docbook/wsug_src/images/ws-capture-options-output.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-options-output.png rename to docbook/wsug_src/images/ws-capture-options-output.png diff --git a/docbook/wsug_graphics/ws-capture-options.png b/docbook/wsug_src/images/ws-capture-options.png similarity index 100% rename from docbook/wsug_graphics/ws-capture-options.png rename to docbook/wsug_src/images/ws-capture-options.png diff --git a/docbook/wsug_graphics/ws-choose-color-rule.png b/docbook/wsug_src/images/ws-choose-color-rule.png similarity index 100% rename from docbook/wsug_graphics/ws-choose-color-rule.png rename to docbook/wsug_src/images/ws-choose-color-rule.png diff --git a/docbook/wsug_graphics/ws-coloring-fields.png b/docbook/wsug_src/images/ws-coloring-fields.png similarity index 100% rename from docbook/wsug_graphics/ws-coloring-fields.png rename to docbook/wsug_src/images/ws-coloring-fields.png diff --git a/docbook/wsug_graphics/ws-coloring-rules-dialog.png b/docbook/wsug_src/images/ws-coloring-rules-dialog.png similarity index 100% rename from docbook/wsug_graphics/ws-coloring-rules-dialog.png rename to docbook/wsug_src/images/ws-coloring-rules-dialog.png diff --git a/docbook/wsug_graphics/ws-column-header-popup-menu.png b/docbook/wsug_src/images/ws-column-header-popup-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-column-header-popup-menu.png rename to docbook/wsug_src/images/ws-column-header-popup-menu.png diff --git a/docbook/wsug_graphics/ws-csp-statistics.png b/docbook/wsug_src/images/ws-csp-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-csp-statistics.png rename to docbook/wsug_src/images/ws-csp-statistics.png diff --git a/docbook/wsug_graphics/ws-decode-as.png b/docbook/wsug_src/images/ws-decode-as.png similarity index 100% rename from docbook/wsug_graphics/ws-decode-as.png rename to docbook/wsug_src/images/ws-decode-as.png diff --git a/docbook/wsug_graphics/ws-details-pane-popup-menu.png b/docbook/wsug_src/images/ws-details-pane-popup-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-details-pane-popup-menu.png rename to docbook/wsug_src/images/ws-details-pane-popup-menu.png diff --git a/docbook/wsug_graphics/ws-details-pane.png b/docbook/wsug_src/images/ws-details-pane.png similarity index 100% rename from docbook/wsug_graphics/ws-details-pane.png rename to docbook/wsug_src/images/ws-details-pane.png diff --git a/docbook/wsug_graphics/ws-diagram-pane-popup-menu.png b/docbook/wsug_src/images/ws-diagram-pane-popup-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-diagram-pane-popup-menu.png rename to docbook/wsug_src/images/ws-diagram-pane-popup-menu.png diff --git a/docbook/wsug_graphics/ws-diagram-pane.png b/docbook/wsug_src/images/ws-diagram-pane.png similarity index 100% rename from docbook/wsug_graphics/ws-diagram-pane.png rename to docbook/wsug_src/images/ws-diagram-pane.png diff --git a/docbook/wsug_graphics/ws-display-filter-tcp.png b/docbook/wsug_src/images/ws-display-filter-tcp.png similarity index 100% rename from docbook/wsug_graphics/ws-display-filter-tcp.png rename to docbook/wsug_src/images/ws-display-filter-tcp.png diff --git a/docbook/wsug_graphics/ws-dns.png b/docbook/wsug_src/images/ws-dns.png similarity index 100% rename from docbook/wsug_graphics/ws-dns.png rename to docbook/wsug_src/images/ws-dns.png diff --git a/docbook/wsug_graphics/ws-edit-menu.png b/docbook/wsug_src/images/ws-edit-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-edit-menu.png rename to docbook/wsug_src/images/ws-edit-menu.png diff --git a/docbook/wsug_graphics/ws-enabled-protocols.png b/docbook/wsug_src/images/ws-enabled-protocols.png similarity index 100% rename from docbook/wsug_graphics/ws-enabled-protocols.png rename to docbook/wsug_src/images/ws-enabled-protocols.png diff --git a/docbook/wsug_graphics/ws-enrp-statistics.png b/docbook/wsug_src/images/ws-enrp-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-enrp-statistics.png rename to docbook/wsug_src/images/ws-enrp-statistics.png diff --git a/docbook/wsug_graphics/ws-expert-colored-tree.png b/docbook/wsug_src/images/ws-expert-colored-tree.png similarity index 100% rename from docbook/wsug_graphics/ws-expert-colored-tree.png rename to docbook/wsug_src/images/ws-expert-colored-tree.png diff --git a/docbook/wsug_graphics/ws-expert-column.png b/docbook/wsug_src/images/ws-expert-column.png similarity index 100% rename from docbook/wsug_graphics/ws-expert-column.png rename to docbook/wsug_src/images/ws-expert-column.png diff --git a/docbook/wsug_graphics/ws-expert-information.png b/docbook/wsug_src/images/ws-expert-information.png similarity index 100% rename from docbook/wsug_graphics/ws-expert-information.png rename to docbook/wsug_src/images/ws-expert-information.png diff --git a/docbook/wsug_graphics/ws-export-objects.png b/docbook/wsug_src/images/ws-export-objects.png similarity index 100% rename from docbook/wsug_graphics/ws-export-objects.png rename to docbook/wsug_src/images/ws-export-objects.png diff --git a/docbook/wsug_graphics/ws-export-packet-dissections.png b/docbook/wsug_src/images/ws-export-packet-dissections.png similarity index 100% rename from docbook/wsug_graphics/ws-export-packet-dissections.png rename to docbook/wsug_src/images/ws-export-packet-dissections.png diff --git a/docbook/wsug_graphics/ws-export-pdus-to-file.png b/docbook/wsug_src/images/ws-export-pdus-to-file.png similarity index 100% rename from docbook/wsug_graphics/ws-export-pdus-to-file.png rename to docbook/wsug_src/images/ws-export-pdus-to-file.png diff --git a/docbook/wsug_graphics/ws-export-selected.png b/docbook/wsug_src/images/ws-export-selected.png similarity index 100% rename from docbook/wsug_graphics/ws-export-selected.png rename to docbook/wsug_src/images/ws-export-selected.png diff --git a/docbook/wsug_graphics/ws-export-specified-packets.png b/docbook/wsug_src/images/ws-export-specified-packets.png similarity index 100% rename from docbook/wsug_graphics/ws-export-specified-packets.png rename to docbook/wsug_src/images/ws-export-specified-packets.png diff --git a/docbook/wsug_graphics/ws-fgp-statistics.png b/docbook/wsug_src/images/ws-fgp-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-fgp-statistics.png rename to docbook/wsug_src/images/ws-fgp-statistics.png diff --git a/docbook/wsug_graphics/ws-file-import-regex.png b/docbook/wsug_src/images/ws-file-import-regex.png similarity index 100% rename from docbook/wsug_graphics/ws-file-import-regex.png rename to docbook/wsug_src/images/ws-file-import-regex.png diff --git a/docbook/wsug_graphics/ws-file-import.png b/docbook/wsug_src/images/ws-file-import.png similarity index 100% rename from docbook/wsug_graphics/ws-file-import.png rename to docbook/wsug_src/images/ws-file-import.png diff --git a/docbook/wsug_graphics/ws-file-menu.png b/docbook/wsug_src/images/ws-file-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-file-menu.png rename to docbook/wsug_src/images/ws-file-menu.png diff --git a/docbook/wsug_graphics/ws-file-set-dialog.png b/docbook/wsug_src/images/ws-file-set-dialog.png similarity index 100% rename from docbook/wsug_graphics/ws-file-set-dialog.png rename to docbook/wsug_src/images/ws-file-set-dialog.png diff --git a/docbook/wsug_graphics/ws-filter-add-expression.png b/docbook/wsug_src/images/ws-filter-add-expression.png similarity index 100% rename from docbook/wsug_graphics/ws-filter-add-expression.png rename to docbook/wsug_src/images/ws-filter-add-expression.png diff --git a/docbook/wsug_graphics/ws-filter-macros.png b/docbook/wsug_src/images/ws-filter-macros.png similarity index 100% rename from docbook/wsug_graphics/ws-filter-macros.png rename to docbook/wsug_src/images/ws-filter-macros.png diff --git a/docbook/wsug_graphics/ws-filter-toolbar.png b/docbook/wsug_src/images/ws-filter-toolbar.png similarity index 100% rename from docbook/wsug_graphics/ws-filter-toolbar.png rename to docbook/wsug_src/images/ws-filter-toolbar.png diff --git a/docbook/wsug_graphics/ws-filters.png b/docbook/wsug_src/images/ws-filters.png similarity index 100% rename from docbook/wsug_graphics/ws-filters.png rename to docbook/wsug_src/images/ws-filters.png diff --git a/docbook/wsug_graphics/ws-find-packet.png b/docbook/wsug_src/images/ws-find-packet.png similarity index 100% rename from docbook/wsug_graphics/ws-find-packet.png rename to docbook/wsug_src/images/ws-find-packet.png diff --git a/docbook/wsug_graphics/ws-flow-graph.png b/docbook/wsug_src/images/ws-flow-graph.png similarity index 100% rename from docbook/wsug_graphics/ws-flow-graph.png rename to docbook/wsug_src/images/ws-flow-graph.png diff --git a/docbook/wsug_graphics/ws-follow-http2-stream.png b/docbook/wsug_src/images/ws-follow-http2-stream.png similarity index 100% rename from docbook/wsug_graphics/ws-follow-http2-stream.png rename to docbook/wsug_src/images/ws-follow-http2-stream.png diff --git a/docbook/wsug_graphics/ws-follow-sip-stream.png b/docbook/wsug_src/images/ws-follow-sip-stream.png similarity index 100% rename from docbook/wsug_graphics/ws-follow-sip-stream.png rename to docbook/wsug_src/images/ws-follow-sip-stream.png diff --git a/docbook/wsug_graphics/ws-follow-stream.png b/docbook/wsug_src/images/ws-follow-stream.png similarity index 100% rename from docbook/wsug_graphics/ws-follow-stream.png rename to docbook/wsug_src/images/ws-follow-stream.png diff --git a/docbook/wsug_graphics/ws-go-menu.png b/docbook/wsug_src/images/ws-go-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-go-menu.png rename to docbook/wsug_src/images/ws-go-menu.png diff --git a/docbook/wsug_graphics/ws-goto-packet.png b/docbook/wsug_src/images/ws-goto-packet.png similarity index 100% rename from docbook/wsug_graphics/ws-goto-packet.png rename to docbook/wsug_src/images/ws-goto-packet.png diff --git a/docbook/wsug_graphics/ws-gui-config-profiles.png b/docbook/wsug_src/images/ws-gui-config-profiles.png similarity index 100% rename from docbook/wsug_graphics/ws-gui-config-profiles.png rename to docbook/wsug_src/images/ws-gui-config-profiles.png diff --git a/docbook/wsug_graphics/ws-gui-preferences-advanced.png b/docbook/wsug_src/images/ws-gui-preferences-advanced.png similarity index 100% rename from docbook/wsug_graphics/ws-gui-preferences-advanced.png rename to docbook/wsug_src/images/ws-gui-preferences-advanced.png diff --git a/docbook/wsug_graphics/ws-gui-preferences.png b/docbook/wsug_src/images/ws-gui-preferences.png similarity index 100% rename from docbook/wsug_graphics/ws-gui-preferences.png rename to docbook/wsug_src/images/ws-gui-preferences.png diff --git a/docbook/wsug_graphics/ws-help-menu.png b/docbook/wsug_src/images/ws-help-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-help-menu.png rename to docbook/wsug_src/images/ws-help-menu.png diff --git a/docbook/wsug_graphics/ws-list-pane.png b/docbook/wsug_src/images/ws-list-pane.png similarity index 100% rename from docbook/wsug_graphics/ws-list-pane.png rename to docbook/wsug_src/images/ws-list-pane.png diff --git a/docbook/wsug_graphics/ws-main-toolbar.png b/docbook/wsug_src/images/ws-main-toolbar.png similarity index 100% rename from docbook/wsug_graphics/ws-main-toolbar.png rename to docbook/wsug_src/images/ws-main-toolbar.png diff --git a/docbook/wsug_graphics/ws-main.png b/docbook/wsug_src/images/ws-main.png similarity index 100% rename from docbook/wsug_graphics/ws-main.png rename to docbook/wsug_src/images/ws-main.png diff --git a/docbook/wsug_graphics/ws-manage-interfaces.png b/docbook/wsug_src/images/ws-manage-interfaces.png similarity index 100% rename from docbook/wsug_graphics/ws-manage-interfaces.png rename to docbook/wsug_src/images/ws-manage-interfaces.png diff --git a/docbook/wsug_graphics/ws-mate-analysis.png b/docbook/wsug_src/images/ws-mate-analysis.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-analysis.png rename to docbook/wsug_src/images/ws-mate-analysis.png diff --git a/docbook/wsug_graphics/ws-mate-dns_pane.png b/docbook/wsug_src/images/ws-mate-dns_pane.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-dns_pane.png rename to docbook/wsug_src/images/ws-mate-dns_pane.png diff --git a/docbook/wsug_graphics/ws-mate-dns_pdu.png b/docbook/wsug_src/images/ws-mate-dns_pdu.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-dns_pdu.png rename to docbook/wsug_src/images/ws-mate-dns_pdu.png diff --git a/docbook/wsug_graphics/ws-mate-ftp_over_gre.png b/docbook/wsug_src/images/ws-mate-ftp_over_gre.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-ftp_over_gre.png rename to docbook/wsug_src/images/ws-mate-ftp_over_gre.png diff --git a/docbook/wsug_graphics/ws-mate-gop_analysis.png b/docbook/wsug_src/images/ws-mate-gop_analysis.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-gop_analysis.png rename to docbook/wsug_src/images/ws-mate-gop_analysis.png diff --git a/docbook/wsug_graphics/ws-mate-isup_over_mtp3_over_ip.png b/docbook/wsug_src/images/ws-mate-isup_over_mtp3_over_ip.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-isup_over_mtp3_over_ip.png rename to docbook/wsug_src/images/ws-mate-isup_over_mtp3_over_ip.png diff --git a/docbook/wsug_graphics/ws-mate-mmse_over_http.png b/docbook/wsug_src/images/ws-mate-mmse_over_http.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-mmse_over_http.png rename to docbook/wsug_src/images/ws-mate-mmse_over_http.png diff --git a/docbook/wsug_graphics/ws-mate-pdu_analysis.png b/docbook/wsug_src/images/ws-mate-pdu_analysis.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-pdu_analysis.png rename to docbook/wsug_src/images/ws-mate-pdu_analysis.png diff --git a/docbook/wsug_graphics/ws-mate-tcp-output.png b/docbook/wsug_src/images/ws-mate-tcp-output.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-tcp-output.png rename to docbook/wsug_src/images/ws-mate-tcp-output.png diff --git a/docbook/wsug_graphics/ws-mate-transform.png b/docbook/wsug_src/images/ws-mate-transform.png similarity index 100% rename from docbook/wsug_graphics/ws-mate-transform.png rename to docbook/wsug_src/images/ws-mate-transform.png diff --git a/docbook/wsug_graphics/ws-menu.png b/docbook/wsug_src/images/ws-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-menu.png rename to docbook/wsug_src/images/ws-menu.png diff --git a/docbook/wsug_graphics/ws-merge-qt5.png b/docbook/wsug_src/images/ws-merge-qt5.png similarity index 100% rename from docbook/wsug_graphics/ws-merge-qt5.png rename to docbook/wsug_src/images/ws-merge-qt5.png diff --git a/docbook/wsug_graphics/ws-merge-win32.png b/docbook/wsug_src/images/ws-merge-win32.png similarity index 100% rename from docbook/wsug_graphics/ws-merge-win32.png rename to docbook/wsug_src/images/ws-merge-win32.png diff --git a/docbook/wsug_graphics/ws-netperfmeter-statistics.png b/docbook/wsug_src/images/ws-netperfmeter-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-netperfmeter-statistics.png rename to docbook/wsug_src/images/ws-netperfmeter-statistics.png diff --git a/docbook/wsug_graphics/ws-open-qt5.png b/docbook/wsug_src/images/ws-open-qt5.png similarity index 100% rename from docbook/wsug_graphics/ws-open-qt5.png rename to docbook/wsug_src/images/ws-open-qt5.png diff --git a/docbook/wsug_graphics/ws-open-win32.png b/docbook/wsug_src/images/ws-open-win32.png similarity index 100% rename from docbook/wsug_graphics/ws-open-win32.png rename to docbook/wsug_src/images/ws-open-win32.png diff --git a/docbook/wsug_graphics/ws-packet-format.png b/docbook/wsug_src/images/ws-packet-format.png similarity index 100% rename from docbook/wsug_graphics/ws-packet-format.png rename to docbook/wsug_src/images/ws-packet-format.png diff --git a/docbook/wsug_graphics/ws-packet-pane-popup-menu.png b/docbook/wsug_src/images/ws-packet-pane-popup-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-packet-pane-popup-menu.png rename to docbook/wsug_src/images/ws-packet-pane-popup-menu.png diff --git a/docbook/wsug_graphics/ws-packet-range.png b/docbook/wsug_src/images/ws-packet-range.png similarity index 100% rename from docbook/wsug_graphics/ws-packet-range.png rename to docbook/wsug_src/images/ws-packet-range.png diff --git a/docbook/wsug_graphics/ws-packet-selected.png b/docbook/wsug_src/images/ws-packet-selected.png similarity index 100% rename from docbook/wsug_graphics/ws-packet-selected.png rename to docbook/wsug_src/images/ws-packet-selected.png diff --git a/docbook/wsug_graphics/ws-packet-sep-win.png b/docbook/wsug_src/images/ws-packet-sep-win.png similarity index 100% rename from docbook/wsug_graphics/ws-packet-sep-win.png rename to docbook/wsug_src/images/ws-packet-sep-win.png diff --git a/docbook/wsug_graphics/ws-pingpongprotocol-statistics.png b/docbook/wsug_src/images/ws-pingpongprotocol-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-pingpongprotocol-statistics.png rename to docbook/wsug_src/images/ws-pingpongprotocol-statistics.png diff --git a/docbook/wsug_graphics/ws-print.png b/docbook/wsug_src/images/ws-print.png similarity index 100% rename from docbook/wsug_graphics/ws-print.png rename to docbook/wsug_src/images/ws-print.png diff --git a/docbook/wsug_graphics/ws-resolved-addr.png b/docbook/wsug_src/images/ws-resolved-addr.png similarity index 100% rename from docbook/wsug_graphics/ws-resolved-addr.png rename to docbook/wsug_src/images/ws-resolved-addr.png diff --git a/docbook/wsug_graphics/ws-rlc-graph.png b/docbook/wsug_src/images/ws-rlc-graph.png similarity index 100% rename from docbook/wsug_graphics/ws-rlc-graph.png rename to docbook/wsug_src/images/ws-rlc-graph.png diff --git a/docbook/wsug_graphics/ws-save-as-qt5.png b/docbook/wsug_src/images/ws-save-as-qt5.png similarity index 100% rename from docbook/wsug_graphics/ws-save-as-qt5.png rename to docbook/wsug_src/images/ws-save-as-qt5.png diff --git a/docbook/wsug_graphics/ws-save-as-win32.png b/docbook/wsug_src/images/ws-save-as-win32.png similarity index 100% rename from docbook/wsug_graphics/ws-save-as-win32.png rename to docbook/wsug_src/images/ws-save-as-win32.png diff --git a/docbook/wsug_graphics/ws-sctp-1-association.png b/docbook/wsug_src/images/ws-sctp-1-association.png similarity index 100% rename from docbook/wsug_graphics/ws-sctp-1-association.png rename to docbook/wsug_src/images/ws-sctp-1-association.png diff --git a/docbook/wsug_graphics/ws-sctp.png b/docbook/wsug_src/images/ws-sctp.png similarity index 100% rename from docbook/wsug_graphics/ws-sctp.png rename to docbook/wsug_src/images/ws-sctp.png diff --git a/docbook/wsug_graphics/ws-ssp-statistics.png b/docbook/wsug_src/images/ws-ssp-statistics.png similarity index 100% rename from docbook/wsug_graphics/ws-ssp-statistics.png rename to docbook/wsug_src/images/ws-ssp-statistics.png diff --git a/docbook/wsug_graphics/ws-statistics-menu.png b/docbook/wsug_src/images/ws-statistics-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-statistics-menu.png rename to docbook/wsug_src/images/ws-statistics-menu.png diff --git a/docbook/wsug_graphics/ws-stats-conversations.png b/docbook/wsug_src/images/ws-stats-conversations.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-conversations.png rename to docbook/wsug_src/images/ws-stats-conversations.png diff --git a/docbook/wsug_graphics/ws-stats-endpoints.png b/docbook/wsug_src/images/ws-stats-endpoints.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-endpoints.png rename to docbook/wsug_src/images/ws-stats-endpoints.png diff --git a/docbook/wsug_graphics/ws-stats-hierarchy.png b/docbook/wsug_src/images/ws-stats-hierarchy.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-hierarchy.png rename to docbook/wsug_src/images/ws-stats-hierarchy.png diff --git a/docbook/wsug_graphics/ws-stats-http-requestsequences.png b/docbook/wsug_src/images/ws-stats-http-requestsequences.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-http-requestsequences.png rename to docbook/wsug_src/images/ws-stats-http-requestsequences.png diff --git a/docbook/wsug_graphics/ws-stats-iographs.png b/docbook/wsug_src/images/ws-stats-iographs.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-iographs.png rename to docbook/wsug_src/images/ws-stats-iographs.png diff --git a/docbook/wsug_graphics/ws-stats-lte-mac-traffic.png b/docbook/wsug_src/images/ws-stats-lte-mac-traffic.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-lte-mac-traffic.png rename to docbook/wsug_src/images/ws-stats-lte-mac-traffic.png diff --git a/docbook/wsug_graphics/ws-stats-lte-rlc-traffic.png b/docbook/wsug_src/images/ws-stats-lte-rlc-traffic.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-lte-rlc-traffic.png rename to docbook/wsug_src/images/ws-stats-lte-rlc-traffic.png diff --git a/docbook/wsug_graphics/ws-stats-packet-lengths.png b/docbook/wsug_src/images/ws-stats-packet-lengths.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-packet-lengths.png rename to docbook/wsug_src/images/ws-stats-packet-lengths.png diff --git a/docbook/wsug_graphics/ws-stats-srt-smb2.png b/docbook/wsug_src/images/ws-stats-srt-smb2.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-srt-smb2.png rename to docbook/wsug_src/images/ws-stats-srt-smb2.png diff --git a/docbook/wsug_graphics/ws-stats-wlan-traffic.png b/docbook/wsug_src/images/ws-stats-wlan-traffic.png similarity index 100% rename from docbook/wsug_graphics/ws-stats-wlan-traffic.png rename to docbook/wsug_src/images/ws-stats-wlan-traffic.png diff --git a/docbook/wsug_graphics/ws-statusbar-empty.png b/docbook/wsug_src/images/ws-statusbar-empty.png similarity index 100% rename from docbook/wsug_graphics/ws-statusbar-empty.png rename to docbook/wsug_src/images/ws-statusbar-empty.png diff --git a/docbook/wsug_graphics/ws-statusbar-filter.png b/docbook/wsug_src/images/ws-statusbar-filter.png similarity index 100% rename from docbook/wsug_graphics/ws-statusbar-filter.png rename to docbook/wsug_src/images/ws-statusbar-filter.png diff --git a/docbook/wsug_graphics/ws-statusbar-loaded.png b/docbook/wsug_src/images/ws-statusbar-loaded.png similarity index 100% rename from docbook/wsug_graphics/ws-statusbar-loaded.png rename to docbook/wsug_src/images/ws-statusbar-loaded.png diff --git a/docbook/wsug_graphics/ws-statusbar-profile.png b/docbook/wsug_src/images/ws-statusbar-profile.png similarity index 100% rename from docbook/wsug_graphics/ws-statusbar-profile.png rename to docbook/wsug_src/images/ws-statusbar-profile.png diff --git a/docbook/wsug_graphics/ws-statusbar-selected.png b/docbook/wsug_src/images/ws-statusbar-selected.png similarity index 100% rename from docbook/wsug_graphics/ws-statusbar-selected.png rename to docbook/wsug_src/images/ws-statusbar-selected.png diff --git a/docbook/wsug_graphics/ws-tcp-analysis.png b/docbook/wsug_src/images/ws-tcp-analysis.png similarity index 100% rename from docbook/wsug_graphics/ws-tcp-analysis.png rename to docbook/wsug_src/images/ws-tcp-analysis.png diff --git a/docbook/wsug_graphics/ws-tel-playlist.dia b/docbook/wsug_src/images/ws-tel-playlist.dia similarity index 100% rename from docbook/wsug_graphics/ws-tel-playlist.dia rename to docbook/wsug_src/images/ws-tel-playlist.dia diff --git a/docbook/wsug_graphics/ws-tel-playlist.png b/docbook/wsug_src/images/ws-tel-playlist.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-playlist.png rename to docbook/wsug_src/images/ws-tel-playlist.png diff --git a/docbook/wsug_graphics/ws-tel-rtp-player_1.png b/docbook/wsug_src/images/ws-tel-rtp-player_1.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtp-player_1.png rename to docbook/wsug_src/images/ws-tel-rtp-player_1.png diff --git a/docbook/wsug_graphics/ws-tel-rtp-player_1.xcf b/docbook/wsug_src/images/ws-tel-rtp-player_1.xcf similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtp-player_1.xcf rename to docbook/wsug_src/images/ws-tel-rtp-player_1.xcf diff --git a/docbook/wsug_graphics/ws-tel-rtp-player_2.png b/docbook/wsug_src/images/ws-tel-rtp-player_2.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtp-player_2.png rename to docbook/wsug_src/images/ws-tel-rtp-player_2.png diff --git a/docbook/wsug_graphics/ws-tel-rtp-player_2.xcf b/docbook/wsug_src/images/ws-tel-rtp-player_2.xcf similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtp-player_2.xcf rename to docbook/wsug_src/images/ws-tel-rtp-player_2.xcf diff --git a/docbook/wsug_graphics/ws-tel-rtp-player_3.png b/docbook/wsug_src/images/ws-tel-rtp-player_3.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtp-player_3.png rename to docbook/wsug_src/images/ws-tel-rtp-player_3.png diff --git a/docbook/wsug_graphics/ws-tel-rtp-player_button.png b/docbook/wsug_src/images/ws-tel-rtp-player_button.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtp-player_button.png rename to docbook/wsug_src/images/ws-tel-rtp-player_button.png diff --git a/docbook/wsug_graphics/ws-tel-rtp-streams.png b/docbook/wsug_src/images/ws-tel-rtp-streams.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtp-streams.png rename to docbook/wsug_src/images/ws-tel-rtp-streams.png diff --git a/docbook/wsug_graphics/ws-tel-rtpstream-analysis_1.png b/docbook/wsug_src/images/ws-tel-rtpstream-analysis_1.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtpstream-analysis_1.png rename to docbook/wsug_src/images/ws-tel-rtpstream-analysis_1.png diff --git a/docbook/wsug_graphics/ws-tel-rtpstream-analysis_2.png b/docbook/wsug_src/images/ws-tel-rtpstream-analysis_2.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtpstream-analysis_2.png rename to docbook/wsug_src/images/ws-tel-rtpstream-analysis_2.png diff --git a/docbook/wsug_graphics/ws-tel-rtpstream-analysis_3.png b/docbook/wsug_src/images/ws-tel-rtpstream-analysis_3.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-rtpstream-analysis_3.png rename to docbook/wsug_src/images/ws-tel-rtpstream-analysis_3.png diff --git a/docbook/wsug_graphics/ws-tel-seq-dialog.png b/docbook/wsug_src/images/ws-tel-seq-dialog.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-seq-dialog.png rename to docbook/wsug_src/images/ws-tel-seq-dialog.png diff --git a/docbook/wsug_graphics/ws-tel-voip-calls.png b/docbook/wsug_src/images/ws-tel-voip-calls.png similarity index 100% rename from docbook/wsug_graphics/ws-tel-voip-calls.png rename to docbook/wsug_src/images/ws-tel-voip-calls.png diff --git a/docbook/wsug_graphics/ws-telephony-menu.png b/docbook/wsug_src/images/ws-telephony-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-telephony-menu.png rename to docbook/wsug_src/images/ws-telephony-menu.png diff --git a/docbook/wsug_graphics/ws-time-reference.png b/docbook/wsug_src/images/ws-time-reference.png similarity index 100% rename from docbook/wsug_graphics/ws-time-reference.png rename to docbook/wsug_src/images/ws-time-reference.png diff --git a/docbook/wsug_graphics/ws-tls-session-keys.png b/docbook/wsug_src/images/ws-tls-session-keys.png similarity index 100% rename from docbook/wsug_graphics/ws-tls-session-keys.png rename to docbook/wsug_src/images/ws-tls-session-keys.png diff --git a/docbook/wsug_graphics/ws-tools-menu.png b/docbook/wsug_src/images/ws-tools-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-tools-menu.png rename to docbook/wsug_src/images/ws-tools-menu.png diff --git a/docbook/wsug_graphics/ws-udp-multicast-stream.png b/docbook/wsug_src/images/ws-udp-multicast-stream.png similarity index 100% rename from docbook/wsug_graphics/ws-udp-multicast-stream.png rename to docbook/wsug_src/images/ws-udp-multicast-stream.png diff --git a/docbook/wsug_graphics/ws-user-guide-cover.png b/docbook/wsug_src/images/ws-user-guide-cover.png similarity index 100% rename from docbook/wsug_graphics/ws-user-guide-cover.png rename to docbook/wsug_src/images/ws-user-guide-cover.png diff --git a/docbook/wsug_graphics/ws-view-menu.png b/docbook/wsug_src/images/ws-view-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-view-menu.png rename to docbook/wsug_src/images/ws-view-menu.png diff --git a/docbook/wsug_graphics/ws-wireless-menu.png b/docbook/wsug_src/images/ws-wireless-menu.png similarity index 100% rename from docbook/wsug_graphics/ws-wireless-menu.png rename to docbook/wsug_src/images/ws-wireless-menu.png diff --git a/docbook/user-guide-docinfo.xml b/docbook/wsug_src/user-guide-docinfo.xml similarity index 100% rename from docbook/user-guide-docinfo.xml rename to docbook/wsug_src/user-guide-docinfo.xml diff --git a/docbook/wsug_src/user-guide.adoc b/docbook/wsug_src/user-guide.adoc new file mode 100644 index 0000000000..7c80cf7b1d --- /dev/null +++ b/docbook/wsug_src/user-guide.adoc @@ -0,0 +1,64 @@ +:doctype: book +include::../attributes.adoc[] + +// Electronic book attributes +:author: Richard Sharpe, Ed Warnicke, Ulf Lamping +:description: Wireshark User’s Guide +:keywords: Wireshark User Guide +ifdef::ebook-format-epub3[] +:front-cover-image: images/ws-user-guide-cover.png +:toc: +endif::[] + += Wireshark User’s Guide: Version {wireshark-version} + +:source-highlighter: coderay + +include::wsug_preface.adoc[] + +include::../common_src/typographic_conventions.adoc[] + +// Chapters + +include::wsug_introduction.adoc[] + +include::wsug_build_install.adoc[] + +include::wsug_use.adoc[] + +include::wsug_capture.adoc[] + +include::wsug_io.adoc[] + +include::wsug_work.adoc[] + +include::wsug_advanced.adoc[] + +include::wsug_statistics.adoc[] + +include::wsug_telephony.adoc[] + +include::wsug_wireless.adoc[] + +include::wsug_customize.adoc[] + +include::wsug_mate.adoc[] + +// Needs to be reworked +//include::wsug_troubleshoot.adoc[] + +// Appendices +include::wsug_messages.adoc[] + +include::wsug_files.adoc[] + +include::wsug_protocols.adoc[] + +// Needs to be reworked +//include::wsug_howitworks.adoc[] + +include::wsug_tools.adoc[] + +// License + +include::../common_src/gpl_appendix.adoc[] diff --git a/docbook/wsug_src/wsug_advanced.adoc b/docbook/wsug_src/wsug_advanced.adoc index 70de78adae..ef198ba297 100644 --- a/docbook/wsug_src/wsug_advanced.adoc +++ b/docbook/wsug_src/wsug_advanced.adoc @@ -40,7 +40,7 @@ the display filter if this behavior is not desired. [#ChAdvFollowStream] .The “Follow TCP Stream” dialog box -image::wsug_graphics/ws-follow-stream.png[{screenshot-attrs}] +image::images/ws-follow-stream.png[{screenshot-attrs}] The stream content is displayed in the same sequence as it appeared on the network. Non-printable characters are replaced by dots. @@ -179,7 +179,7 @@ You can search for text by entering it in the “Find” entry box and pressing btn:[Find Next]. .The “Follow HTTP/2 Stream” dialog box -image::wsug_graphics/ws-follow-http2-stream.png[{screenshot-attrs}] +image::images/ws-follow-http2-stream.png[{screenshot-attrs}] The HTTP/2 Stream dialog is similar to the "Follow TCP Stream" dialog, except for an additional "Substream" dialog field. HTTP/2 Streams are identified by @@ -191,7 +191,7 @@ The QUIC protocol is similar, the first number selects the QUIC connection numbe while the "Substream" field selects the QUIC Stream ID. .The “Follow SIP Call” dialog box -image::wsug_graphics/ws-follow-sip-stream.png[{screenshot-attrs}] +image::images/ws-follow-sip-stream.png[{screenshot-attrs}] The SIP call is shown with same dialog, just filter is based on sip.Call-ID field. Count of streams is fixed to 0 and the field is disabled. @@ -402,7 +402,7 @@ You can open the expert info dialog by selecting menu:Analyze[Expert Info] or by Right-clicking on an item will allow you to apply or prepare a filter based on the item, copy its summary text, and other tasks. .The “Expert Information” dialog box -image::wsug_graphics/ws-expert-information.png[{screenshot-attrs}] +image::images/ws-expert-information.png[{screenshot-attrs}] You can choose from the following actions: @@ -454,7 +454,7 @@ Closes the dialog ==== “Colorized” Protocol Details Tree .The “Colorized” protocol details tree -image::wsug_graphics/ws-expert-colored-tree.png[{screenshot-attrs}] +image::images/ws-expert-colored-tree.png[{screenshot-attrs}] The packet detail tree marks fields with expert information based on their severity level color, e.g., “Warning” severities have a yellow background. This color is propagated to the top-level protocol item in the tree in order to make it easy to find the field that created the expert information. @@ -467,7 +467,7 @@ To make it easier find that item in the packet tree, the IP protocol toplevel it ==== “Expert” Packet List Column (Optional) .The “Expert” packet list column -image::wsug_graphics/ws-expert-column.png[{screenshot-attrs}] +image::images/ws-expert-column.png[{screenshot-attrs}] An optional “Expert Info Severity” packet list column is available that displays the most significant severity of a packet or stays empty if everything @@ -489,7 +489,7 @@ For analysis of data or protocols layered on top of TCP (such as HTTP), see <>. .“TCP Analysis” packet detail items -image::wsug_graphics/ws-tcp-analysis.png[{screenshot-attrs}] +image::images/ws-tcp-analysis.png[{screenshot-attrs}] TCP Analysis flags are added to the TCP protocol tree under “SEQ/ACK analysis”. Each flag is described below. Terms such as “next expected @@ -990,7 +990,7 @@ See <>). [#ChAdvWiresharkBytesPaneTabs] .The “Packet Bytes” pane with a reassembled tab -image::wsug_graphics/ws-bytes-pane-tabs.png[{screenshot-attrs}] +image::images/ws-bytes-pane-tabs.png[{screenshot-attrs}] Reassembly might take place at several protocol layers, so it’s possible that multiple tabs in the “Packet Bytes” pane appear. diff --git a/docbook/wsug_src/wsug_capture.adoc b/docbook/wsug_src/wsug_capture.adoc index bf22eec31a..857b4ea69c 100644 --- a/docbook/wsug_src/wsug_capture.adoc +++ b/docbook/wsug_src/wsug_capture.adoc @@ -83,16 +83,16 @@ It is possible to select more than one interface and capture from them simultane [#ChCapCaptureInterfacesMainWin32] .Capture interfaces on Microsoft Windows -image::wsug_graphics/ws-capture-interfaces-main-win32.png[{screenshot-attrs}] +image::images/ws-capture-interfaces-main-win32.png[{screenshot-attrs}] [#ChCapCaptureInterfacesMainMacos] .Capture interfaces on macOS -image::wsug_graphics/ws-capture-interfaces-main-macos.png[{screenshot-attrs}] +image::images/ws-capture-interfaces-main-macos.png[{screenshot-attrs}] Some interfaces allow or require configuration prior to capture. This will be indicated by a configuration icon -(image:wsug_graphics/toolbar/x-capture-options.png[height=16,width=16]) +(image:images/toolbar/x-capture-options.png[height=16,width=16]) to the left of the interface name. Clicking on the icon will show the configuration dialog for that interface. @@ -112,7 +112,7 @@ If you are unsure which options to choose in this dialog box, leaving the defaul [#ChCapCaptureOptionsDialog] .The “Capture Options” input tab -image::wsug_graphics/ws-capture-options.png[{screenshot-attrs}] +image::images/ws-capture-options.png[{screenshot-attrs}] The “Input” tab contains the “Interface” table, which shows the following columns: @@ -121,7 +121,7 @@ The interface name. + Some interfaces allow or require configuration prior to capture. This will be indicated by a configuration icon -(image:wsug_graphics/toolbar/x-capture-options.png[height=16,width=16]) +(image:images/toolbar/x-capture-options.png[height=16,width=16]) to the left of the interface name. Clicking on the icon will show the configuration dialog for that interface. @@ -181,7 +181,7 @@ link:{sysfs-main-url}[sysfsutils]. ==== .The “Capture Options” output tab -image::wsug_graphics/ws-capture-options-output.png[{screenshot-attrs}] +image::images/ws-capture-options-output.png[{screenshot-attrs}] The “Output” tab shows the following information: @@ -215,7 +215,7 @@ Form a ring buffer of the capture files with the given number of files. More details about capture files can be found in <>. .The “Capture Options” options tab -image::wsug_graphics/ws-capture-options-options.png[{screenshot-attrs}] +image::images/ws-capture-options-options.png[{screenshot-attrs}] The “Options” tab shows the following information: @@ -264,7 +264,7 @@ You can double click on an interface row in the “Input“ tab or click btn:[St [#ChCapManageInterfacesDialog] .The “Manage Interfaces” dialog box -image::wsug_graphics/ws-manage-interfaces.png[{screenshot-attrs}] +image::images/ws-manage-interfaces.png[{screenshot-attrs}] The “Manage Interfaces” dialog box initially shows the “Local Interfaces” tab, which lets you manage the following: @@ -283,7 +283,7 @@ Can be used to add a descriptive comment for the interface. // [[ChCapManageInterfacesPipesDialog]] // .The “Pipes” tab -// image::wsug_graphics/ws-capture-options-manage-interfaces-pipes.png[{screenshot-attrs}] +// image::images/ws-capture-options-manage-interfaces-pipes.png[{screenshot-attrs}] The “Pipes” tab lets you capture from a named pipe. To successfully add a pipe, its associated named pipe must have already been created. @@ -300,13 +300,13 @@ To remove a pipe from the list of interfaces, select it and press btn:[-]. // to add or remove interfaces. // .The “Add New Interfaces” dialog box -// image::wsug_graphics/ws-capture-options-manage-interfaces.png[{screenshot-attrs}] +// image::images/ws-capture-options-manage-interfaces.png[{screenshot-attrs}] // ==== Add or hide local interfaces // [[ChCapManageInterfacesLocalDialog]] // .The “Add New Interfaces - Local Interfaces” dialog box -// image::wsug_graphics/ws-capture-options-manage-interfaces-local.png[{screenshot-attrs}] +// image::images/ws-capture-options-manage-interfaces-local.png[{screenshot-attrs}] // The tab “Local Interfaces” contains a list of available local interfaces, // including the hidden ones, which are not shown in the other lists. @@ -325,7 +325,7 @@ To remove a pipe from the list of interfaces, select it and press btn:[-]. // [[ChCapManageInterfacesRemoteDialog]] // .The “Add New Interfaces - Remote Interfaces” dialog box -// image::wsug_graphics/ws-capture-options-manage-interfaces-remote.png[{screenshot-attrs}] +// image::images/ws-capture-options-manage-interfaces-remote.png[{screenshot-attrs}] On Microsoft Windows, the “Remote Interfaces” tab lets you capture from an interface on a different machine. The Remote Packet Capture Protocol service must first be running on the target platform before Wireshark can connect to it. @@ -366,7 +366,7 @@ To remove a host including all its interfaces from the list, select it and click // [[ChCapInterfaceRemoteDialog]] // .The “Remote Capture Interfaces” dialog box -// image::wsug_graphics/ws-capture-options-manage-interfaces-remote-plus.png[{screenshot-attrs}] +// image::images/ws-capture-options-manage-interfaces-remote-plus.png[{screenshot-attrs}] // ==== Remote Capture Settings @@ -378,7 +378,7 @@ To remove a host including all its interfaces from the list, select it and click // [[ChCapInterfaceRemoteSettingsDialog]] // .The “Remote Capture Settings” dialog box -// image::wsug_graphics/ws-capture-options-remote-settings.png[{screenshot-attrs}] +// image::images/ws-capture-options-remote-settings.png[{screenshot-attrs}] // You can set the following parameters in this dialog: @@ -427,7 +427,7 @@ To remove a host including all its interfaces from the list, select it and click // [[ChCapInterfaceDetailsDialog]] // .The “Interface Details” dialog box -// image::wsug_graphics/ws-capture-interface-details.png[{screenshot-attrs}] +// image::images/ws-capture-interface-details.png[{screenshot-attrs}] [#ChCapCompiledFilterOutputSection] @@ -438,7 +438,7 @@ This figure shows the results of compiling the BPF filter for the selected inter [#ChCapCompiledFilterOutputDialog] .The “Compiled Filter Output” dialog box -image::wsug_graphics/ws-capture-options-compile-selected-bpfs.png[{medium-screenshot-attrs}] +image::images/ws-capture-options-compile-selected-bpfs.png[{medium-screenshot-attrs}] In the list on the left the interface names are listed. The results of compiling a filter for the selected interface are shown on the right. @@ -459,7 +459,7 @@ have been captured. These options are controlled in the [#ChCapCaptureOptionsOutputDialog] .Capture output options -image::wsug_graphics/ws-capture-options-output.png[{screenshot-attrs}] +image::images/ws-capture-options-output.png[{screenshot-attrs}] [TIP] ==== @@ -689,7 +689,7 @@ You might see the following dialog box while a capture is running: [#ChCapCaptureInfoDialog] .The “Capture Information” dialog box -image::wsug_graphics/ws-capture-info.png[{small-screenshot-attrs}] +image::images/ws-capture-info.png[{small-screenshot-attrs}] This dialog box shows a list of protocols and their activity over time. It can be enabled via the “capture.show_info” setting in the “Advanced” diff --git a/docbook/wsug_src/wsug_customize.adoc b/docbook/wsug_src/wsug_customize.adoc index 49fbc74cda..b881f44c20 100644 --- a/docbook/wsug_src/wsug_customize.adoc +++ b/docbook/wsug_src/wsug_customize.adoc @@ -471,7 +471,7 @@ will display the “Coloring Rules” dialog box as shown in [#ChCustColoringRulesDialog] .The “Coloring Rules” dialog box -image::wsug_graphics/ws-coloring-rules-dialog.png[{screenshot-attrs}] +image::images/ws-coloring-rules-dialog.png[{screenshot-attrs}] If this is the first time using the Coloring Rules dialog and you’re using the default configuration profile you should see the default rules, shown above. @@ -497,7 +497,7 @@ background colors respectively. [#ChCustChooseColorDialog] .A color chooser -image::wsug_graphics/ws-choose-color-rule.png[{small-screenshot-attrs}] +image::images/ws-choose-color-rule.png[{small-screenshot-attrs}] The color chooser appearance depends on your operating system. The macOS color picker is shown. Select the color you desire for the selected packets and click @@ -509,7 +509,7 @@ was applied, along with the matching filter. [#ChCustColorFilterMany] .Using color filters with Wireshark -image::wsug_graphics/ws-coloring-fields.png[{screenshot-attrs}] +image::images/ws-coloring-fields.png[{screenshot-attrs}] [#ChCustProtocolDissectionSection] @@ -552,7 +552,7 @@ Wireshark will pop up the “Enabled Protocols” dialog box as shown in [#ChAdvEnabledProtocolsFig] .The “Enabled Protocols” dialog box -image::wsug_graphics/ws-enabled-protocols.png[{screenshot-attrs}] +image::images/ws-enabled-protocols.png[{screenshot-attrs}] To disable or enable a protocol, simply click the checkbox using the mouse. Note that typing a few letters of the protocol name in the search box will limit @@ -583,7 +583,7 @@ will pop up the “Decode As” dialog box as shown in <>. [#ChAdvDecodeAsFig] .The “Decode As” dialog box -image::wsug_graphics/ws-decode-as.png[{screenshot-attrs}] +image::images/ws-decode-as.png[{screenshot-attrs}] In this dialog you are able to edit entries by means of the edit buttons on the left. @@ -628,7 +628,7 @@ side is a tree where you can select the page to be shown. [#ChCustGUIPrefPage] .The preferences dialog box -image::wsug_graphics/ws-gui-preferences.png[{screenshot-attrs}] +image::images/ws-gui-preferences.png[{screenshot-attrs}] Wireshark supports quite a few protocols, which is reflected in the long list of entries in the “Protocols” pane. You can jump to the preferences for a specific protocol by expanding “Protocols” and typing the first few letters of the protocol name. @@ -636,7 +636,7 @@ You can jump to the preferences for a specific protocol by expanding “Protocol The “Advanced” pane will let you view and edit all of Wireshark’s preferences, similar to link:about:config[] and link:chrome:flags[] in the Firefox and Chrome web browsers. .Advanced preferences -image::wsug_graphics/ws-gui-preferences-advanced.png[{screenshot-attrs}] +image::images/ws-gui-preferences-advanced.png[{screenshot-attrs}] You can search for a preference by typing text into the “Search” entry. You can also pass preference names to Wireshark and TShark on the command line. @@ -724,7 +724,7 @@ are common to all profiles. [#ChCustGUIConfigProfilesPage] .The configuration profiles dialog box -image::wsug_graphics/ws-gui-config-profiles.png[{medium-screenshot-attrs}] +image::images/ws-gui-config-profiles.png[{medium-screenshot-attrs}] Search for profile ...:: The list of profiles can be filtered by entering part of the profile's name diff --git a/docbook/wsug_src/wsug_introduction.adoc b/docbook/wsug_src/wsug_introduction.adoc index c81aa5ae77..b98a8b4021 100644 --- a/docbook/wsug_src/wsug_introduction.adoc +++ b/docbook/wsug_src/wsug_introduction.adoc @@ -77,7 +77,7 @@ to examine them. [#ChIntroFig1] .Wireshark captures packets and lets you examine their contents. -image::wsug_graphics/ws-main.png[{screenshot-attrs}] +image::images/ws-main.png[{screenshot-attrs}] ==== Live capture from many different network media diff --git a/docbook/wsug_src/wsug_io.adoc b/docbook/wsug_src/wsug_io.adoc index 3b141cb79d..ed3a488aca 100644 --- a/docbook/wsug_src/wsug_io.adoc +++ b/docbook/wsug_src/wsug_io.adoc @@ -78,14 +78,14 @@ Wireshark adds the following controls: [#ChIOOpenFileDialogWin32] .“Open” on Microsoft Windows -image::wsug_graphics/ws-open-win32.png[{medium-screenshot-attrs}] +image::images/ws-open-win32.png[{medium-screenshot-attrs}] This is the common Windows file open dialog along with some Wireshark extensions. [#ChIOOpenFileDialog] .“Open” - Linux and UNIX -image::wsug_graphics/ws-open-qt5.png[{medium-screenshot-attrs}] +image::images/ws-open-qt5.png[{medium-screenshot-attrs}] This is the common Qt file open dialog along with some Wireshark extensions. @@ -237,14 +237,14 @@ Examples are shown below. [#ChIOSaveAsFileWin32] .“Save” on Microsoft Windows -image::wsug_graphics/ws-save-as-win32.png[{medium-screenshot-attrs}] +image::images/ws-save-as-win32.png[{medium-screenshot-attrs}] This is the common Windows file save dialog with some additional Wireshark extensions. [#ChIOSaveAsFile2] .“Save” on Linux and UNIX -image::wsug_graphics/ws-save-as-qt5.png[{medium-screenshot-attrs}] +image::images/ws-save-as-qt5.png[{medium-screenshot-attrs}] This is the common Qt file save dialog with additional Wireshark extensions. @@ -407,14 +407,14 @@ Append the packets from the selected file after the currently loaded packets. [#ChIOMergeFileWin32] .“Merge” on Microsoft Windows -image::wsug_graphics/ws-merge-win32.png[{medium-screenshot-attrs}] +image::images/ws-merge-win32.png[{medium-screenshot-attrs}] This is the common Windows file open dialog with additional Wireshark extensions. [#ChIOMergeFile2] .“Merge” on Linux and UNIX -image::wsug_graphics/ws-merge-qt5.png[{medium-screenshot-attrs}] +image::images/ws-merge-qt5.png[{medium-screenshot-attrs}] This is the Qt file open dialog with additional Wireshark extensions. @@ -577,7 +577,7 @@ data, to be imported and set import parameters. [#ChIOFileImportDialog] .The “Import from Hex Dump” dialog in Hex Dump mode -image::wsug_graphics/ws-file-import.png[{medium-screenshot-attrs}] +image::images/ws-file-import.png[{medium-screenshot-attrs}] Specific controls of this import dialog are split in three sections: @@ -616,7 +616,7 @@ _I_ or _i_ for input and _O_ or _o_ for output. ===== The Regular Expression tab .The "Regular Expression" tab inside the "Import from Hex Dump” dialog. -image::wsug_graphics/ws-file-import-regex.png[{medium-screenshot-attrs}] +image::images/ws-file-import-regex.png[{medium-screenshot-attrs}] Packet format regular expression:: This is the regex used for searching packets and metadata inside the input file. @@ -735,7 +735,7 @@ with file sets in a convenient way: ==== The “List Files” Dialog Box .The “List Files” dialog box -image::wsug_graphics/ws-file-set-dialog.png[{medium-screenshot-attrs}] +image::images/ws-file-set-dialog.png[{medium-screenshot-attrs}] Each line contains information about a file of the file set: @@ -776,7 +776,7 @@ There are many other ways to export or extract data from capture files, includin ==== The “Export Specified Packets” Dialog Box .The “Export Specified Packets” dialog box -image::wsug_graphics/ws-export-specified-packets.png[{medium-screenshot-attrs}] +image::images/ws-export-specified-packets.png[{medium-screenshot-attrs}] This is similar to the “<>” dialog box, but it lets you save specific packets. This can be useful for trimming irrelevant or unwanted packets from a capture file. @@ -789,7 +789,7 @@ See <> for details on the range controls. This lets you save the packet list, packet details, and packet bytes as plain text, CSV, JSON, and other formats. .The “Export Packet Dissections” dialog box -image::wsug_graphics/ws-export-packet-dissections.png[{medium-screenshot-attrs}] +image::images/ws-export-packet-dissections.png[{medium-screenshot-attrs}] The format can be selected from the “Export As” drop-down and further customized using the “<>” and “<>” controls. Some controls are unavailable for some formats, notably CSV and JSON. @@ -978,7 +978,7 @@ If you would like to be able to <> any previously expo Export the bytes selected in the “Packet Bytes” pane into a raw binary file. .The “Export Selected Packet Bytes” dialog box -image::wsug_graphics/ws-export-selected.png[{medium-screenshot-attrs}] +image::images/ws-export-selected.png[{medium-screenshot-attrs}] File name:: The file name to export the packet data to. @@ -997,7 +997,7 @@ The “Export PDUs to File...” dialog box allows you to filter the captured Pr [#ExportPDUsToFile] + .Export PDUs to File window -image::wsug_graphics/ws-export-pdus-to-file.png[{screenshot-attrs}] +image::images/ws-export-pdus-to-file.png[{screenshot-attrs}] . To select the data according to your needs, optionally type a filter value into the `Display Filter` field. For more information about filter syntax, see the link:https://www.wireshark.org/docs/man-pages/wireshark-filter.html[Wireshark Filters] man page. @@ -1066,7 +1066,7 @@ To export captured TLS session keys, follow the steps below: [#TlsSessionKeys] + .Export TLS Session Keys window -image::wsug_graphics/ws-tls-session-keys.png[{screenshot-attrs}] +image::images/ws-tls-session-keys.png[{screenshot-attrs}] . Type the desired file name in the `Save As` field. @@ -1087,7 +1087,7 @@ updated every few seconds with any new objects seen. The saved objects can then be opened or examined independently of Wireshark. .The “Export Objects” dialog box -image::wsug_graphics/ws-export-objects.png[{screenshot-attrs}] +image::images/ws-export-objects.png[{screenshot-attrs}] Columns: @@ -1147,7 +1147,7 @@ Printed output can contain lots of text, particularly if you print packet detail [#ChIOPrintDialogBox] .The “Print” dialog box -image::wsug_graphics/ws-print.png[{medium-screenshot-attrs}] +image::images/ws-print.png[{medium-screenshot-attrs}] The “Print” dialog box shows a preview area which shows the result of changing the packet format settings. You can zoom in and out using the kbd:[{plus}] and kbd:[-] keys and reset the zoom level using the kbd:[0] key. @@ -1187,7 +1187,7 @@ You can use it to specify which packets will be exported or printed. [#ChIOPacketRangeFrame] .The “Packet Range” frame -image::wsug_graphics/ws-packet-range.png[{medium-screenshot-attrs}] +image::images/ws-packet-range.png[{medium-screenshot-attrs}] By default, the btn:[Displayed] button is set, which only exports or prints the packets that match the current display filter. Selecting btn:[Captured] will export or print all packets. @@ -1222,7 +1222,7 @@ You can use it to specify which parts of dissection are exported or printed. [#ChIOPacketFormatFrame] .The “Packet Format” frame -image::wsug_graphics/ws-packet-format.png[{small-screenshot-attrs}] +image::images/ws-packet-format.png[{small-screenshot-attrs}] Each of the settings below correspond to the packet list, packet detail, and packet bytes in the main window. diff --git a/docbook/wsug_src/wsug_mate.adoc b/docbook/wsug_src/wsug_mate.adoc index 0d68afc912..6de78c70dc 100644 --- a/docbook/wsug_src/wsug_mate.adoc +++ b/docbook/wsug_src/wsug_mate.adoc @@ -60,7 +60,7 @@ or, at prompt: `path_to/wireshark -o "mate.config: tcp.mate" -r http.cap`. If anything went well, your packet details might look something like this: -image::wsug_graphics/ws-mate-tcp-output.png[] +image::images/ws-mate-tcp-output.png[] [#ChMateManual] @@ -246,7 +246,7 @@ _Start_ criteria given in the Gop declaration. Gop with other Gops into a Gog (Group of Groups) using the criteria given by the _Member_ criteria of a Gog declaration. -image::wsug_graphics/ws-mate-analysis.png[] +image::images/ws-mate-analysis.png[] The extraction and matching logic comes from MATE's configuration; MATE's configuration file is declared by the _mate.config_ preference. By default it is @@ -289,14 +289,14 @@ frame. MATE will fetch from the field's tree those fields that are defined in the <> AVPL whose initial offset in the frame is within the boundaries of the current Proto and those of the various assigned Transports. -image::wsug_graphics/ws-mate-dns_pane.png[] +image::images/ws-mate-dns_pane.png[] Once MATE has found a _Proto_ field for which to create a Pdu from the frame it will move backwards in the frame looking for the respective _Transport_ fields. After that it will create AVPs named as each of those given in the rest of the AVPL for every instance of the fields declared as its values. -image::wsug_graphics/ws-mate-dns_pdu.png[] +image::images/ws-mate-dns_pdu.png[] Sometimes we need information from more than one _Transport_ protocol. In that case MATE will check the frame looking backwards to look for the various @@ -316,7 +316,7 @@ Pdu isup_pdu Proto isup Transport mtp3/ip { }; ---- -image::wsug_graphics/ws-mate-isup_over_mtp3_over_ip.png[] +image::images/ws-mate-isup_over_mtp3_over_ip.png[] This allows to assign the right _Transport_ to the Pdu avoiding duplicate transport protocol entries (in case of tunneled ip over ip for example). @@ -329,7 +329,7 @@ Pdu ftp_pdu Proto ftp Transport tcp/ip { }; ---- -image::wsug_graphics/ws-mate-ftp_over_gre.png[] +image::images/ws-mate-ftp_over_gre.png[] Other than the mandatory _Transport_ there is also an optional _Payload_ statement, which works pretty much as _Transport_ but refers to elements after @@ -355,7 +355,7 @@ Pdu mmse_over_http_pdu Proto http Transport tcp/ip { }; ---- -image::wsug_graphics/ws-mate-mmse_over_http.png[] +image::images/ws-mate-mmse_over_http.png[] ====== Conditions on which to create PDUs @@ -426,7 +426,7 @@ Once MATE has created the Pdus it passes to the Pdu analysis phase. During the PDU analysis phase MATE will try to group Pdus of the same type into 'Groups of Pdus' (aka *Gop*s) and copy some AVPs from the Pdu's AVPL to the Gop's AVPL. -image::wsug_graphics/ws-mate-pdu_analysis.png[] +image::images/ws-mate-pdu_analysis.png[] ====== What can belong to a Gop @@ -603,7 +603,7 @@ unassigned Gop is checked to verify whether it belongs to an already existing Gog or may create a new one. The second phase eventually checks the Gog and registers its keys in the Gogs index. -image::wsug_graphics/ws-mate-gop_analysis.png[] +image::images/ws-mate-gop_analysis.png[] There are several reasons for the author to believe that this feature needs to be reimplemented, so probably there will be deep changes in the way this is done @@ -786,7 +786,7 @@ respective AVPLs when they are created and every time they change. ===== Operation -image::wsug_graphics/ws-mate-transform.png[] +image::images/ws-mate-transform.png[] * A list of previously declared Transforms may be given to every Item (Pdu, Gop, or Gog), using the Transform statement. diff --git a/docbook/wsug_src/wsug_statistics.adoc b/docbook/wsug_src/wsug_statistics.adoc index a567e74ba2..f068c9480b 100644 --- a/docbook/wsug_src/wsug_statistics.adoc +++ b/docbook/wsug_src/wsug_statistics.adoc @@ -54,7 +54,7 @@ Some of these statistics are described at General information about the current capture file. .The “Capture File Properties” dialog -image::wsug_graphics/ws-capture-file-properties.png[{screenshot-attrs}] +image::images/ws-capture-file-properties.png[{screenshot-attrs}] This dialog shows the following information: @@ -117,7 +117,7 @@ The `Ports` tab shows the list of service names, ports and types. Wireshark reads the entries for port mappings from the `hosts` service configuration files. See <> section for more information. .Resolved Addresses window -image::wsug_graphics/ws-resolved-addr.png[{screenshot-attrs}] +image::images/ws-resolved-addr.png[{screenshot-attrs}] [#ChStatHierarchy] @@ -126,7 +126,7 @@ image::wsug_graphics/ws-resolved-addr.png[{screenshot-attrs}] The protocol hierarchy of the captured packets. .The “Protocol Hierarchy” Window -image::wsug_graphics/ws-stats-hierarchy.png[{screenshot-attrs}] +image::images/ws-stats-hierarchy.png[{screenshot-attrs}] 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 @@ -204,7 +204,7 @@ per second in each direction. A timeline graph is also drawn across the “Rel Start” / “Abs Start” and “Duration” columns. Additionally .The “Conversations” window -image::wsug_graphics/ws-stats-conversations.png[{screenshot-attrs}] +image::images/ws-stats-conversations.png[{screenshot-attrs}] Each row in the list shows the statistical values for exactly one conversation. @@ -313,7 +313,7 @@ will be received by some or all of the listed unicast endpoints. This window shows statistics about the endpoints captured. .The “Endpoints” window -image::wsug_graphics/ws-stats-endpoints.png[{screenshot-attrs}] +image::images/ws-stats-endpoints.png[{screenshot-attrs}] 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 @@ -362,7 +362,7 @@ it before (or while) you are doing a live capture. Shows the distribution of packet lengths and related information. .The “Packet Lengths” window -image::wsug_graphics/ws-stats-packet-lengths.png[{medium-screenshot-attrs}] +image::images/ws-stats-packet-lengths.png[{medium-screenshot-attrs}] Information is broken down by packet length ranges as shown above. @@ -408,7 +408,7 @@ btn:[Save as...] lets you save the data as text, CSV, YAML, or XML. Lets you plot packet and protocol data in a variety of ways. .The “I/O Graphs” window -image::wsug_graphics/ws-stats-iographs.png[{screenshot-attrs}] +image::images/ws-stats-iographs.png[{screenshot-attrs}] As shown above, this window contains a chart drawing area along with a customizable list of graphs. Graphs are saved in your current <>. @@ -566,7 +566,7 @@ Right-clicking on a row will let you apply or prepare filters for, search for, o You can also copy all of the response time information or save it in a variety of formats. .The “SMB2 Service Response Time Statistics” window -image::wsug_graphics/ws-stats-srt-smb2.png[{screenshot-attrs}] +image::images/ws-stats-srt-smb2.png[{screenshot-attrs}] You can optionally apply a display filter in order to limit the statistics to a specific set of packets. @@ -602,7 +602,7 @@ See link:https://www.uni-due.de/~be0001/netperfmeter/[NetPerfMeter – A TCP/MPT link:https://duepublico2.uni-due.de/servlets/MCRFileNodeServlet/duepublico_derivate_00029737/Dre2012_final.pdf[Evaluation and Optimisation of Multi-Path Transport using the Stream Control Transmission Protocol] for more details about NetPerfMeter and the NetPerfMeter Protocol. .NetPerfMeter Statistics window -image::wsug_graphics/ws-netperfmeter-statistics.png[{screenshot-attrs}] +image::images/ws-netperfmeter-statistics.png[{screenshot-attrs}] [#ChStatONCRPC] @@ -674,7 +674,7 @@ Collectd is a system statistics collection daemon. It collects various statistic The Domain Name System (DNS) associates different information, such as IP addresses, with domain names. DNS returns different codes, request-response and counters for various aggregations. The DNS statistics window enlists a total count of DNS messages, which are divided into groups by request types (opcodes), response code (rcode), query type, and others. .DNS statistics window -image::wsug_graphics/ws-dns.png[{screenshot-attrs}] +image::images/ws-dns.png[{screenshot-attrs}] You might find these statistics useful for quickly examining the health of a DNS service or other investigations. See the few possible scenarios below: @@ -691,7 +691,7 @@ You can filter, copy or save the data into a file. The Flow Graph window shows connections between hosts. It displays the packet time, direction, ports and comments for each captured connection. You can filter all connections by ICMP Flows, ICMPv6 Flows, UIM Flows and TCP Flows. Flow Graph window is used for showing multiple different topics. Based on it, it offers different controls. .Flow Graph window -image::wsug_graphics/ws-flow-graph.png[{screenshot-attrs}] +image::images/ws-flow-graph.png[{screenshot-attrs}] Each vertical line represents the specific host, which you can see in the top of the window. @@ -712,7 +712,7 @@ Available controls: * btn:[Export] allows export diagram as image in multiple different formats (PDF, PNG, BMP, JPEG and ASCII (diagram is stored with ASCII characters only)). .Flow Graph window showing VoIP call sequences -image::wsug_graphics/ws-tel-seq-dialog.png[{screenshot-attrs}] +image::images/ws-tel-seq-dialog.png[{screenshot-attrs}] Additional shortcuts available for VoIP calls: @@ -771,7 +771,7 @@ capture's HTTP requests as a tree. This enables analysts to see how one HTTP request leads to the next. .The “HTTP Request Sequences” window -image::wsug_graphics/ws-stats-http-requestsequences.png[{screenshot-attrs}] +image::images/ws-stats-http-requestsequences.png[{screenshot-attrs}] [#ChStatHTTP2] @@ -824,7 +824,7 @@ With these statistics you can: * Detect the packet loss inside the MPEG2 video stream. .UDP Multicast Streams window -image::wsug_graphics/ws-udp-multicast-stream.png[{screenshot-attrs}] +image::images/ws-udp-multicast-stream.png[{screenshot-attrs}] [#ChStatRSerPool] @@ -854,25 +854,25 @@ With these statistics you can: See link:https://www.uni-due.de/~be0001/rserpool/[Thomas Dreibholz's Reliable Server Pooling (RSerPool) Page] and Chapter{nbsp}3 of link:https://duepublico.uni-duisburg-essen.de/servlets/DerivateServlet/Derivate-16326/Dre2006_final.pdf[Reliable Server Pooling – Evaluation, Optimization and Extension of a Novel IETF Architecture] for more details about RSerPool and its protocols. .ASAP Statistics window -image::wsug_graphics/ws-asap-statistics.png[{screenshot-attrs}] +image::images/ws-asap-statistics.png[{screenshot-attrs}] .ENRP Statistics window -image::wsug_graphics/ws-enrp-statistics.png[{screenshot-attrs}] +image::images/ws-enrp-statistics.png[{screenshot-attrs}] .Component Status Protocol Statistics window -image::wsug_graphics/ws-csp-statistics.png[{screenshot-attrs}] +image::images/ws-csp-statistics.png[{screenshot-attrs}] .CalcApp Protocol Statistics window -image::wsug_graphics/ws-calcappprotocol-statistics.png[{screenshot-attrs}] +image::images/ws-calcappprotocol-statistics.png[{screenshot-attrs}] .Fractal Generator Protocol Statistics window -image::wsug_graphics/ws-fgp-statistics.png[{screenshot-attrs}] +image::images/ws-fgp-statistics.png[{screenshot-attrs}] .Ping Pong Protocol Statistics window -image::wsug_graphics/ws-pingpongprotocol-statistics.png[{screenshot-attrs}] +image::images/ws-pingpongprotocol-statistics.png[{screenshot-attrs}] .Scripting Service Protocol Statistics window -image::wsug_graphics/ws-ssp-statistics.png[{screenshot-attrs}] +image::images/ws-ssp-statistics.png[{screenshot-attrs}] [#ChStatF5] diff --git a/docbook/wsug_src/wsug_telephony.adoc b/docbook/wsug_src/wsug_telephony.adoc index be0f034983..1bb36a258f 100644 --- a/docbook/wsug_src/wsug_telephony.adoc +++ b/docbook/wsug_src/wsug_telephony.adoc @@ -36,7 +36,7 @@ RTP Player is able to play any codec supported by an installed plugin. The codec * In the menu:Filter by type[] menu on the top-right, select codec .List of supported codecs -image::wsug_graphics/ws-about-codecs.png[{screenshot-attrs}] +image::images/ws-about-codecs.png[{screenshot-attrs}] ==== Work with RTP streams - Playlist @@ -51,7 +51,7 @@ When RTP Player window is opened, playlist can be modified from other tools (Wir * button menu:Play Streams[Remove from playlist] removes streams selected in the tool from playlist, if they are in the playlist. .btn:[Play Streams] button with opened action menu -image::wsug_graphics/ws-tel-rtp-player_button.png[] +image::images/ws-tel-rtp-player_button.png[] btn:[Play Streams] button can be clicked directly and opens RTP Player window directly with btn:[Set playlist] action. All actions can be selected with the small down arrow next to the button. @@ -68,7 +68,7 @@ Tools below can be used to maintain content of playlist, they contain btn:[Play * Open btn:[Flow Sequence] window in menu:Telephony[VoIP Calls] or menu:Telephony[SIP Flows] window, it will show flow sequence of calls. Select any RTP stream and then press btn:[Play Streams]. It will add selected RTP stream to playlist. .Tools for modifying playlist in RTP Player window -image::wsug_graphics/ws-tel-playlist.png[] +image::images/ws-tel-playlist.png[] [NOTE] ==== @@ -159,7 +159,7 @@ See https://gitlab.com/wireshark/wireshark/-/wikis/VOIPProtocolFamily[VOIPProtoc VoIP Calls window can be opened as window showing all protocol types (menu:Telephony[VoIP Calls] window) or limited to SIP messages only (menu:Telephony[SIP Flows] window). .VoIP Calls window -image::wsug_graphics/ws-tel-voip-calls.png[{screenshot-attrs}] +image::images/ws-tel-voip-calls.png[{screenshot-attrs}] User can use shortcuts: @@ -226,7 +226,7 @@ Statistics of the captured LTE MAC traffic. This window will summarize the LTE MAC traffic found in the capture. .The “LTE MAC Traffic Statistics” window -image::wsug_graphics/ws-stats-lte-mac-traffic.png[{screenshot-attrs}] +image::images/ws-stats-lte-mac-traffic.png[{screenshot-attrs}] The top pane shows statistics for common channels. Each row in the middle pane shows statistical highlights for exactly one UE/C-RNTI. In the lower pane, you @@ -242,7 +242,7 @@ The LTE RLC Graph menu launches a graph which shows LTE Radio Link Control proto NOTE: That graph shows data of a single bearer and direction. The user can also launch it from the `RLC Statistics` window. .The RLC Graph window -image::wsug_graphics/ws-rlc-graph.png[{screenshot-attrs}] +image::images/ws-rlc-graph.png[{screenshot-attrs}] [.small]#_The image of the RLC Graph is borrowed from link:https://gitlab.com/wireshark/wireshark/-/wikis/RLC-LTE[Wireshark wiki]._# @@ -254,7 +254,7 @@ Statistics of the captured LTE RLC traffic. This window will summarize the LTE RLC traffic found in the capture. .The “LTE RLC Traffic Statistics” window -image::wsug_graphics/ws-stats-lte-rlc-traffic.png[{screenshot-attrs}] +image::images/ws-stats-lte-rlc-traffic.png[{screenshot-attrs}] At the top, the check-box allows this window to include RLC PDUs found within MAC PDUs or not. This will affect both the PDUs counted as well as the display @@ -291,7 +291,7 @@ OSmux is a multiplex protocol designed to reduce bandwidth usage of satellite-ba The RTP streams window shows all RTP streams in capture file. Streams can be selected there and on selected streams other tools can be initiated. .The “RTP Streams” window -image::wsug_graphics/ws-tel-rtp-streams.png[{screenshot-attrs}] +image::images/ws-tel-rtp-streams.png[{screenshot-attrs}] User can use shortcuts: @@ -334,10 +334,10 @@ Menu menu:Telephony[RTP > RTP Stream Analysis] is enabled only when selected pac Every stream is shown on own tab. Tabs are numbered as streams are added and its tooltip shows identification of the stream. When tab is closed, number is not reused. Color of tab matches color of graphs on graph tab. .The “RTP Stream Analysis” window -image::wsug_graphics/ws-tel-rtpstream-analysis_1.png[{screenshot-attrs}] +image::images/ws-tel-rtpstream-analysis_1.png[{screenshot-attrs}] .Error indicated in “RTP Stream Analysis” window -image::wsug_graphics/ws-tel-rtpstream-analysis_3.png[{screenshot-attrs}] +image::images/ws-tel-rtpstream-analysis_3.png[{screenshot-attrs}] Per packet statistic shows: @@ -382,7 +382,7 @@ Available controls are: * btn:[Export] allows export current stream or all streams as CSV or export graph as image in multiple different formats (PDF, PNG, BMP and JPEG). .Graph in “RTP Stream Analysis” window -image::wsug_graphics/ws-tel-rtpstream-analysis_2.png[{screenshot-attrs}] +image::images/ws-tel-rtpstream-analysis_2.png[{screenshot-attrs}] Graph view shows graph of: @@ -406,7 +406,7 @@ The RTP Player function is tool for playing VoIP calls. It shows RTP streams and Menu menu:Telephony[RTP > RTP Player] is enabled only when selected packed is RTP packet. When window is opened, selected RTP stream is added to playlist. If btn:[Ctrl] is pressed during menu opening, reverse RTP stream (if exists) is added to the playlist too. .RTP Player window -image::wsug_graphics/ws-tel-rtp-player_1.png[{screenshot-attrs}] +image::images/ws-tel-rtp-player_1.png[{screenshot-attrs}] RTP Player Window consists of three parts: @@ -419,7 +419,7 @@ Waveform view shows visual presentation of RTP stream. Color of waveform and pla Waveform shows error marks for Out of Sequence, Jitter Drops, Wrong Timestamps and Inserted Silence marks if it happens in a stream. .Waveform with error marks -image::wsug_graphics/ws-tel-rtp-player_3.png[{screenshot-attrs}] +image::images/ws-tel-rtp-player_3.png[{screenshot-attrs}] Playlist shows information about every stream: @@ -466,7 +466,7 @@ RTP Player detects silence just by missing voice samples (Comfort Noise, interru ==== .RTP stream state indication -image::wsug_graphics/ws-tel-rtp-player_2.png[{screenshot-attrs}] +image::images/ws-tel-rtp-player_2.png[{screenshot-attrs}] Waveform view and playlist shows state of a RTP stream: @@ -551,12 +551,12 @@ Stream Control Transmission Protocol (SCTP) is a computer network protocol which The SCTP Analyze Association window shows the statistics of the captured packets between two Endpoints. You can check the different chunk types by pressing btn:[Chunk Statistics] button in the `Statistics` tab. In the `Endpoint` tabs you can see various statistics, such as IP addresses, ports and others. You can also check different graphs here. .SCTP Analyze Association window -image::wsug_graphics/ws-sctp-1-association.png[{screenshot-attrs}] +image::images/ws-sctp-1-association.png[{screenshot-attrs}] The SCTP Associations window shows the table with the data for captured packets, such as port and counter. You can also call for the SCTP Analyze Association window by pressing the btn:[Analyze] button. .SCTP Associations window -image::wsug_graphics/ws-sctp.png[{screenshot-attrs}] +image::images/ws-sctp.png[{screenshot-attrs}] [#ChTelSMPPOperations] diff --git a/docbook/wsug_src/wsug_use.adoc b/docbook/wsug_src/wsug_use.adoc index 9592e07f6f..078fac94a7 100644 --- a/docbook/wsug_src/wsug_use.adoc +++ b/docbook/wsug_src/wsug_use.adoc @@ -47,7 +47,7 @@ will be described later). [#ChUseFig01] .The Main window -image::wsug_graphics/ws-main.png[{screenshot-attrs}] +image::images/ws-main.png[{screenshot-attrs}] Wireshark’s main window consists of parts that are commonly known from many other GUI programs. @@ -129,7 +129,7 @@ or loaded any packets. [#ChUseWiresharkMenu] .The Menu -image::wsug_graphics/ws-menu.png[{screenshot-attrs}] +image::images/ws-menu.png[{screenshot-attrs}] The main menu contains the following items: @@ -200,7 +200,7 @@ The Wireshark file menu contains the fields shown in <>. [#ChUseWiresharkFileMenu] .The “File” Menu -image::wsug_graphics/ws-file-menu.png[{screenshot-attrs}] +image::images/ws-file-menu.png[{screenshot-attrs}] [#ChUseTabFile] .File menu items @@ -296,7 +296,7 @@ The Wireshark Edit menu contains the fields shown in <>. [#ChUseWiresharkEditMenu] .The “Edit” Menu -image::wsug_graphics/ws-edit-menu.png[{screenshot-attrs}] +image::images/ws-edit-menu.png[{screenshot-attrs}] [#ChUseTabEdit] .Edit menu items @@ -394,7 +394,7 @@ The Wireshark View menu contains the fields shown in <>. [#ChUseWiresharkViewMenu] .The “View” Menu -image::wsug_graphics/ws-view-menu.png[{screenshot-attrs}] +image::images/ws-view-menu.png[{screenshot-attrs}] [#ChUseTabView] .View menu items @@ -483,7 +483,7 @@ The Wireshark Go menu contains the fields shown in <>. [#ChUseWiresharkGoMenu] .The “Go” Menu -image::wsug_graphics/ws-go-menu.png[{screenshot-attrs}] +image::images/ws-go-menu.png[{screenshot-attrs}] [#ChUseTabGo] .Go menu items @@ -510,7 +510,7 @@ The Wireshark Capture menu contains the fields shown in <>. [#ChUseWiresharkCaptureMenu] .The “Capture” Menu -image::wsug_graphics/ws-capture-menu.png[{screenshot-attrs}] +image::images/ws-capture-menu.png[{screenshot-attrs}] [#ChUseTabCap] .Capture menu items @@ -552,7 +552,7 @@ The Wireshark Analyze menu contains the fields shown in <>. [#ChUseWiresharkAnalyzeMenu] .The “Analyze” Menu -image::wsug_graphics/ws-analyze-menu.png[{screenshot-attrs}] +image::images/ws-analyze-menu.png[{screenshot-attrs}] [#ChUseAnalyze] .Analyze menu items @@ -628,7 +628,7 @@ The Wireshark Statistics menu contains the fields shown in <>. [#ChUseWiresharkStatisticsMenu] .The “Statistics” Menu -image::wsug_graphics/ws-statistics-menu.png[{screenshot-attrs}] +image::images/ws-statistics-menu.png[{screenshot-attrs}] Each menu item brings up a new window showing specific statistics. @@ -678,7 +678,7 @@ The Wireshark Telephony menu contains the fields shown in <>. [#ChUseWiresharkTelephonyMenu] .The “Telephony” Menu -image::wsug_graphics/ws-telephony-menu.png[{screenshot-attrs}] +image::images/ws-telephony-menu.png[{screenshot-attrs}] Each menu item shows specific telephony related statistics. @@ -715,7 +715,7 @@ The Wireless menu lets you analyze Bluetooth and IEEE 802.11 wireless LAN activi [#ChUseWiresharkWirelessMenu] .The “Wireless” Menu -image::wsug_graphics/ws-wireless-menu.png[{screenshot-attrs}] +image::images/ws-wireless-menu.png[{screenshot-attrs}] Each menu item shows specific Bluetooth and IEEE 802.11 statistics. @@ -740,7 +740,7 @@ The Wireshark Tools menu contains the fields shown in <>. [#ChUseWiresharkToolsMenu] .The “Tools” Menu -image::wsug_graphics/ws-tools-menu.png[{screenshot-attrs}] +image::images/ws-tools-menu.png[{screenshot-attrs}] [#ChUseTools] .Tools menu items @@ -767,7 +767,7 @@ The Wireshark Help menu contains the fields shown in <>. [#ChUseWiresharkHelpMenu] .The “Help” Menu -image::wsug_graphics/ws-help-menu.png[{screenshot-attrs}] +image::images/ws-help-menu.png[{screenshot-attrs}] [#ChUseHelp] .Help menu items @@ -813,7 +813,7 @@ disabled because a capture is not in progress. [#ChUseWiresharkMainToolbar] .The “Main” toolbar -image::wsug_graphics/ws-main-toolbar.png[{screenshot-attrs}] +image::images/ws-main-toolbar.png[{screenshot-attrs}] :toolbar-icon-attrs: height=24,width=24 @@ -822,32 +822,32 @@ image::wsug_graphics/ws-main-toolbar.png[{screenshot-attrs}] [options="header",cols="1,2,2,4"] |=== |Toolbar Icon|Toolbar Item|Menu Item|Description -|image:wsug_graphics/toolbar/x-capture-start.png[{toolbar-icon-attrs}] |btn:[Start]|menu:Capture[Start]| Starts capturing packets with the same options as the last capture or the default options if none were set (<>). -|image:wsug_graphics/toolbar/x-capture-stop.png[{toolbar-icon-attrs}] |btn:[Stop]|menu:Capture[Stop]| Stops the currently running capture (<>). -|image:wsug_graphics/toolbar/x-capture-restart.png[{toolbar-icon-attrs}] |btn:[Restart]|menu:Capture[Restart]| Restarts the current capture session. -|image:wsug_graphics/toolbar/x-capture-options.png[{toolbar-icon-attrs}] |btn:[Options...]|menu:Capture[Options...]| Opens the “Capture Options” dialog box. See <> for details. +|image:images/toolbar/x-capture-start.png[{toolbar-icon-attrs}] |btn:[Start]|menu:Capture[Start]| Starts capturing packets with the same options as the last capture or the default options if none were set (<>). +|image:images/toolbar/x-capture-stop.png[{toolbar-icon-attrs}] |btn:[Stop]|menu:Capture[Stop]| Stops the currently running capture (<>). +|image:images/toolbar/x-capture-restart.png[{toolbar-icon-attrs}] |btn:[Restart]|menu:Capture[Restart]| Restarts the current capture session. +|image:images/toolbar/x-capture-options.png[{toolbar-icon-attrs}] |btn:[Options...]|menu:Capture[Options...]| Opens the “Capture Options” dialog box. See <> for details. // -- -|image:wsug_graphics/toolbar/document-open.png[{toolbar-icon-attrs}] |btn:[Open...]|menu:File[Open...]| Opens the file open dialog box, which allows you to load a capture file for viewing. It is discussed in more detail in <>. -|image:wsug_graphics/toolbar/x-capture-file-save.png[{toolbar-icon-attrs}] |btn:[Save As...]|menu:File[Save As...]| Save the current capture file to whatever file you would like. See <> for details. If you currently have a temporary capture file open the “Save” icon will be shown instead. -|image:wsug_graphics/toolbar/x-capture-file-close.png[{toolbar-icon-attrs}] |btn:[Close]|menu:File[Close]|Closes the current capture. If you have not saved the capture, you will be asked to save it first. -|image:wsug_graphics/toolbar/x-capture-file-reload.png[{toolbar-icon-attrs}] |btn:[Reload]|menu:View[Reload]| Reloads the current capture file. +|image:images/toolbar/document-open.png[{toolbar-icon-attrs}] |btn:[Open...]|menu:File[Open...]| Opens the file open dialog box, which allows you to load a capture file for viewing. It is discussed in more detail in <>. +|image:images/toolbar/x-capture-file-save.png[{toolbar-icon-attrs}] |btn:[Save As...]|menu:File[Save As...]| Save the current capture file to whatever file you would like. See <> for details. If you currently have a temporary capture file open the “Save” icon will be shown instead. +|image:images/toolbar/x-capture-file-close.png[{toolbar-icon-attrs}] |btn:[Close]|menu:File[Close]|Closes the current capture. If you have not saved the capture, you will be asked to save it first. +|image:images/toolbar/x-capture-file-reload.png[{toolbar-icon-attrs}] |btn:[Reload]|menu:View[Reload]| Reloads the current capture file. // -- -|image:wsug_graphics/toolbar/edit-find.png[{toolbar-icon-attrs}] |btn:[Find Packet...]|menu:Edit[Find Packet...]|Find a packet based on different criteria. See <> for details. -|image:wsug_graphics/toolbar/go-previous.png[{toolbar-icon-attrs}] |btn:[Go Back]|menu:Go[Go Back]|Jump back in the packet history. Hold down the kbd:[Alt] key (kbd:[Option] on macOS) to go back in the selection history. -|image:wsug_graphics/toolbar/go-next.png[{toolbar-icon-attrs}] |btn:[Go Forward]|menu:Go[Go Forward]|Jump forward in the packet history. Hold down the kbd:[Alt] key (kbd:[Option] on macOS) to go forward in the selection history. -|image:wsug_graphics/toolbar/go-jump.png[{toolbar-icon-attrs}] |btn:[Go to Packet...]|menu:Go[Go to Packet...]| Go to a specific packet. -|image:wsug_graphics/toolbar/go-first.png[{toolbar-icon-attrs}] |btn:[Go To First Packet]|menu:Go[First Packet]| Jump to the first packet of the capture file. -|image:wsug_graphics/toolbar/go-last.png[{toolbar-icon-attrs}] |btn:[Go To Last Packet]|menu:Go[Last Packet]| Jump to the last packet of the capture file. -|image:wsug_graphics/toolbar/x-stay-last.png[{toolbar-icon-attrs}] |btn:[Auto Scroll in Live Capture]|menu:View[Auto Scroll in Live Capture]| Auto scroll packet list while doing a live capture (or not). +|image:images/toolbar/edit-find.png[{toolbar-icon-attrs}] |btn:[Find Packet...]|menu:Edit[Find Packet...]|Find a packet based on different criteria. See <> for details. +|image:images/toolbar/go-previous.png[{toolbar-icon-attrs}] |btn:[Go Back]|menu:Go[Go Back]|Jump back in the packet history. Hold down the kbd:[Alt] key (kbd:[Option] on macOS) to go back in the selection history. +|image:images/toolbar/go-next.png[{toolbar-icon-attrs}] |btn:[Go Forward]|menu:Go[Go Forward]|Jump forward in the packet history. Hold down the kbd:[Alt] key (kbd:[Option] on macOS) to go forward in the selection history. +|image:images/toolbar/go-jump.png[{toolbar-icon-attrs}] |btn:[Go to Packet...]|menu:Go[Go to Packet...]| Go to a specific packet. +|image:images/toolbar/go-first.png[{toolbar-icon-attrs}] |btn:[Go To First Packet]|menu:Go[First Packet]| Jump to the first packet of the capture file. +|image:images/toolbar/go-last.png[{toolbar-icon-attrs}] |btn:[Go To Last Packet]|menu:Go[Last Packet]| Jump to the last packet of the capture file. +|image:images/toolbar/x-stay-last.png[{toolbar-icon-attrs}] |btn:[Auto Scroll in Live Capture]|menu:View[Auto Scroll in Live Capture]| Auto scroll packet list while doing a live capture (or not). // -- -|image:wsug_graphics/toolbar/x-colorize-packets.png[{toolbar-icon-attrs}] |btn:[Colorize]|menu:View[Colorize]| Colorize the packet list (or not). +|image:images/toolbar/x-colorize-packets.png[{toolbar-icon-attrs}] |btn:[Colorize]|menu:View[Colorize]| Colorize the packet list (or not). // -- -|image:wsug_graphics/toolbar/zoom-in.png[{toolbar-icon-attrs}] |btn:[Zoom In]|menu:View[Zoom In]| Zoom into the packet data (increase the font size). -|image:wsug_graphics/toolbar/zoom-out.png[{toolbar-icon-attrs}] |btn:[Zoom Out]|menu:View[Zoom Out]| Zoom out of the packet data (decrease the font size). -|image:wsug_graphics/toolbar/zoom-original.png[{toolbar-icon-attrs}] |btn:[Normal Size]|menu:View[Normal Size]| Set zoom level back to 100%. -|image:wsug_graphics/toolbar/x-resize-columns.png[{toolbar-icon-attrs}] |btn:[Resize Columns]|menu:View[Resize Columns]| Resize columns, so the content fits into them. +|image:images/toolbar/zoom-in.png[{toolbar-icon-attrs}] |btn:[Zoom In]|menu:View[Zoom In]| Zoom into the packet data (increase the font size). +|image:images/toolbar/zoom-out.png[{toolbar-icon-attrs}] |btn:[Zoom Out]|menu:View[Zoom Out]| Zoom out of the packet data (decrease the font size). +|image:images/toolbar/zoom-original.png[{toolbar-icon-attrs}] |btn:[Normal Size]|menu:View[Normal Size]| Set zoom level back to 100%. +|image:images/toolbar/x-resize-columns.png[{toolbar-icon-attrs}] |btn:[Resize Columns]|menu:View[Resize Columns]| Resize columns, so the content fits into them. // -- -//|image:wsug_graphics/toolbar/stock_colorselector_24.png[{toolbar-icon-attrs}]|btn:[Coloring Rules...]|menu:View[Coloring Rules...]| This item brings up a dialog box that allows you to color packets in the packet list pane according to filter expressions you choose. It can be very useful for spotting certain types of packets. More detail on this subject is provided in <>. +//|image:images/toolbar/stock_colorselector_24.png[{toolbar-icon-attrs}]|btn:[Coloring Rules...]|menu:View[Coloring Rules...]| This item brings up a dialog box that allows you to color packets in the packet list pane according to filter expressions you choose. It can be very useful for spotting certain types of packets. More detail on this subject is provided in <>. |=== [#ChUseFilterToolbarSection] @@ -860,7 +860,7 @@ information on display filters is available in <>. [#ChUseWiresharkFilterToolbar] .The “Filter” toolbar -image::wsug_graphics/ws-filter-toolbar.png[{screenshot-attrs}] +image::images/ws-filter-toolbar.png[{screenshot-attrs}] // Icons themselves are 32px high. :filter-icon-attrs: height=24 @@ -870,21 +870,21 @@ image::wsug_graphics/ws-filter-toolbar.png[{screenshot-attrs}] [options="header",cols="1,3,5"] |=== |Toolbar Icon|Name|Description -|image:wsug_graphics/toolbar/filter-toolbar-bookmark.png[{filter-icon-attrs}]|Bookmarks|Manage or select saved filters. -|image:wsug_graphics/toolbar/filter-toolbar-input.png[{filter-icon-attrs}]|Filter Input|The area to enter or edit a display filter string, see <>. A syntax check of your filter string is done while you are typing. The background will turn red if you enter an incomplete or invalid string, and will become green when you enter a valid string. +|image:images/toolbar/filter-toolbar-bookmark.png[{filter-icon-attrs}]|Bookmarks|Manage or select saved filters. +|image:images/toolbar/filter-toolbar-input.png[{filter-icon-attrs}]|Filter Input|The area to enter or edit a display filter string, see <>. A syntax check of your filter string is done while you are typing. The background will turn red if you enter an incomplete or invalid string, and will become green when you enter a valid string. After you’ve changed something in this field, don’t forget to press the Apply button (or the Enter/Return key), to apply this filter string to the display. This field is also where the current applied filter is displayed. -|image:wsug_graphics/toolbar/filter-toolbar-clear.png[{filter-icon-attrs}]|Clear|Reset the current display filter and clear the edit area. -|image:wsug_graphics/toolbar/filter-toolbar-apply.png[{filter-icon-attrs}]|Apply|Apply the current value in the edit area as the new display filter. +|image:images/toolbar/filter-toolbar-clear.png[{filter-icon-attrs}]|Clear|Reset the current display filter and clear the edit area. +|image:images/toolbar/filter-toolbar-apply.png[{filter-icon-attrs}]|Apply|Apply the current value in the edit area as the new display filter. Applying a display filter on large capture files might take quite a long time. -|image:wsug_graphics/toolbar/filter-toolbar-recent.png[{filter-icon-attrs}]|Recent|Select from a list of recently applied filters. -|image:wsug_graphics/toolbar/filter-toolbar-add.png[{filter-icon-attrs}]|Add Button|Add a new filter button. +|image:images/toolbar/filter-toolbar-recent.png[{filter-icon-attrs}]|Recent|Select from a list of recently applied filters. +|image:images/toolbar/filter-toolbar-add.png[{filter-icon-attrs}]|Add Button|Add a new filter button. |btn:[Squirrels]|Filter Button| Filter buttons are handy shortcuts that apply a display filter as soon as you press them. You can create filter buttons by pressing the btn:[{plus}] button, right-clicking in the filter button area, or opening the Filter Button section of the <>. @@ -903,7 +903,7 @@ The packet list pane displays all the packets in the current capture file. [#ChUseWiresharkListPane] .The “Packet List” pane -image::wsug_graphics/ws-list-pane.png[{screenshot-attrs}] +image::images/ws-list-pane.png[{screenshot-attrs}] Each line in the packet list corresponds to one packet in the capture file. If you select a line in this pane, more details will be displayed in the “Packet @@ -954,31 +954,31 @@ them. [horizontal] .Related packet symbols -image:wsug_graphics/related-first.png[{related-attrs}]:: +image:images/related-first.png[{related-attrs}]:: First packet in a conversation. -image:wsug_graphics/related-current.png[{related-attrs}]:: +image:images/related-current.png[{related-attrs}]:: Part of the selected conversation. -image:wsug_graphics/related-other.png[{related-attrs}]:: +image:images/related-other.png[{related-attrs}]:: _Not_ part of the selected conversation. -image:wsug_graphics/related-last.png[{related-attrs}]:: +image:images/related-last.png[{related-attrs}]:: Last packet in a conversation. -image:wsug_graphics/related-request.png[{related-attrs}]:: +image:images/related-request.png[{related-attrs}]:: Request. -image:wsug_graphics/related-response.png[{related-attrs}]:: +image:images/related-response.png[{related-attrs}]:: Response. -image:wsug_graphics/related-ack.png[{related-attrs}]:: +image:images/related-ack.png[{related-attrs}]:: The selected packet acknowledges this packet. -image:wsug_graphics/related-dup-ack.png[{related-attrs}]:: +image:images/related-dup-ack.png[{related-attrs}]:: The selected packet is a duplicate acknowledgement of this packet. -image:wsug_graphics/related-segment.png[{related-attrs}]:: +image:images/related-segment.png[{related-attrs}]:: The selected packet is related to this packet in some other way, e.g., as part of reassembly. @@ -1003,7 +1003,7 @@ pane) in a more detailed form. [#ChUseWiresharkDetailsPane] .The “Packet Details” pane -image::wsug_graphics/ws-details-pane.png[{screenshot-attrs}] +image::images/ws-details-pane.png[{screenshot-attrs}] This pane shows the protocols and protocol fields of the packet selected in the “Packet List” pane. The protocol summary lines (subtree labels) and fields of the @@ -1035,7 +1035,7 @@ The packet bytes pane shows the data of the current packet (selected in the [#ChUseWiresharkBytesPane] .The “Packet Bytes” pane -image::wsug_graphics/ws-bytes-pane.png[{screenshot-attrs}] +image::images/ws-bytes-pane.png[{screenshot-attrs}] The “Packet Bytes” pane shows a canonical https://en.wikipedia.org/wiki/Hex_dump[hex dump] of the packet data. Each line @@ -1061,7 +1061,7 @@ methods for deactivating the functionality: [#ChUseWiresharkBytesPaneTabs] .The “Packet Bytes” pane with tabs -image::wsug_graphics/ws-bytes-pane-tabs.png[{screenshot-attrs}] +image::images/ws-bytes-pane-tabs.png[{screenshot-attrs}] Additional tabs typically contain data reassembled from multiple packets or decrypted data. @@ -1076,7 +1076,7 @@ pane) as a diagram, similar to ones used in textbooks and IETF RFCs. [#ChUseWiresharkDiagramPane] .The “Packet Diagram” pane -image::wsug_graphics/ws-diagram-pane.png[{screenshot-attrs}] +image::images/ws-diagram-pane.png[{screenshot-attrs}] This pane shows the protocols and top-level protocol fields of the packet selected in the “Packet List” pane as a series of diagrams. @@ -1096,13 +1096,13 @@ to change the size. [#ChUseWiresharkStatusbarEmpty] .The initial Statusbar -image::wsug_graphics/ws-statusbar-empty.png[{statusbar-attrs}] +image::images/ws-statusbar-empty.png[{statusbar-attrs}] This statusbar is shown while no capture file is loaded, e.g., when Wireshark is started. [#ChUseWiresharkStatusbarLoaded] .The Statusbar with a loaded capture file -image::wsug_graphics/ws-statusbar-loaded.png[{statusbar-attrs}] +image::images/ws-statusbar-loaded.png[{statusbar-attrs}] The colorized bullet...:: on the left shows the highest expert information level found in the currently loaded capture file. Hovering the mouse over this icon will show a description of the expert info level, and clicking the icon will bring up the Expert Information dialog box. @@ -1133,13 +1133,13 @@ Clicking on this part of the statusbar will bring up a menu with all available c [#ChUseWiresharkStatusbarProfile] .The Statusbar with a configuration profile menu -image::wsug_graphics/ws-statusbar-profile.png[{pdf-scaledwidth},height=192] +image::images/ws-statusbar-profile.png[{pdf-scaledwidth},height=192] For a detailed description of configuration profiles, see <>. [#ChUseWiresharkStatusbarSelected] .The Statusbar with a selected protocol field -image::wsug_graphics/ws-statusbar-selected.png[{statusbar-attrs}] +image::images/ws-statusbar-selected.png[{statusbar-attrs}] This is displayed if you have selected a protocol field in the “Packet Details” pane. @@ -1153,7 +1153,7 @@ You can become more familiar with display filter fields by selecting different p //FIXME: Remove or choose a better example of a display filter message. .The Statusbar with a display filter message -image::wsug_graphics/ws-statusbar-filter.png[{statusbar-attrs}] +image::images/ws-statusbar-filter.png[{statusbar-attrs}] This is displayed if you are trying to use a display filter which may have unexpected results. diff --git a/docbook/wsug_src/wsug_wireless.adoc b/docbook/wsug_src/wsug_wireless.adoc index 6c11d8782d..2431707ed8 100644 --- a/docbook/wsug_src/wsug_wireless.adoc +++ b/docbook/wsug_src/wsug_wireless.adoc @@ -29,7 +29,7 @@ Bluetooth ATT Server Attributes window displays a list of captured Attribute Pro The Bluetooth Devices window displays the list of the captured information about devices, such as MAC address, Organizationally Unique Identifier (OUI), Name and other. Users can filter it by interface. .Bluetooth Devices window -image::wsug_graphics/ws-bluetooth-devices.png[{screenshot-attrs}] +image::images/ws-bluetooth-devices.png[{screenshot-attrs}] [#ChWirelessBluetoothHCISummary] @@ -38,7 +38,7 @@ image::wsug_graphics/ws-bluetooth-devices.png[{screenshot-attrs}] The Bluetooth HCI Summary window displays the summary for the captured Host Controller Interface (HCI) layer packets. This window allows users to apply filters and choose to display information about specific interfaces or devices. .Bluetooth HCI Summary window -image::wsug_graphics/ws-bt-hci-summary.png[{screenshot-attrs}] +image::images/ws-bt-hci-summary.png[{screenshot-attrs}] [#ChWirelessWLANTraffic] @@ -50,7 +50,7 @@ in the capture. Probe requests will be merged into an existing network if the SSID matches. .The “WLAN Traffic Statistics” window -image::wsug_graphics/ws-stats-wlan-traffic.png[{screenshot-attrs}] +image::images/ws-stats-wlan-traffic.png[{screenshot-attrs}] Each row in the list shows the statistical values for exactly one wireless network. diff --git a/docbook/wsug_src/wsug_work.adoc b/docbook/wsug_src/wsug_work.adoc index 6d140cee54..f00f660edd 100644 --- a/docbook/wsug_src/wsug_work.adoc +++ b/docbook/wsug_src/wsug_work.adoc @@ -22,7 +22,7 @@ header selected, which shows up in the byte view as the selected bytes. [#ChWorkSelPack1] .Wireshark with a TCP packet selected for viewing -image::wsug_graphics/ws-packet-selected.png[{screenshot-attrs}] +image::images/ws-packet-selected.png[{screenshot-attrs}] You can also select and view packets the same way while Wireshark is capturing if you selected “Update list of packets in real time” in the “Capture @@ -37,7 +37,7 @@ easily compare two or more packets, even across multiple files. [#ChWorkPacketSepView] .Viewing a packet in a separate window -image::wsug_graphics/ws-packet-sep-win.png[{screenshot-attrs}] +image::images/ws-packet-sep-win.png[{screenshot-attrs}] Along with double-clicking the packet list and using the main menu there are a number of other ways to open a new packet window: @@ -61,7 +61,7 @@ on the corresponding item. [#ChWorkColumnHeaderPopUpMenu] .Pop-up menu of the “Packet List” column header -image::wsug_graphics/ws-column-header-popup-menu.png[{screenshot-attrs}] +image::images/ws-column-header-popup-menu.png[{screenshot-attrs}] The following table gives an overview of which functions are available in this header, where to find the corresponding function in the main @@ -109,7 +109,7 @@ Remove this column, similar to deleting it in the “Preferences” dialog. [#ChWorkPacketListPanePopUpMenu] .Pop-up menu of the “Packet List” pane -image::wsug_graphics/ws-packet-pane-popup-menu.png[{screenshot-attrs}] +image::images/ws-packet-pane-popup-menu.png[{screenshot-attrs}] The following table gives an overview of which functions are available in this pane, where to find the corresponding function in the main menu, @@ -228,7 +228,7 @@ details. [#ChWorkPacketDetailsPanePopUpMenu] .Pop-up menu of the “Packet Details” pane -image::wsug_graphics/ws-details-pane-popup-menu.png[{screenshot-attrs}] +image::images/ws-details-pane-popup-menu.png[{screenshot-attrs}] The following table gives an overview of which functions are available in this pane, where to find the corresponding function in the main menu, and a short @@ -342,7 +342,7 @@ window. See <> for details. [#ChWorkPacketBytesPanePopUpMenu] .Pop-up menu of the “Packet Bytes” pane -image::wsug_graphics/ws-bytes-pane-popup-menu.png[{screenshot-attrs}] +image::images/ws-bytes-pane-popup-menu.png[{screenshot-attrs}] The following table gives an overview of which functions are available in this pane along with a short description of each item. @@ -400,7 +400,7 @@ Use EBCDIC encoding when displaying “hexdump” text. [#ChWorkPacketDiagramPanePopUpMenu] .Pop-up menu of the “Packet Diagram” pane -image::wsug_graphics/ws-diagram-pane-popup-menu.png[{screenshot-attrs}] +image::images/ws-diagram-pane-popup-menu.png[{screenshot-attrs}] The following table gives an overview of which functions are available in this pane along with a short description of each item. @@ -472,7 +472,7 @@ expression. [#ChWorkTCPFilter] .Filtering on the TCP protocol -image::wsug_graphics/ws-display-filter-tcp.png[{screenshot-attrs}] +image::images/ws-display-filter-tcp.png[{screenshot-attrs}] As you may have noticed, only packets containing the TCP protocol are now displayed, so packets 1-10 are hidden and packet number 11 @@ -967,7 +967,7 @@ Wireshark display filter strings. [#ChWorkFilterAddExpression1] .The “Display Filter Expression” dialog box -image::wsug_graphics/ws-filter-add-expression.png[{screenshot-attrs}] +image::images/ws-filter-add-expression.png[{screenshot-attrs}] // Screenshot from Wireshark 3.1.1 When you first bring up the Display Filter Expression dialog box you are shown a tree @@ -1023,7 +1023,7 @@ clicking the btn:[Cancel] button. === Defining And Saving Filters -You create pre-defined filters that appear in the capture and display filter bookmark menus (image:wsug_graphics/toolbar/filter-toolbar-bookmark.png[height=16,width=12]). +You create pre-defined filters that appear in the capture and display filter bookmark menus (image:images/toolbar/filter-toolbar-bookmark.png[height=16,width=12]). This can save time in remembering and retyping some of the more complex filters you use. To create or edit capture filters, select menu:Manage Capture Filters[] from the capture filter bookmark menu or menu:Capture[Capture Filters...] from the main menu. @@ -1035,7 +1035,7 @@ Both are described here, and the differences are noted as needed. [#FiltersDialog] .The “Capture Filters” and “Display Filters” dialog boxes -image::wsug_graphics/ws-filters.png[{screenshot-attrs}] +image::images/ws-filters.png[{screenshot-attrs}] btn:[{plus}]:: Adds a new filter to the list. @@ -1077,7 +1077,7 @@ To define and save your own filter macros, follow the steps below: [#FilterMacrosDialog] + .Display Filter Macros window -image::wsug_graphics/ws-filter-macros.png[{screenshot-attrs}] +image::images/ws-filter-macros.png[{screenshot-attrs}] . To add a new filter macro, click the btn:[{plus}] button in the bottom-left corner. A new row will appear in the Display Filter Macros table above. @@ -1101,7 +1101,7 @@ main toolbar and the packet list shown in <>. [#ChWorkFindPacketToolbar] .The “Find Packet” toolbar -image::wsug_graphics/ws-find-packet.png[{screenshot-attrs}] +image::images/ws-find-packet.png[{screenshot-attrs}] You can search using the following criteria: @@ -1157,7 +1157,7 @@ most web browsers. [#ChWorkGoToPacketToolbar] .The “Go To Packet” toolbar -image::wsug_graphics/ws-goto-packet.png[{screenshot-attrs}] +image::images/ws-goto-packet.png[{screenshot-attrs}] This toolbar can be opened by selecting menu:Go[Go to packet...] from the main menu. It appears between the main toolbar and the packet list, @@ -1314,7 +1314,7 @@ the menu:[Edit] menu or from the pop-up menu of the “Packet List” pane. See [#ChWorkTimeReference] .Wireshark showing a time referenced packet -image::wsug_graphics/ws-time-reference.png[{screenshot-attrs}] +image::images/ws-time-reference.png[{screenshot-attrs}] A time referenced packet will be marked with the string $$*REF*$$ in the Time column (see packet number 10). All subsequent packets will show the time since diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c index 6b2d368c60..8c951c7773 100644 --- a/epan/wslua/wslua_gui.c +++ b/epan/wslua/wslua_gui.c @@ -324,7 +324,7 @@ WSLUA_FUNCTION wslua_new_dialog(lua_State* L) { /* Displays a dialog, prompting for input. The dialog includes an btn:[OK] button and btn:[Cancel] button. Requires a GUI. .An input dialog in action - image::wsdg_graphics/wslua-new-dialog.png[{small-screenshot-attrs}] + image::images/wslua-new-dialog.png[{small-screenshot-attrs}] ===== Example @@ -463,7 +463,7 @@ WSLUA_CLASS_DEFINE(ProgDlg,FAIL_ON_NULL("ProgDlg")); The main thread checks the status of the btn:[Cancel] button and if it's not set, returns control to the coroutine. .A progress bar in action - image::wsdg_graphics/wslua-progdlg.png[{medium-screenshot-attrs}] + image::images/wslua-progdlg.png[{medium-screenshot-attrs}] The legacy (GTK+) user interface displayed this as a separate dialog, hence the “Dlg” suffix. The Qt user interface shows a progress bar inside the main status bar. @@ -659,7 +659,7 @@ WSLUA_CLASS_DEFINE(TextWindow,FAIL_ON_NULL_OR_EXPIRED("TextWindow")); /* The text can be read-only or editable, and buttons can be added below the text. .A text window in action - image::wsdg_graphics/wslua-textwindow.png[{medium-screenshot-attrs}] + image::images/wslua-textwindow.png[{medium-screenshot-attrs}] */ /* XXX: button and close callback data is being leaked */