From 13c7515114f9fe320eeeec3e6633d34aae16d4a2 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sat, 4 Jun 2022 15:51:42 -0400 Subject: [PATCH 01/15] Update instructions for building with the Go toolchain Now I have removed replace directives, termshark can be built with one go install invocation. --- CHANGELOG.md | 1 + README.md | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a78025d..86debcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Changed +- Now you can build and install termshark with one command: `go install github.com/gcla/termshark/v2/cmd/termshark` - Fixed a bug that caused mouse-clicks within the hex view to not function correctly if the viewport was not at the top of the data to be displayed. - When focus is in the packet hex view, the mouse wheel will no longer move the cursor - instead it will move diff --git a/README.md b/README.md index 3397e53..1a73166 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,18 @@ Termshark is pre-packaged for the following platforms: [Arch Linux](docs/Package ## Building -Termshark uses Go modules; compile with Go 1.13 or higher. Set `GO111MODULE=on` then run: +Termshark uses Go modules. Set `GO111MODULE=on` then run: ```bash -git clone https://github.com/gcla/termshark -cd termshark -go install ./... +go install github.com/gcla/termshark/v2/cmd/termshark ``` + +For versions of Go between 1.14 and 1.17, use + +```bash +go get github.com/gcla/termshark/v2/cmd/termshark +``` + Then add ```~/go/bin/``` to your ```PATH```. For all packet analysis, termshark depends on tshark from the Wireshark project. Make sure ```tshark``` is in your ```PATH```. From 3657975e697fb6184111755013c891d2696c62bc Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 15:16:57 -0400 Subject: [PATCH 02/15] Add note on tshark -G folders use --- docs/FAQ.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index bab8de1..4560a83 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -92,7 +92,7 @@ If you start to page up quickly, you will likely approach a range of packets tha ## Termshark is too bright! -Termshark v2 supports dark-mode! Hit Esc to bring up the main menu then "Toggle Dark Mode". See the [User Guide](UserGuide.md#dark-mode). +Termshark v2 supports dark-mode! Hit Esc to bring up the main menu then "Toggle Dark Mode". See the [User Guide](UserGuide.md#dark-mode). As of termshark v2.4, dark-mode is the default. ## Termshark's colors are wrong! @@ -310,6 +310,14 @@ tshark -G fields then parsing the output into a nested collection of Go maps, and serializing it to `$XDG_CACHE_HOME/termshark/tsharkfieldsv3.gob.gz`. +If the user creates a new termshark profile, an option is provided to link to a Wireshark profile. To gather a list of these profiles, termshark runs + +```bash +tshark -G folders +``` + +and parses out the global and personal configuration directories. + Finally, termshark runs tshark to generate the list of all valid columns and their names. These are used to populate a dropdown menu showing valid column choices when the user configures their column set. Termshark runs ```bash From 9b5a9ac43223944f6656671c8720f24d4ef88750 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 15:20:20 -0400 Subject: [PATCH 03/15] Add missing minibuffer commands to the docs --- docs/UserGuide.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 53f03bc..f58855d 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -392,6 +392,7 @@ Many of termshark's operations can be initiated from the command-line. After ope - **clear-filter** - Clear the current display filter - **clear-packets** - Clear the current pcap - **columns** - Configure termshark's columns +- **config** - Show termshark's config file (Unix-only) - **convs** - Open the conversations view - **filter** - Choose a display filter from those recently-used - **help** - Show one of several help dialogs @@ -401,6 +402,7 @@ Many of termshark's operations can be initiated from the command-line. After ope - **marks** - Show file-local and global packet marks - **menu** - Open the UI menubar - **no-theme** - Clear theme for the current terminal color mode +- **profile** - Profile actions - create, use, delete, etc - **quit** - Quit termshark - **recents** - Load a pcap from those recently-used - **set** - Set various config properties (see `help set`) From 37ec8dfe7185ab1a1457bc1ff3fc29d816ff505a Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 15:47:33 -0400 Subject: [PATCH 04/15] Add some documentation on the new profile support --- docs/UserGuide.md | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index f58855d..32236f9 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -494,17 +494,44 @@ https://user-images.githubusercontent.com/45680/122692277-0de7e180-d202-11eb-964 ## Configuration +### Profiles + +Termshark v2.4 introduces support for Wireshark-like profiles. A simple mental model for a profile called "work" is a separate toml file, stored as +`$XDG_CONFIG_HOME/termshark/profiles/work/termshark.toml`, whose settings take precedence over the default `termshark.toml` file. When a non-default +profile is active, termshark will display its name at the top of the user-interface. Configuration changes are saved to the currently-active +profile. These include typical termshark settings like dark-mode, columns and theme. + +To create a profile, open the command line and type `profile create`. Termshark will open a dialog that lets you name your profile and, optionally, +"link" it to a Wireshark-profile. + +![profilecreate](/../gh-pages/images/profilecreate.png?raw=true) + +The effect of linking to a Wireshark profile "wshark" is that termshark will run tshark with the flags `-C wshark`. One useful effect of this is that +tshark will generate packet colors according to those configured for the "wshark" Wireshark profile. This allows Wireshark packet coloring rules to be +used flexibly in termshark; create a new termshark profile and link to the Wireshark profile with the colors configured the way you want. Once a +profile is created, you can unlink and re-link to a different Wireshark profile using the `profile unlink` and `profile link` commands respectively. + +Once you have profiles configured, you can switch between them using the `profile use` command. Termshark may reload your current packet source if it +determines it needs to regenerate parts of the UI e.g. if packet colors or columns may be different. Note that if you create a new profile "new" while +currently using profile "old", the settings for "new" are initialized from "old" (the toml file is copied); but then further changes apply to profile +"new" only. + ### Dark Mode If termshark is too bright for your taste, try dark-mode. To enable, hit Esc to open the main menu and select "Toggle Dark Mode". ![darkmode](/../gh-pages/images/darkmode.png?raw=true) -Your choice is stored in the termshark [config file](UserGuide.md#config-file). Dark-mode is supported throughout the termshark user-interface. +Your choice is stored in the termshark [config file](UserGuide.md#config-file) for the currently active profile. Dark-mode is supported throughout the +termshark user-interface. ### Packet Colors -By default, termshark will now display packets in the packet list view colored according to Wireshark's color rules. With recent installations of Wireshark, you can find this file at `$XDG_CONFIG_HOME/wireshark/colorfilters`. Termshark doesn't provide a way to edit the colors - the colors are provided by `tshark`. You can read about Wireshark's support [here](https://www.wireshark.org/docs/wsug_html_chunked/ChCustColorizationSection.html). If you don't like the way this looks in termshark, you can turn it off using termshark's main menu. +By default, termshark will now display packets in the packet list view colored according to Wireshark's default color rules. With recent installations +of Wireshark, you can find this file at `$XDG_CONFIG_HOME/wireshark/colorfilters`. Termshark doesn't provide a way to edit the colors - the colors are +provided by `tshark`. You can read about Wireshark's support +[here](https://www.wireshark.org/docs/wsug_html_chunked/ChCustColorizationSection.html). If you don't like the way this looks in termshark, you can +turn it off using termshark's main menu. ### Themes @@ -549,7 +576,7 @@ Termshark saves your selected theme against the terminal color mode, which can b - 256-color - truecolor i.e. 24-bit color -The theme is saved in `termshark.toml` under, respectively, the keys: +The theme is saved in the current profile's `termshark.toml` under, respectively, the keys: - `main.theme-16` - `main.theme-256` @@ -614,7 +641,9 @@ widgets that will have focus when control returns to the container. Unselected m ### Config File -Termshark reads options from a TOML configuration file saved in `$XDG_CONFIG_HOME/termshark/termshark.toml` (e.g. `~/.config/termshark/termshark.toml` on Linux). All options are saved under the `[main]` section. The available options are: +Termshark reads options from a TOML configuration file saved in `$XDG_CONFIG_HOME/termshark/termshark.toml` (e.g. `~/.config/termshark/termshark.toml` +on Linux) if you are using the default profile. If you are using a profile called "work", the settings are saved in +`$XDG_CONFIG_HOME/termshark/profiles/work/termshark.toml`. All options are saved under the `[main]` section. The available options are: - `always-keep-pcap` (bool) - if true, and if termshark is run on a live packet source (`-i`), when termshark is asked to exit, it will not prompt the user to choose whether to keep or delete the capture. - `auto-scroll` (bool) - if true, termshark will automatically scroll down when packets are read in a live-capture mode (e.g. `-i eth0`) From f48fcfd228db01e9855b330ef21fed2ae248e569 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 15:49:21 -0400 Subject: [PATCH 05/15] Add profiles to the table of contents --- docs/UserGuide.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 32236f9..8b06b48 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -28,6 +28,7 @@ Termshark provides a terminal-based user interface for analyzing packet captures - [Macros](#macros) - [Transfer a pcap File](#transfer-a-pcap-file) - [Configuration](#configuration) + - [Profiles](#profiles) - [Dark Mode](#dark-mode) - [Packet Colors](#packet-colors) - [Themes](#themes) From 8d23c3d8c728794fa8cb9007376e7206d6b74861 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 17:59:25 -0400 Subject: [PATCH 06/15] More documentation updates for upcoming v2.4 --- README.md | 2 +- docs/UserGuide.md | 10 +++++++++- version.go | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1a73166..f2f0740 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Termshark A terminal user-interface for tshark, inspired by Wireshark. -**V2.3 is out now with custom columns, magic wormhole and more! See the [ChangeLog](CHANGELOG.md#changelog).** +**V2.4 is out now with packet search and profiles! See the [ChangeLog](CHANGELOG.md#changelog).** ![demo21](/../gh-pages/images/demo21.png?raw=true) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 8b06b48..6fb3e57 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -41,7 +41,7 @@ Termshark is inspired by Wireshark, and depends on tshark for all its intelligen ```console $ termshark -h -termshark v2.3.0 +termshark v2.4.0 A wireshark-inspired terminal user interface for tshark. Analyze network traffic interactively from your terminal. See https://termshark.io for more information. @@ -59,6 +59,7 @@ Application Options: -f= Apply capture filter. -t=[a|ad|adoy|d|dd|e|r|u|ud|udoy] Set the format of the packet timestamp printed in summary lines. --tty= Display the UI on this terminal. + -C, --profile= Start with this configuration profile. --pass-thru=[auto|true|false] Run tshark instead (auto => if stdout is not a tty). (default: auto) --log-tty Log to the terminal. -h, --help Show this help message. @@ -517,6 +518,13 @@ determines it needs to regenerate parts of the UI e.g. if packet colors or colum currently using profile "old", the settings for "new" are initialized from "old" (the toml file is copied); but then further changes apply to profile "new" only. +Note that some configuration settings are read only from the default profile. These include + +- `main.term` - termshark will launch on this tty (Unix-only) + + + + ### Dark Mode If termshark is too bright for your taste, try dark-mode. To enable, hit Esc to open the main menu and select "Toggle Dark Mode". diff --git a/version.go b/version.go index 09b9a9b..b533c95 100644 --- a/version.go +++ b/version.go @@ -4,7 +4,7 @@ package termshark -var Version string = "v2.3.0+" +var Version string = "v2.4.0" //====================================================================== // Local Variables: From af76832f49d2d9440147d3b05ca3bfd0fd174164 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 18:03:24 -0400 Subject: [PATCH 07/15] Thanks @elig0n for the packet search idea! --- .all-contributorsrc | 11 ++++++++++- README.md | 15 +++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index ca8e65d..0e91282 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -8,7 +8,7 @@ ], "imageSize": 72, "commit": false, - "contributorsPerLine": 8, + "contributorsPerLine": 10, "commitConvention": "none", "contributors": [ { @@ -483,6 +483,15 @@ "contributions": [ "ideas" ] + }, + { + "login": "elig0n", + "name": "elig0n", + "avatar_url": "https://avatars.githubusercontent.com/u/31196036?v=4", + "profile": "https://github.com/elig0n", + "contributions": [ + "ideas" + ] } ] } diff --git a/README.md b/README.md index f2f0740..d8d1adb 100644 --- a/README.md +++ b/README.md @@ -83,14 +83,13 @@ Thanks to everyone that's contributed ports, patches and effort! -| [
Ross Jacobs](https://swit.sh)
[πŸ’»](https://github.com/gcla/termshark/commits?author=pocc "Code") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apocc "Bug reports") [πŸ““](#userTesting-pocc "User Testing") | [
Hongarc](https://github.com/Hongarc)
[πŸ“–](https://github.com/gcla/termshark/commits?author=Hongarc "Documentation") | [
Ryan Steinmetz](https://github.com/zi0r)
[πŸ“¦](#platform-zi0r "Packaging/porting to new platform") | [
Nicolai SΓΈborg](https://sΓΈb.org/)
[πŸ“¦](#platform-NicolaiSoeborg "Packaging/porting to new platform") | [
Elliott Sales de Andrade](https://qulogic.gitlab.io/)
[πŸ’»](https://github.com/gcla/termshark/commits?author=QuLogic "Code") | [
Romanos](http://rski.github.io)
[πŸ’»](https://github.com/gcla/termshark/commits?author=rski "Code") | [
Denys](https://github.com/denyspozniak)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adenyspozniak "Bug reports") | [
jerry73204](https://github.com/jerry73204)
[πŸ“¦](#platform-jerry73204 "Packaging/porting to new platform") | -| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -| [
Jon Knapp](http://thann.github.com)
[πŸ“¦](#platform-Thann "Packaging/porting to new platform") | [
Mario Harjac](https://github.com/mharjac)
[πŸ“¦](#platform-mharjac "Packaging/porting to new platform") | [
Andrew Benson](https://github.com/abenson)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aabenson "Bug reports") | [
sagis-tikal](https://github.com/sagis-tikal)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Asagis-tikal "Bug reports") | [
punkymaniac](https://github.com/punkymaniac)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apunkymaniac "Bug reports") | [
msenturk](https://github.com/msenturk)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amsenturk "Bug reports") | [
Sandor SzΓΌcs](https://github.com/szuecs)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aszuecs "Bug reports") | [
Dawid Dziurla](https://github.com/dawidd6)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adawidd6 "Bug reports") [πŸ“¦](#platform-dawidd6 "Packaging/porting to new platform") | -| [
jJit0](https://github.com/jJit0)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AjJit0 "Bug reports") | [
inzel](http://colinrogers001.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ainzel "Bug reports") | [
thejerrod](https://github.com/thejerrod)
[πŸ€”](#ideas-thejerrod "Ideas, Planning, & Feedback") | [
gdluca](https://github.com/gdluca)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agdluca "Bug reports") | [
Patrick Winter](https://github.com/winpat)
[πŸ“¦](#platform-winpat "Packaging/porting to new platform") | [
Robert Larsen](https://github.com/RobertLarsen)
[πŸ€”](#ideas-RobertLarsen "Ideas, Planning, & Feedback") [πŸ““](#userTesting-RobertLarsen "User Testing") | [
MinJae Kwon](https://mingrammer.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amingrammer "Bug reports") | [
the-c0d3r](https://github.com/the-c0d3r)
[πŸ€”](#ideas-the-c0d3r "Ideas, Planning, & Feedback") | -| [
Gisle Vanem](https://github.com/gvanem)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agvanem "Bug reports") | [
hook](https://github.com/hook-s3c)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ahook-s3c "Bug reports") | [
Lennart Koopmann](https://twitter.com/_lennart)
[πŸ€”](#ideas-lennartkoopmann "Ideas, Planning, & Feedback") | [
Fernandez, ReK2](https://keybase.io/cfernandez)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AReK2Fernandez "Bug reports") | [
mazball](https://github.com/mazball)
[πŸ€”](#ideas-mazball "Ideas, Planning, & Feedback") | [
wfailla](https://github.com/wfailla)
[πŸ€”](#ideas-wfailla "Ideas, Planning, & Feedback") | [
荣怑](https://github.com/rongyi)
[πŸ€”](#ideas-rongyi "Ideas, Planning, & Feedback") | [
thebyrdman-git](https://github.com/thebyrdman-git)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Athebyrdman-git "Bug reports") | -| [
Clemens Mosig](http://www.mi.fu-berlin.de/en/inf/groups/ilab/members/mosig.html)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Acmosig "Bug reports") | [
Michael Rash](http://www.cipherdyne.org/)
[πŸ““](#userTesting-mrash "User Testing") | [
joelparker](https://github.com/joelparker)
[πŸ““](#userTesting-joelparker "User Testing") | [
Dragos Maftei](https://github.com/dragosmaftei)
[πŸ€”](#ideas-dragosmaftei "Ideas, Planning, & Feedback") | [
Matthew Giassa](http://www.giassa.net)
[πŸ€”](#ideas-IAXES "Ideas, Planning, & Feedback") | [
Sean Abbott](https://github.com/sean-abbott)
[πŸ“¦](#platform-sean-abbott "Packaging/porting to new platform") | [
Vincent Wang](http://www.linsong.org)
[πŸ€”](#ideas-linsong "Ideas, Planning, & Feedback") | [
piping](https://github.com/Piping)
[πŸ€”](#ideas-Piping "Ideas, Planning, & Feedback") | -| [
kevinhwang91](https://github.com/kevinhwang91)
[πŸ€”](#ideas-kevinhwang91 "Ideas, Planning, & Feedback") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Akevinhwang91 "Bug reports") | [
Justin Overfelt](https://jbo.io)
[πŸ€”](#ideas-jboverfelt "Ideas, Planning, & Feedback") | [
Anthony](https://github.com/loudsong)
[πŸ€”](#ideas-loudsong "Ideas, Planning, & Feedback") | [
basondole](https://github.com/basondole)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Abasondole "Bug reports") | [
zoulja](https://github.com/zoulja)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Azoulja "Bug reports") | [
freddii](https://github.com/freddii)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Afreddii "Bug reports") | [
Thord Setsaas](https://github.com/thordy)
[πŸ“–](https://github.com/gcla/termshark/commits?author=thordy "Documentation") | [
deliciouslytyped](https://github.com/deliciouslytyped)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adeliciouslytyped "Bug reports") | -| [
factorion](https://github.com/factorion)
[πŸ“¦](#platform-factorion "Packaging/porting to new platform") | [
Herby Gillot](https://github.com/herbygillot)
[πŸ“¦](#platform-herbygillot "Packaging/porting to new platform") | [
nmeum](https://github.com/nmeum)
[πŸ€”](#ideas-nmeum "Ideas, Planning, & Feedback") | [
Aaron Bieber](https://deftly.net)
[πŸ€”](#ideas-qbit "Ideas, Planning, & Feedback") | +| [
Ross Jacobs](https://swit.sh)
[πŸ’»](https://github.com/gcla/termshark/commits?author=pocc "Code") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apocc "Bug reports") [πŸ““](#userTesting-pocc "User Testing") | [
Hongarc](https://github.com/Hongarc)
[πŸ“–](https://github.com/gcla/termshark/commits?author=Hongarc "Documentation") | [
Ryan Steinmetz](https://github.com/zi0r)
[πŸ“¦](#platform-zi0r "Packaging/porting to new platform") | [
Nicolai SΓΈborg](https://sΓΈb.org/)
[πŸ“¦](#platform-NicolaiSoeborg "Packaging/porting to new platform") | [
Elliott Sales de Andrade](https://qulogic.gitlab.io/)
[πŸ’»](https://github.com/gcla/termshark/commits?author=QuLogic "Code") | [
Romanos](http://rski.github.io)
[πŸ’»](https://github.com/gcla/termshark/commits?author=rski "Code") | [
Denys](https://github.com/denyspozniak)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adenyspozniak "Bug reports") | [
jerry73204](https://github.com/jerry73204)
[πŸ“¦](#platform-jerry73204 "Packaging/porting to new platform") | [
Jon Knapp](http://thann.github.com)
[πŸ“¦](#platform-Thann "Packaging/porting to new platform") | [
Mario Harjac](https://github.com/mharjac)
[πŸ“¦](#platform-mharjac "Packaging/porting to new platform") | +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | +| [
Andrew Benson](https://github.com/abenson)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aabenson "Bug reports") | [
sagis-tikal](https://github.com/sagis-tikal)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Asagis-tikal "Bug reports") | [
punkymaniac](https://github.com/punkymaniac)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apunkymaniac "Bug reports") | [
msenturk](https://github.com/msenturk)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amsenturk "Bug reports") | [
Sandor SzΓΌcs](https://github.com/szuecs)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aszuecs "Bug reports") | [
Dawid Dziurla](https://github.com/dawidd6)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adawidd6 "Bug reports") [πŸ“¦](#platform-dawidd6 "Packaging/porting to new platform") | [
jJit0](https://github.com/jJit0)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AjJit0 "Bug reports") | [
inzel](http://colinrogers001.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ainzel "Bug reports") | [
thejerrod](https://github.com/thejerrod)
[πŸ€”](#ideas-thejerrod "Ideas, Planning, & Feedback") | [
gdluca](https://github.com/gdluca)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agdluca "Bug reports") | +| [
Patrick Winter](https://github.com/winpat)
[πŸ“¦](#platform-winpat "Packaging/porting to new platform") | [
Robert Larsen](https://github.com/RobertLarsen)
[πŸ€”](#ideas-RobertLarsen "Ideas, Planning, & Feedback") [πŸ““](#userTesting-RobertLarsen "User Testing") | [
MinJae Kwon](https://mingrammer.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amingrammer "Bug reports") | [
the-c0d3r](https://github.com/the-c0d3r)
[πŸ€”](#ideas-the-c0d3r "Ideas, Planning, & Feedback") | [
Gisle Vanem](https://github.com/gvanem)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agvanem "Bug reports") | [
hook](https://github.com/hook-s3c)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ahook-s3c "Bug reports") | [
Lennart Koopmann](https://twitter.com/_lennart)
[πŸ€”](#ideas-lennartkoopmann "Ideas, Planning, & Feedback") | [
Fernandez, ReK2](https://keybase.io/cfernandez)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AReK2Fernandez "Bug reports") | [
mazball](https://github.com/mazball)
[πŸ€”](#ideas-mazball "Ideas, Planning, & Feedback") | [
wfailla](https://github.com/wfailla)
[πŸ€”](#ideas-wfailla "Ideas, Planning, & Feedback") | +| [
荣怑](https://github.com/rongyi)
[πŸ€”](#ideas-rongyi "Ideas, Planning, & Feedback") | [
thebyrdman-git](https://github.com/thebyrdman-git)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Athebyrdman-git "Bug reports") | [
Clemens Mosig](http://www.mi.fu-berlin.de/en/inf/groups/ilab/members/mosig.html)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Acmosig "Bug reports") | [
Michael Rash](http://www.cipherdyne.org/)
[πŸ““](#userTesting-mrash "User Testing") | [
joelparker](https://github.com/joelparker)
[πŸ““](#userTesting-joelparker "User Testing") | [
Dragos Maftei](https://github.com/dragosmaftei)
[πŸ€”](#ideas-dragosmaftei "Ideas, Planning, & Feedback") | [
Matthew Giassa](http://www.giassa.net)
[πŸ€”](#ideas-IAXES "Ideas, Planning, & Feedback") | [
Sean Abbott](https://github.com/sean-abbott)
[πŸ“¦](#platform-sean-abbott "Packaging/porting to new platform") | [
Vincent Wang](http://www.linsong.org)
[πŸ€”](#ideas-linsong "Ideas, Planning, & Feedback") | [
piping](https://github.com/Piping)
[πŸ€”](#ideas-Piping "Ideas, Planning, & Feedback") | +| [
kevinhwang91](https://github.com/kevinhwang91)
[πŸ€”](#ideas-kevinhwang91 "Ideas, Planning, & Feedback") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Akevinhwang91 "Bug reports") | [
Justin Overfelt](https://jbo.io)
[πŸ€”](#ideas-jboverfelt "Ideas, Planning, & Feedback") | [
Anthony](https://github.com/loudsong)
[πŸ€”](#ideas-loudsong "Ideas, Planning, & Feedback") | [
basondole](https://github.com/basondole)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Abasondole "Bug reports") | [
zoulja](https://github.com/zoulja)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Azoulja "Bug reports") | [
freddii](https://github.com/freddii)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Afreddii "Bug reports") | [
Thord Setsaas](https://github.com/thordy)
[πŸ“–](https://github.com/gcla/termshark/commits?author=thordy "Documentation") | [
deliciouslytyped](https://github.com/deliciouslytyped)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adeliciouslytyped "Bug reports") | [
factorion](https://github.com/factorion)
[πŸ“¦](#platform-factorion "Packaging/porting to new platform") | [
Herby Gillot](https://github.com/herbygillot)
[πŸ“¦](#platform-herbygillot "Packaging/porting to new platform") | +| [
nmeum](https://github.com/nmeum)
[πŸ€”](#ideas-nmeum "Ideas, Planning, & Feedback") | [
Aaron Bieber](https://deftly.net)
[πŸ€”](#ideas-qbit "Ideas, Planning, & Feedback") | [
elig0n](https://github.com/elig0n)
[πŸ€”](#ideas-elig0n "Ideas, Planning, & Feedback") | ## Contact From 381d3518c1207ead2a2190b2016f361f19a73569 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 18:04:57 -0400 Subject: [PATCH 08/15] Rearrange the contributors list --- .all-contributorsrc | 2 +- README.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0e91282..04ee8fe 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6,7 +6,7 @@ "files": [ "README.md" ], - "imageSize": 72, + "imageSize": 64, "commit": false, "contributorsPerLine": 10, "commitConvention": "none", diff --git a/README.md b/README.md index d8d1adb..33f0a80 100644 --- a/README.md +++ b/README.md @@ -83,13 +83,13 @@ Thanks to everyone that's contributed ports, patches and effort! -| [
Ross Jacobs](https://swit.sh)
[πŸ’»](https://github.com/gcla/termshark/commits?author=pocc "Code") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apocc "Bug reports") [πŸ““](#userTesting-pocc "User Testing") | [
Hongarc](https://github.com/Hongarc)
[πŸ“–](https://github.com/gcla/termshark/commits?author=Hongarc "Documentation") | [
Ryan Steinmetz](https://github.com/zi0r)
[πŸ“¦](#platform-zi0r "Packaging/porting to new platform") | [
Nicolai SΓΈborg](https://sΓΈb.org/)
[πŸ“¦](#platform-NicolaiSoeborg "Packaging/porting to new platform") | [
Elliott Sales de Andrade](https://qulogic.gitlab.io/)
[πŸ’»](https://github.com/gcla/termshark/commits?author=QuLogic "Code") | [
Romanos](http://rski.github.io)
[πŸ’»](https://github.com/gcla/termshark/commits?author=rski "Code") | [
Denys](https://github.com/denyspozniak)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adenyspozniak "Bug reports") | [
jerry73204](https://github.com/jerry73204)
[πŸ“¦](#platform-jerry73204 "Packaging/porting to new platform") | [
Jon Knapp](http://thann.github.com)
[πŸ“¦](#platform-Thann "Packaging/porting to new platform") | [
Mario Harjac](https://github.com/mharjac)
[πŸ“¦](#platform-mharjac "Packaging/porting to new platform") | +| [
Ross Jacobs](https://swit.sh)
[πŸ’»](https://github.com/gcla/termshark/commits?author=pocc "Code") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apocc "Bug reports") [πŸ““](#userTesting-pocc "User Testing") | [
Hongarc](https://github.com/Hongarc)
[πŸ“–](https://github.com/gcla/termshark/commits?author=Hongarc "Documentation") | [
Ryan Steinmetz](https://github.com/zi0r)
[πŸ“¦](#platform-zi0r "Packaging/porting to new platform") | [
Nicolai SΓΈborg](https://sΓΈb.org/)
[πŸ“¦](#platform-NicolaiSoeborg "Packaging/porting to new platform") | [
Elliott Sales de Andrade](https://qulogic.gitlab.io/)
[πŸ’»](https://github.com/gcla/termshark/commits?author=QuLogic "Code") | [
Romanos](http://rski.github.io)
[πŸ’»](https://github.com/gcla/termshark/commits?author=rski "Code") | [
Denys](https://github.com/denyspozniak)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adenyspozniak "Bug reports") | [
jerry73204](https://github.com/jerry73204)
[πŸ“¦](#platform-jerry73204 "Packaging/porting to new platform") | [
Jon Knapp](http://thann.github.com)
[πŸ“¦](#platform-Thann "Packaging/porting to new platform") | [
Mario Harjac](https://github.com/mharjac)
[πŸ“¦](#platform-mharjac "Packaging/porting to new platform") | | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -| [
Andrew Benson](https://github.com/abenson)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aabenson "Bug reports") | [
sagis-tikal](https://github.com/sagis-tikal)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Asagis-tikal "Bug reports") | [
punkymaniac](https://github.com/punkymaniac)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apunkymaniac "Bug reports") | [
msenturk](https://github.com/msenturk)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amsenturk "Bug reports") | [
Sandor SzΓΌcs](https://github.com/szuecs)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aszuecs "Bug reports") | [
Dawid Dziurla](https://github.com/dawidd6)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adawidd6 "Bug reports") [πŸ“¦](#platform-dawidd6 "Packaging/porting to new platform") | [
jJit0](https://github.com/jJit0)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AjJit0 "Bug reports") | [
inzel](http://colinrogers001.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ainzel "Bug reports") | [
thejerrod](https://github.com/thejerrod)
[πŸ€”](#ideas-thejerrod "Ideas, Planning, & Feedback") | [
gdluca](https://github.com/gdluca)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agdluca "Bug reports") | -| [
Patrick Winter](https://github.com/winpat)
[πŸ“¦](#platform-winpat "Packaging/porting to new platform") | [
Robert Larsen](https://github.com/RobertLarsen)
[πŸ€”](#ideas-RobertLarsen "Ideas, Planning, & Feedback") [πŸ““](#userTesting-RobertLarsen "User Testing") | [
MinJae Kwon](https://mingrammer.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amingrammer "Bug reports") | [
the-c0d3r](https://github.com/the-c0d3r)
[πŸ€”](#ideas-the-c0d3r "Ideas, Planning, & Feedback") | [
Gisle Vanem](https://github.com/gvanem)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agvanem "Bug reports") | [
hook](https://github.com/hook-s3c)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ahook-s3c "Bug reports") | [
Lennart Koopmann](https://twitter.com/_lennart)
[πŸ€”](#ideas-lennartkoopmann "Ideas, Planning, & Feedback") | [
Fernandez, ReK2](https://keybase.io/cfernandez)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AReK2Fernandez "Bug reports") | [
mazball](https://github.com/mazball)
[πŸ€”](#ideas-mazball "Ideas, Planning, & Feedback") | [
wfailla](https://github.com/wfailla)
[πŸ€”](#ideas-wfailla "Ideas, Planning, & Feedback") | -| [
荣怑](https://github.com/rongyi)
[πŸ€”](#ideas-rongyi "Ideas, Planning, & Feedback") | [
thebyrdman-git](https://github.com/thebyrdman-git)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Athebyrdman-git "Bug reports") | [
Clemens Mosig](http://www.mi.fu-berlin.de/en/inf/groups/ilab/members/mosig.html)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Acmosig "Bug reports") | [
Michael Rash](http://www.cipherdyne.org/)
[πŸ““](#userTesting-mrash "User Testing") | [
joelparker](https://github.com/joelparker)
[πŸ““](#userTesting-joelparker "User Testing") | [
Dragos Maftei](https://github.com/dragosmaftei)
[πŸ€”](#ideas-dragosmaftei "Ideas, Planning, & Feedback") | [
Matthew Giassa](http://www.giassa.net)
[πŸ€”](#ideas-IAXES "Ideas, Planning, & Feedback") | [
Sean Abbott](https://github.com/sean-abbott)
[πŸ“¦](#platform-sean-abbott "Packaging/porting to new platform") | [
Vincent Wang](http://www.linsong.org)
[πŸ€”](#ideas-linsong "Ideas, Planning, & Feedback") | [
piping](https://github.com/Piping)
[πŸ€”](#ideas-Piping "Ideas, Planning, & Feedback") | -| [
kevinhwang91](https://github.com/kevinhwang91)
[πŸ€”](#ideas-kevinhwang91 "Ideas, Planning, & Feedback") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Akevinhwang91 "Bug reports") | [
Justin Overfelt](https://jbo.io)
[πŸ€”](#ideas-jboverfelt "Ideas, Planning, & Feedback") | [
Anthony](https://github.com/loudsong)
[πŸ€”](#ideas-loudsong "Ideas, Planning, & Feedback") | [
basondole](https://github.com/basondole)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Abasondole "Bug reports") | [
zoulja](https://github.com/zoulja)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Azoulja "Bug reports") | [
freddii](https://github.com/freddii)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Afreddii "Bug reports") | [
Thord Setsaas](https://github.com/thordy)
[πŸ“–](https://github.com/gcla/termshark/commits?author=thordy "Documentation") | [
deliciouslytyped](https://github.com/deliciouslytyped)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adeliciouslytyped "Bug reports") | [
factorion](https://github.com/factorion)
[πŸ“¦](#platform-factorion "Packaging/porting to new platform") | [
Herby Gillot](https://github.com/herbygillot)
[πŸ“¦](#platform-herbygillot "Packaging/porting to new platform") | -| [
nmeum](https://github.com/nmeum)
[πŸ€”](#ideas-nmeum "Ideas, Planning, & Feedback") | [
Aaron Bieber](https://deftly.net)
[πŸ€”](#ideas-qbit "Ideas, Planning, & Feedback") | [
elig0n](https://github.com/elig0n)
[πŸ€”](#ideas-elig0n "Ideas, Planning, & Feedback") | +| [
Andrew Benson](https://github.com/abenson)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aabenson "Bug reports") | [
sagis-tikal](https://github.com/sagis-tikal)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Asagis-tikal "Bug reports") | [
punkymaniac](https://github.com/punkymaniac)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apunkymaniac "Bug reports") | [
msenturk](https://github.com/msenturk)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amsenturk "Bug reports") | [
Sandor SzΓΌcs](https://github.com/szuecs)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aszuecs "Bug reports") | [
Dawid Dziurla](https://github.com/dawidd6)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adawidd6 "Bug reports") [πŸ“¦](#platform-dawidd6 "Packaging/porting to new platform") | [
jJit0](https://github.com/jJit0)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AjJit0 "Bug reports") | [
inzel](http://colinrogers001.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ainzel "Bug reports") | [
thejerrod](https://github.com/thejerrod)
[πŸ€”](#ideas-thejerrod "Ideas, Planning, & Feedback") | [
gdluca](https://github.com/gdluca)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agdluca "Bug reports") | +| [
Patrick Winter](https://github.com/winpat)
[πŸ“¦](#platform-winpat "Packaging/porting to new platform") | [
Robert Larsen](https://github.com/RobertLarsen)
[πŸ€”](#ideas-RobertLarsen "Ideas, Planning, & Feedback") [πŸ““](#userTesting-RobertLarsen "User Testing") | [
MinJae Kwon](https://mingrammer.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amingrammer "Bug reports") | [
the-c0d3r](https://github.com/the-c0d3r)
[πŸ€”](#ideas-the-c0d3r "Ideas, Planning, & Feedback") | [
Gisle Vanem](https://github.com/gvanem)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agvanem "Bug reports") | [
hook](https://github.com/hook-s3c)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ahook-s3c "Bug reports") | [
Lennart Koopmann](https://twitter.com/_lennart)
[πŸ€”](#ideas-lennartkoopmann "Ideas, Planning, & Feedback") | [
Fernandez, ReK2](https://keybase.io/cfernandez)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AReK2Fernandez "Bug reports") | [
mazball](https://github.com/mazball)
[πŸ€”](#ideas-mazball "Ideas, Planning, & Feedback") | [
wfailla](https://github.com/wfailla)
[πŸ€”](#ideas-wfailla "Ideas, Planning, & Feedback") | +| [
荣怑](https://github.com/rongyi)
[πŸ€”](#ideas-rongyi "Ideas, Planning, & Feedback") | [
thebyrdman-git](https://github.com/thebyrdman-git)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Athebyrdman-git "Bug reports") | [
Clemens Mosig](http://www.mi.fu-berlin.de/en/inf/groups/ilab/members/mosig.html)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Acmosig "Bug reports") | [
Michael Rash](http://www.cipherdyne.org/)
[πŸ““](#userTesting-mrash "User Testing") | [
joelparker](https://github.com/joelparker)
[πŸ““](#userTesting-joelparker "User Testing") | [
Dragos Maftei](https://github.com/dragosmaftei)
[πŸ€”](#ideas-dragosmaftei "Ideas, Planning, & Feedback") | [
Matthew Giassa](http://www.giassa.net)
[πŸ€”](#ideas-IAXES "Ideas, Planning, & Feedback") | [
Sean Abbott](https://github.com/sean-abbott)
[πŸ“¦](#platform-sean-abbott "Packaging/porting to new platform") | [
Vincent Wang](http://www.linsong.org)
[πŸ€”](#ideas-linsong "Ideas, Planning, & Feedback") | [
piping](https://github.com/Piping)
[πŸ€”](#ideas-Piping "Ideas, Planning, & Feedback") | +| [
kevinhwang91](https://github.com/kevinhwang91)
[πŸ€”](#ideas-kevinhwang91 "Ideas, Planning, & Feedback") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Akevinhwang91 "Bug reports") | [
Justin Overfelt](https://jbo.io)
[πŸ€”](#ideas-jboverfelt "Ideas, Planning, & Feedback") | [
Anthony](https://github.com/loudsong)
[πŸ€”](#ideas-loudsong "Ideas, Planning, & Feedback") | [
basondole](https://github.com/basondole)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Abasondole "Bug reports") | [
zoulja](https://github.com/zoulja)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Azoulja "Bug reports") | [
freddii](https://github.com/freddii)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Afreddii "Bug reports") | [
Thord Setsaas](https://github.com/thordy)
[πŸ“–](https://github.com/gcla/termshark/commits?author=thordy "Documentation") | [
deliciouslytyped](https://github.com/deliciouslytyped)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adeliciouslytyped "Bug reports") | [
factorion](https://github.com/factorion)
[πŸ“¦](#platform-factorion "Packaging/porting to new platform") | [
Herby Gillot](https://github.com/herbygillot)
[πŸ“¦](#platform-herbygillot "Packaging/porting to new platform") | +| [
nmeum](https://github.com/nmeum)
[πŸ€”](#ideas-nmeum "Ideas, Planning, & Feedback") | [
Aaron Bieber](https://deftly.net)
[πŸ€”](#ideas-qbit "Ideas, Planning, & Feedback") | [
elig0n](https://github.com/elig0n)
[πŸ€”](#ideas-elig0n "Ideas, Planning, & Feedback") | ## Contact From 114fa1a255bd74fcb8a1701ef3b89e0dd16da7e4 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 18:09:19 -0400 Subject: [PATCH 09/15] Update after refreshing the all-contributors npm module --- README.md | 81 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 33f0a80..aa172a6 100644 --- a/README.md +++ b/README.md @@ -82,14 +82,79 @@ Note that tshark is a run-time dependency, and must be in your ```PATH``` for te Thanks to everyone that's contributed ports, patches and effort! - -| [
Ross Jacobs](https://swit.sh)
[πŸ’»](https://github.com/gcla/termshark/commits?author=pocc "Code") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apocc "Bug reports") [πŸ““](#userTesting-pocc "User Testing") | [
Hongarc](https://github.com/Hongarc)
[πŸ“–](https://github.com/gcla/termshark/commits?author=Hongarc "Documentation") | [
Ryan Steinmetz](https://github.com/zi0r)
[πŸ“¦](#platform-zi0r "Packaging/porting to new platform") | [
Nicolai SΓΈborg](https://sΓΈb.org/)
[πŸ“¦](#platform-NicolaiSoeborg "Packaging/porting to new platform") | [
Elliott Sales de Andrade](https://qulogic.gitlab.io/)
[πŸ’»](https://github.com/gcla/termshark/commits?author=QuLogic "Code") | [
Romanos](http://rski.github.io)
[πŸ’»](https://github.com/gcla/termshark/commits?author=rski "Code") | [
Denys](https://github.com/denyspozniak)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adenyspozniak "Bug reports") | [
jerry73204](https://github.com/jerry73204)
[πŸ“¦](#platform-jerry73204 "Packaging/porting to new platform") | [
Jon Knapp](http://thann.github.com)
[πŸ“¦](#platform-Thann "Packaging/porting to new platform") | [
Mario Harjac](https://github.com/mharjac)
[πŸ“¦](#platform-mharjac "Packaging/porting to new platform") | -| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -| [
Andrew Benson](https://github.com/abenson)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aabenson "Bug reports") | [
sagis-tikal](https://github.com/sagis-tikal)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Asagis-tikal "Bug reports") | [
punkymaniac](https://github.com/punkymaniac)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Apunkymaniac "Bug reports") | [
msenturk](https://github.com/msenturk)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amsenturk "Bug reports") | [
Sandor SzΓΌcs](https://github.com/szuecs)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Aszuecs "Bug reports") | [
Dawid Dziurla](https://github.com/dawidd6)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adawidd6 "Bug reports") [πŸ“¦](#platform-dawidd6 "Packaging/porting to new platform") | [
jJit0](https://github.com/jJit0)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AjJit0 "Bug reports") | [
inzel](http://colinrogers001.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ainzel "Bug reports") | [
thejerrod](https://github.com/thejerrod)
[πŸ€”](#ideas-thejerrod "Ideas, Planning, & Feedback") | [
gdluca](https://github.com/gdluca)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agdluca "Bug reports") | -| [
Patrick Winter](https://github.com/winpat)
[πŸ“¦](#platform-winpat "Packaging/porting to new platform") | [
Robert Larsen](https://github.com/RobertLarsen)
[πŸ€”](#ideas-RobertLarsen "Ideas, Planning, & Feedback") [πŸ““](#userTesting-RobertLarsen "User Testing") | [
MinJae Kwon](https://mingrammer.com)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Amingrammer "Bug reports") | [
the-c0d3r](https://github.com/the-c0d3r)
[πŸ€”](#ideas-the-c0d3r "Ideas, Planning, & Feedback") | [
Gisle Vanem](https://github.com/gvanem)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Agvanem "Bug reports") | [
hook](https://github.com/hook-s3c)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Ahook-s3c "Bug reports") | [
Lennart Koopmann](https://twitter.com/_lennart)
[πŸ€”](#ideas-lennartkoopmann "Ideas, Planning, & Feedback") | [
Fernandez, ReK2](https://keybase.io/cfernandez)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3AReK2Fernandez "Bug reports") | [
mazball](https://github.com/mazball)
[πŸ€”](#ideas-mazball "Ideas, Planning, & Feedback") | [
wfailla](https://github.com/wfailla)
[πŸ€”](#ideas-wfailla "Ideas, Planning, & Feedback") | -| [
荣怑](https://github.com/rongyi)
[πŸ€”](#ideas-rongyi "Ideas, Planning, & Feedback") | [
thebyrdman-git](https://github.com/thebyrdman-git)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Athebyrdman-git "Bug reports") | [
Clemens Mosig](http://www.mi.fu-berlin.de/en/inf/groups/ilab/members/mosig.html)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Acmosig "Bug reports") | [
Michael Rash](http://www.cipherdyne.org/)
[πŸ““](#userTesting-mrash "User Testing") | [
joelparker](https://github.com/joelparker)
[πŸ““](#userTesting-joelparker "User Testing") | [
Dragos Maftei](https://github.com/dragosmaftei)
[πŸ€”](#ideas-dragosmaftei "Ideas, Planning, & Feedback") | [
Matthew Giassa](http://www.giassa.net)
[πŸ€”](#ideas-IAXES "Ideas, Planning, & Feedback") | [
Sean Abbott](https://github.com/sean-abbott)
[πŸ“¦](#platform-sean-abbott "Packaging/porting to new platform") | [
Vincent Wang](http://www.linsong.org)
[πŸ€”](#ideas-linsong "Ideas, Planning, & Feedback") | [
piping](https://github.com/Piping)
[πŸ€”](#ideas-Piping "Ideas, Planning, & Feedback") | -| [
kevinhwang91](https://github.com/kevinhwang91)
[πŸ€”](#ideas-kevinhwang91 "Ideas, Planning, & Feedback") [πŸ›](https://github.com/gcla/termshark/issues?q=author%3Akevinhwang91 "Bug reports") | [
Justin Overfelt](https://jbo.io)
[πŸ€”](#ideas-jboverfelt "Ideas, Planning, & Feedback") | [
Anthony](https://github.com/loudsong)
[πŸ€”](#ideas-loudsong "Ideas, Planning, & Feedback") | [
basondole](https://github.com/basondole)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Abasondole "Bug reports") | [
zoulja](https://github.com/zoulja)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Azoulja "Bug reports") | [
freddii](https://github.com/freddii)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Afreddii "Bug reports") | [
Thord Setsaas](https://github.com/thordy)
[πŸ“–](https://github.com/gcla/termshark/commits?author=thordy "Documentation") | [
deliciouslytyped](https://github.com/deliciouslytyped)
[πŸ›](https://github.com/gcla/termshark/issues?q=author%3Adeliciouslytyped "Bug reports") | [
factorion](https://github.com/factorion)
[πŸ“¦](#platform-factorion "Packaging/porting to new platform") | [
Herby Gillot](https://github.com/herbygillot)
[πŸ“¦](#platform-herbygillot "Packaging/porting to new platform") | -| [
nmeum](https://github.com/nmeum)
[πŸ€”](#ideas-nmeum "Ideas, Planning, & Feedback") | [
Aaron Bieber](https://deftly.net)
[πŸ€”](#ideas-qbit "Ideas, Planning, & Feedback") | [
elig0n](https://github.com/elig0n)
[πŸ€”](#ideas-elig0n "Ideas, Planning, & Feedback") | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Ross Jacobs
πŸ’» πŸ› πŸ““
Hongarc
πŸ“–
Ryan Steinmetz
πŸ“¦
Nicolai SΓΈborg
πŸ“¦
Elliott Sales de Andrade
πŸ’»
Romanos
πŸ’»
Denys
πŸ›
jerry73204
πŸ“¦
Jon Knapp
πŸ“¦
Mario Harjac
πŸ“¦

Andrew Benson
πŸ›
sagis-tikal
πŸ›
punkymaniac
πŸ›
msenturk
πŸ›
Sandor SzΓΌcs
πŸ›
Dawid Dziurla
πŸ› πŸ“¦
jJit0
πŸ›
inzel
πŸ›
thejerrod
πŸ€”
gdluca
πŸ›

Patrick Winter
πŸ“¦
Robert Larsen
πŸ€” πŸ““
MinJae Kwon
πŸ›
the-c0d3r
πŸ€”
Gisle Vanem
πŸ›
hook
πŸ›
Lennart Koopmann
πŸ€”
Fernandez, ReK2
πŸ›
mazball
πŸ€”
wfailla
πŸ€”

荣怑
πŸ€”
thebyrdman-git
πŸ›
Clemens Mosig
πŸ›
Michael Rash
πŸ““
joelparker
πŸ““
Dragos Maftei
πŸ€”
Matthew Giassa
πŸ€”
Sean Abbott
πŸ“¦
Vincent Wang
πŸ€”
piping
πŸ€”

kevinhwang91
πŸ€” πŸ›
Justin Overfelt
πŸ€”
Anthony
πŸ€”
basondole
πŸ›
zoulja
πŸ›
freddii
πŸ›
Thord Setsaas
πŸ“–
deliciouslytyped
πŸ›
factorion
πŸ“¦
Herby Gillot
πŸ“¦

nmeum
πŸ€”
Aaron Bieber
πŸ€”
elig0n
πŸ€”
+ + + + ## Contact From 34bcfe2b0a7da7e4ee91b2f031833db8c66321f4 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 18:12:14 -0400 Subject: [PATCH 10/15] Go back to contributor defaults! I can't arrange things any more neatly than the defaults provide... --- .all-contributorsrc | 4 +- README.md | 110 +++++++++++++++++++++++--------------------- 2 files changed, 59 insertions(+), 55 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 04ee8fe..d0793ea 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6,9 +6,9 @@ "files": [ "README.md" ], - "imageSize": 64, + "imageSize": 100, "commit": false, - "contributorsPerLine": 10, + "contributorsPerLine": 7, "commitConvention": "none", "contributors": [ { diff --git a/README.md b/README.md index aa172a6..786bdbd 100644 --- a/README.md +++ b/README.md @@ -86,69 +86,73 @@ Thanks to everyone that's contributed ports, patches and effort! - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + +

Ross Jacobs
πŸ’» πŸ› πŸ““
Hongarc
πŸ“–
Ryan Steinmetz
πŸ“¦
Nicolai SΓΈborg
πŸ“¦
Elliott Sales de Andrade
πŸ’»
Romanos
πŸ’»
Denys
πŸ›
jerry73204
πŸ“¦
Jon Knapp
πŸ“¦
Mario Harjac
πŸ“¦
Ross Jacobs
πŸ’» πŸ› πŸ““
Hongarc
πŸ“–
Ryan Steinmetz
πŸ“¦
Nicolai SΓΈborg
πŸ“¦
Elliott Sales de Andrade
πŸ’»
Romanos
πŸ’»
Denys
πŸ›

Andrew Benson
πŸ›
sagis-tikal
πŸ›
punkymaniac
πŸ›
msenturk
πŸ›
Sandor SzΓΌcs
πŸ›
Dawid Dziurla
πŸ› πŸ“¦
jJit0
πŸ›
inzel
πŸ›
thejerrod
πŸ€”
gdluca
πŸ›
jerry73204
πŸ“¦
Jon Knapp
πŸ“¦
Mario Harjac
πŸ“¦
Andrew Benson
πŸ›
sagis-tikal
πŸ›
punkymaniac
πŸ›
msenturk
πŸ›

Patrick Winter
πŸ“¦
Robert Larsen
πŸ€” πŸ““
MinJae Kwon
πŸ›
the-c0d3r
πŸ€”
Gisle Vanem
πŸ›
hook
πŸ›
Lennart Koopmann
πŸ€”
Fernandez, ReK2
πŸ›
mazball
πŸ€”
wfailla
πŸ€”
Sandor SzΓΌcs
πŸ›
Dawid Dziurla
πŸ› πŸ“¦
jJit0
πŸ›
inzel
πŸ›
thejerrod
πŸ€”
gdluca
πŸ›
Patrick Winter
πŸ“¦

荣怑
πŸ€”
thebyrdman-git
πŸ›
Clemens Mosig
πŸ›
Michael Rash
πŸ““
joelparker
πŸ““
Dragos Maftei
πŸ€”
Matthew Giassa
πŸ€”
Sean Abbott
πŸ“¦
Vincent Wang
πŸ€”
piping
πŸ€”
Robert Larsen
πŸ€” πŸ““
MinJae Kwon
πŸ›
the-c0d3r
πŸ€”
Gisle Vanem
πŸ›
hook
πŸ›
Lennart Koopmann
πŸ€”
Fernandez, ReK2
πŸ›

kevinhwang91
πŸ€” πŸ›
Justin Overfelt
πŸ€”
Anthony
πŸ€”
basondole
πŸ›
zoulja
πŸ›
freddii
πŸ›
Thord Setsaas
πŸ“–
deliciouslytyped
πŸ›
factorion
πŸ“¦
Herby Gillot
πŸ“¦
mazball
πŸ€”
wfailla
πŸ€”
荣怑
πŸ€”
thebyrdman-git
πŸ›
Clemens Mosig
πŸ›
Michael Rash
πŸ““
joelparker
πŸ““

nmeum
πŸ€”
Aaron Bieber
πŸ€”
elig0n
πŸ€”
Dragos Maftei
πŸ€”
Matthew Giassa
πŸ€”
Sean Abbott
πŸ“¦
Vincent Wang
πŸ€”
piping
πŸ€”
kevinhwang91
πŸ€” πŸ›
Justin Overfelt
πŸ€”

Anthony
πŸ€”
basondole
πŸ›
zoulja
πŸ›
freddii
πŸ›
Thord Setsaas
πŸ“–
deliciouslytyped
πŸ›
factorion
πŸ“¦

Herby Gillot
πŸ“¦
nmeum
πŸ€”
Aaron Bieber
πŸ€”
elig0n
πŸ€”
From 57f90d0330e354990fe0f90a501571585fa156f5 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 3 Jul 2022 18:19:37 -0400 Subject: [PATCH 11/15] Make current the arch linux install instructions --- docs/Packages.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/Packages.md b/docs/Packages.md index 1741c89..be64515 100644 --- a/docs/Packages.md +++ b/docs/Packages.md @@ -4,9 +4,8 @@ Here's how to install termshark on various OSes and with various package manager ## Arch Linux -- [termshark-bin](https://aur.archlinux.org/packages/termshark-bin): binary - package which simply copies the released binary to install directory. Made by - [jerry73204](https://github.com/jerry73204) +- [termshark](https://archlinux.org/packages/community/x86_64/termshark/): The + official package. - [termshark-git](https://aur.archlinux.org/packages/termshark-git): Compiles from source, made by [Thann](https://github.com/Thann) From 1ac3107fc207c694f5e4634d3aef215449b1b64c Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Mon, 4 Jul 2022 19:46:03 -0400 Subject: [PATCH 12/15] Update the What's Next section --- docs/FAQ.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index 4560a83..e6e59ff 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -445,9 +445,10 @@ As much as possible, I want termshark to work "right out of the box", and to me ## What's next? -Termshark v2 implemented stream reassembly, a "What's next" feature from v1. For Termshark v3, some possibilities are: +As I write this, I'm about to release termshark v2.4. Here's what might come in v2.5 and beyond: +- Built-in support for editing packet color profiles - Expose many more of tshark's `-z` options - HTTP statistics and Wireshark's I/O graph - Allow the user to start reading from available interfaces once the UI has started -- And since tshark can be customized via the TOML config file, don't be so trusting of its output - there are surely bugs lurking here +- Anything you raise on Github issues - let me know what features you'd like! From 256c57432418ee4af15019cd9c20a05c6c415910 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sat, 9 Jul 2022 21:03:48 -0400 Subject: [PATCH 13/15] Improve the one-line explanation of v2.4 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 786bdbd..2dc3085 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Termshark A terminal user-interface for tshark, inspired by Wireshark. -**V2.4 is out now with packet search and profiles! See the [ChangeLog](CHANGELOG.md#changelog).** +**V2.4 is out now with packet search and profiles for colors and columns! See the [ChangeLog](CHANGELOG.md#changelog).** ![demo21](/../gh-pages/images/demo21.png?raw=true) From c29398b02ea9cdbf6d39b86930179b1d205c7d32 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Sun, 10 Jul 2022 23:57:47 -0400 Subject: [PATCH 14/15] Test out an updated demo animated gif --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2dc3085..7c515d9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A terminal user-interface for tshark, inspired by Wireshark. **V2.4 is out now with packet search and profiles for colors and columns! See the [ChangeLog](CHANGELOG.md#changelog).** -![demo21](/../gh-pages/images/demo21.png?raw=true) +![demo24](/../gh-pages/images/demo4.gif?raw=true) If you're debugging on a remote machine with a large pcap and no desire to scp it back to your desktop, termshark can help! From f7f929d46ac5b113c6f1320ca0788b94b01d45a6 Mon Sep 17 00:00:00 2001 From: Graham Clark Date: Mon, 11 Jul 2022 00:02:31 -0400 Subject: [PATCH 15/15] Optimistically update the ChangeLog for the v2.4 release date --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1572e7e..3c54b68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # Changelog -## [Unreleased] - +## [2.4.0] - 2022-07-11 ### Added - You can now search for information in packets, in similar fashion to Wireshark's packet search. Hit `ctrl-f`