Skip to content

OTV: Remove protocol decoding #1369

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

Merged
merged 1 commit into from
Oct 8, 2025
Merged

OTV: Remove protocol decoding #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group

DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
Summary for 4.99.6 tcpdump release (so far!)
Remove protocol decoding for:
OTV (draft-hasmit-otv-04, this Internet-Draft is no longer active).
Refine protocol decoding for:
DNS: Use ND_TCHECK_LEN() instead of a custom bounds check.
IPv6: Add a missing comma and remove a colon in the output.
Expand All @@ -107,6 +109,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
NTP: Update a field name with the RFC 5905 name (Origin Timestamp).
IPv6 mobility: Modernize packet parsing and make fixes.
IP6OPTS: Modernize packet parsing and make fixes.
VXLAN: Add UDP port 8472 used by Linux as the default port.
User interface:
Add optional unit suffix on -C file size.
Improve the handling of size suffixes for -C.
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,6 @@ set(NETDISSECT_SOURCE_LIST_C
print-openflow.c
print-ospf.c
print-ospf6.c
print-otv.c
print-pflog.c
print-pgm.c
print-pim.c
Expand Down
1 change: 0 additions & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ LIBNETDISSECT_SRC=\
print-openflow.c \
print-ospf.c \
print-ospf6.c \
print-otv.c \
print-pflog.c \
print-pgm.c \
print-pim.c \
Expand Down
1 change: 0 additions & 1 deletion netdissect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,6 @@ extern void ospf6_print(netdissect_options *, const u_char *, u_int);
extern int ospf_grace_lsa_print(netdissect_options *, const u_char *, u_int);
extern void ospf_print(netdissect_options *, const u_char *, u_int, const u_char *);
extern int ospf_te_lsa_print(netdissect_options *, const u_char *, u_int);
extern void otv_print(netdissect_options *, const u_char *, u_int);
extern void pgm_print(netdissect_options *, const u_char *, u_int, const u_char *);
extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *);
extern void pimv1_print(netdissect_options *, const u_char *, u_int);
Expand Down
74 changes: 0 additions & 74 deletions print-otv.c
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions print-udp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,8 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
lwapp_data_print(ndo, cp, length);
else if (IS_SRC_OR_DST_PORT(SIP_PORT))
sip_print(ndo, cp, length);
else if (IS_SRC_OR_DST_PORT(OTV_PORT))
otv_print(ndo, cp, length);
else if (IS_SRC_OR_DST_PORT(VXLAN_LINUX_PORT))
vxlan_print(ndo, cp, length);
else if (IS_SRC_OR_DST_PORT(VXLAN_PORT))
vxlan_print(ndo, cp, length);
else if (dport == GENEVE_PORT)
Expand Down
2 changes: 0 additions & 2 deletions tests/TESTLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,8 +668,6 @@ relts-0x80000000 relts-0x80000000.pcap relts-0x80000000.out -v
# bad packets from Brian Carpenter
ipv6hdr-heapoverflow ipv6hdr-heapoverflow.pcap ipv6hdr-heapoverflow.out
ipv6hdr-heapoverflow-v ipv6hdr-heapoverflow.pcap ipv6hdr-heapoverflow-v.out -v
otv-heapoverflow-1 otv-heapoverflow-1.pcap otv-heapoverflow-1.out
otv-heapoverflow-2 otv-heapoverflow-2.pcap otv-heapoverflow-2.out
q933-heapoverflow-2 q933-heapoverflow-2.pcap q933-heapoverflow-2.out
atm-heapoverflow atm-heapoverflow.pcap atm-heapoverflow.out -e
ipv6-next-header-oobr-1 ipv6-next-header-oobr-1.pcap ipv6-next-header-oobr-1.out
Expand Down
10 changes: 0 additions & 10 deletions tests/otv-heapoverflow-1.out
View file
Open in desktop

This file was deleted.

Binary file removed tests/otv-heapoverflow-1.pcap
View file
Open in desktop
Binary file not shown.
11 changes: 0 additions & 11 deletions tests/otv-heapoverflow-2.out
View file
Open in desktop

This file was deleted.

Binary file removed tests/otv-heapoverflow-2.pcap
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions udp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ struct udphdr {
#ifndef HNCP_PORT
#define HNCP_PORT 8231 /* RFC 7788 */
#endif
#ifndef OTV_PORT
#define OTV_PORT 8472 /* draft-hasmit-otv-04 */
#ifndef VXLAN_LINUX_PORT
#define VXLAN_LINUX_PORT 8472 /* Linux, drivers/net/vxlan/vxlan_core.c */
#endif
#ifndef ISAKMP_PORT_USER2
#define ISAKMP_PORT_USER2 8500 /*XXX - nonstandard*/
Expand Down