Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore VLAN tags in PCAP import #650

Merged
merged 5 commits into from
Nov 18, 2019
Merged

Ignore VLAN tags in PCAP import #650

merged 5 commits into from
Nov 18, 2019

Conversation

mavam
Copy link
Member

@mavam mavam commented Nov 16, 2019 •
edited
Loading

This PR fixes failing PCAP import when the traces contain VLAN tags.

For now, we just strip the tags. We might expose them as packet data in the future.

@mavam mavam added the bug Incorrect behavior label Nov 16, 2019
@mavam mavam requested a review from a team November 17, 2019 13:22
@mavam mavam marked this pull request as ready for review November 17, 2019 13:22
@mavam mavam changed the title Ignore VLAN/802.1Q tags in PCAP import Ignore VLAN tags in PCAP import Nov 17, 2019
dominiklohmann
dominiklohmann approved these changes Nov 18, 2019
View reviewed changes
Copy link
Member

@dominiklohmann dominiklohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a solid, flexible implementation. 👍

@mavam
Copy link
Member Author

mavam commented Nov 18, 2019

The only question I have is: should this be a bugfix or a feature? 🙂

@dominiklohmann
Copy link
Member

I'd say this is a bugfix.

@mavam mavam merged commit 87193bd into master Nov 18, 2019
@mavam mavam deleted the story/ch10004 branch November 18, 2019 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dominiklohmann dominiklohmann dominiklohmann approved these changes

Assignees
No one assigned
Labels
bug Incorrect behavior
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mavam @dominiklohmann