diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-03-10 13:25:52 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-03-10 13:25:52 -0700 |
| commit | 4405f138044178bf9756cbb8712d086aaaafcaed (patch) | |
| tree | dee5f82b4d0b63d96f07568dda6cb5a18e5b9096 /print-pktap.c | |
| parent | d83a284abc80d3d09f6bddd087760bb1b01d9cc7 (diff) | |
| download | tcpdump-4405f138044178bf9756cbb8712d086aaaafcaed.tar.gz | |
Get rid of support for non-NDOified printers.
Remove the TTEST{2}/TCHECK{2} macros. Rename all "ndo_printer" routines,
structures, and structure members to just "printer", and get rid of the
old routines/structures/structure members with those names.
Diffstat (limited to 'print-pktap.c')
| -rw-r--r-- | print-pktap.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/print-pktap.c b/print-pktap.c index 46a187de..e376cc6e 100644 --- a/print-pktap.c +++ b/print-pktap.c @@ -99,8 +99,7 @@ pktap_if_print(netdissect_options *ndo, uint32_t dlt, hdrlen, rectype; u_int caplen = h->caplen; u_int length = h->len; - if_ndo_printer ndo_printer; - if_printer printer; + if_printer printer; pktap_header_t *hdr; if (caplen < sizeof(pktap_header_t) || length < sizeof(pktap_header_t)) { @@ -142,9 +141,7 @@ pktap_if_print(netdissect_options *ndo, case PKT_REC_PACKET: if ((printer = lookup_printer(dlt)) != NULL) { - printer(h, p); - } else if ((ndo_printer = lookup_ndo_printer(dlt)) != NULL) { - ndo_printer(ndo, h, p); + printer(ndo, h, p); } else { if (!ndo->ndo_eflag) pktap_header_print(ndo, (u_char *)hdr, |