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

Bug #837 - handle IPv6 fragment extension header #838

Merged
merged 6 commits into from
Dec 26, 2023
Merged

Bug #837 - handle IPv6 fragment extension header #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd324f5
Handle IPv6 fragment extension header
ChuckCottrill Nov 29, 2023
58f935e
check for NULL ptr
ChuckCottrill Dec 12, 2023
c4ee66d
resolve warning
ChuckCottrill Dec 14, 2023
a591bf7
revise comparison to match rest of code
ChuckCottrill Dec 16, 2023
d60b917
Merge pull request #832 from ChuckCottrill/fix/831-ipv6-fragment
fklassen Dec 26, 2023
6b5131d
Bug #837 - update CHANGELOG and CREDIT
fklassen Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
09/03/2023 Version 4.5.0-beta1
- handle IPv6 fragment extension header (#832 #837)
- low PPS values run at full speed after several days (#779)
- create DLT_LINUX_SLL2 plugin (#727)

Expand Down
2 changes: 2 additions & 0 deletions docs/CREDIT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,5 @@ David Guti <GitHub @david-guti>

Bastian Triller <GitHub @btriller>
- Linux SLL2

Chuck Cottrill <GitHub @ChuckCottrill>
18 changes: 17 additions & 1 deletion src/common/get.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,9 +601,25 @@ get_layer4_v6(const ipv6_hdr_t *ip6_hdr, const u_char *end_ptr)
break;

/*
* Can't handle. Unparsable IPv6 fragment/encrypted data
* handle (unparsable) IPv6 fragment data
*/
case TCPR_IPV6_NH_FRAGMENT:
// next points to l4 data
dbgx(3, "Go deeper due to fragment extension header 0x%02X", proto);
exthdr = get_ipv6_next(next, end_ptr);
if ((exthdr == NULL) || ((u_char *)exthdr > end_ptr)) {
next = NULL;
done = true;
break;
}
proto = exthdr->ip_nh;
next = exthdr;
// done = true;
break;

/*
* Can't handle. Unparsable IPv6 encrypted data
*/
case TCPR_IPV6_NH_ESP:
next = NULL;
done = true;
Expand Down