Report usage of unsupported display filter protocol #693
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KimiNewt
reviewed
Jul 20, 2024
| @@ -344,6 +357,17 @@ async def _get_tshark_process(self, packet_count=None, stdin=None): | |||
| parameters = [self._get_tshark_path(), "-l", "-n", "-T", output_type] + \ | |||
| self.get_parameters(packet_count=packet_count) + output_parameters | |||
|
|
|||
| if not tshark_supports_protocol(self._display_filter): | |||
| suggestions = "or".join(self._suggest_protocol_name(self._display_filter)) | |||
| if (suggestions == ""): | |||
| suggestions = "or".join(self._suggest_protocol_name(self._display_filter)) | ||
| if (suggestions == ""): | ||
| raise TSharkProtocolNotSupportedException( | ||
| f"Protocol {self._display_filter} is not supported by TShark. " + \ |
There was a problem hiding this comment.
No need for the + \ here, it'll be concatenated anyway
| @@ -344,6 +357,17 @@ async def _get_tshark_process(self, packet_count=None, stdin=None): | |||
| parameters = [self._get_tshark_path(), "-l", "-n", "-T", output_type] + \ | |||
| self.get_parameters(packet_count=packet_count) + output_parameters | |||
|
|
|||
| if not tshark_supports_protocol(self._display_filter): | |||
There was a problem hiding this comment.
TBH this seems like overkill to check it every time we get the process, since it'll only fail very rarely. Maybe we can check it on a crash to explain it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #692