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-ppi.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-ppi.c')
| -rw-r--r-- | print-ppi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/print-ppi.c b/print-ppi.c index b4035363..06678b0f 100644 --- a/print-ppi.c +++ b/print-ppi.c @@ -49,8 +49,7 @@ static void ppi_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - if_ndo_printer ndo_printer; - if_printer printer; + if_printer printer; ppi_header_t *hdr; u_int caplen = h->caplen; u_int length = h->len; @@ -82,9 +81,7 @@ ppi_print(netdissect_options *ndo, p += len; 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) ppi_header_print(ndo, (u_char *)hdr, length + len); |