summaryrefslogtreecommitdiff
path: root/tcpdump.c
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2020-08-06 19:12:49 +0200
committerFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2020-08-06 22:55:05 +0200
commitb30f3843b93c11e897e6d8888a91abf709a716ae (patch)
treef896ae7aeb0b456076d21243c3d130bedbeaf75b /tcpdump.c
parent0c93b15d38b3f63047344fcb2ea920e73498bb3d (diff)
downloadtcpdump-b30f3843b93c11e897e6d8888a91abf709a716ae.tar.gz
Apply the last step of the new way to update the link-layer header length
All the link-layer dissectors are now void functions. All the functions were moved to the void_printers[] array. Rename this array to printers[]. Remove the uint_printers[] array, now empty. Remove the 'ndo_void_printer' flag field, now useless, from netdissect_options. Remove other transitional code.
Diffstat (limited to 'tcpdump.c')
-rw-r--r--tcpdump.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tcpdump.c b/tcpdump.c
index 1aa285e3..939df0b4 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -2410,7 +2410,7 @@ DIAG_ON_CLANG(assign-enum)
}
if (print) {
dlt = pcap_datalink(pd);
- ndo->ndo_if_printer = get_if_printer(ndo, dlt);
+ ndo->ndo_if_printer = get_if_printer(dlt);
dumpinfo.ndo = ndo;
} else
dumpinfo.ndo = NULL;
@@ -2421,7 +2421,7 @@ DIAG_ON_CLANG(assign-enum)
#endif
} else {
dlt = pcap_datalink(pd);
- ndo->ndo_if_printer = get_if_printer(ndo, dlt);
+ ndo->ndo_if_printer = get_if_printer(dlt);
callback = print_packet;
pcap_userdata = (u_char *)ndo;
}
@@ -2594,7 +2594,7 @@ DIAG_ON_CLANG(assign-enum)
* the new DLT.
*/
dlt = new_dlt;
- ndo->ndo_if_printer = get_if_printer(ndo, dlt);
+ ndo->ndo_if_printer = get_if_printer(dlt);
if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
error("%s", pcap_geterr(pd));
}