diff options
| author | John Thacker <johnthacker@gmail.com> | 2020-07-05 07:35:57 -0400 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2020-07-06 14:21:41 +0000 |
| commit | 9fc054a65bfadf40325bb4f5185c7247ed4a9a6c (patch) | |
| tree | dcd88b46d14e6da77ff575c8edfb77bf32fe106c /epan/follow.h | |
| parent | 23cb6959c1405806a211062e14d49a3c1aa8ad92 (diff) | |
Add all supported charsets to Show Packet Bytes/Follow Stream
Use the QT text codec support to add charset conversions for all character
encodings supported by QT to Show Packet Bytes and Follow Stream (Save As
will convert to UTF-8.) Note that this is dynamic and the exact list will
depend on the version of QT and if libicu support is enabled. This does
make the list of codecs pretty long, so hopefully it shows up well on all
the different QT styles.
This does not yet support when multibyte characters span more than one packet
in Follow Stream, though the current code doesn't do that for UTF-8 or UTF-16
already. This is probably most useful for HTTP captures.
Bug: 16137
Change-Id: I6d5cd761a5d9d914b7a787fe8eb02b07b19642e6
Ping-Bug: 16630
Reviewed-on: https://code.wireshark.org/review/37707
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan/follow.h')
| -rw-r--r-- | epan/follow.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/follow.h b/epan/follow.h index c0df89c0ce..42c0cc9ff4 100644 --- a/epan/follow.h +++ b/epan/follow.h @@ -50,13 +50,12 @@ typedef enum { /* Show Type */ typedef enum { SHOW_ASCII, + SHOW_CARRAY, SHOW_EBCDIC, SHOW_HEXDUMP, - SHOW_CARRAY, SHOW_RAW, - SHOW_YAML, - SHOW_UTF8, - SHOW_UTF16 + SHOW_CODEC, // Ordered to match UTF-8 combobox index + SHOW_YAML } show_type_t; |