diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:52:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:52:31 +0000 |
| commit | 31cd589d20ba8d3d6b3fc4fccacc40d38a163c5d (patch) | |
| tree | 99d6c086833d530e5d1d33a8128961f8149843f0 /print.c | |
| parent | Adding upstream version 4.99.4. (diff) | |
| download | tcpdump-31cd589d20ba8d3d6b3fc4fccacc40d38a163c5d.tar.xz tcpdump-31cd589d20ba8d3d6b3fc4fccacc40d38a163c5d.zip | |
Adding upstream version 4.99.5.upstream/4.99.5upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'print.c')
| -rw-r--r-- | print.c | 26 |
1 files changed, 20 insertions, 6 deletions
@@ -25,9 +25,7 @@ * Seth Webster <swebster@sst.ll.mit.edu> */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include <stdlib.h> #include <string.h> @@ -264,9 +262,7 @@ static int ndo_printf(netdissect_options *ndo, void init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask) { - init_addrtoname(ndo, localnet, mask); - init_checksum(); } if_printer @@ -323,6 +319,11 @@ get_if_printer(int type) return printer; } +#ifdef ENABLE_INSTRUMENT_FUNCTIONS +extern int profile_func_level; +static int pretty_print_packet_level = -1; +#endif + void pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *sp, u_int packets_captured) @@ -330,6 +331,11 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, u_int hdrlen = 0; int invalid_header = 0; +#ifdef ENABLE_INSTRUMENT_FUNCTIONS + if (pretty_print_packet_level == -1) + pretty_print_packet_level = profile_func_level; +#endif + if (ndo->ndo_packet_number) ND_PRINT("%5u ", packets_captured); @@ -418,6 +424,10 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, nd_print_trunc(ndo); /* Print the full packet */ ndo->ndo_ll_hdr_len = 0; +#ifdef ENABLE_INSTRUMENT_FUNCTIONS + /* truncation => reassignment */ + profile_func_level = pretty_print_packet_level; +#endif break; } hdrlen = ndo->ndo_ll_hdr_len; @@ -431,10 +441,14 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h, nd_pop_all_packet_info(ndo); /* - * Restore the original snapend, as a printer might have - * changed it. + * Restore the originals snapend and packetp, as a printer + * might have changed them. + * + * XXX - nd_pop_all_packet_info() should have restored the + * original values, but, just in case.... */ ndo->ndo_snapend = sp + h->caplen; + ndo->ndo_packetp = sp; if (ndo->ndo_Xflag) { /* * Print the raw packet data in hex and ASCII. |