diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-05-02 17:15:04 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-05-04 13:47:49 +0200 |
| commit | ba8936b39b0ce2ff02f3aeb307df4c27657652d8 (patch) | |
| tree | 71f8f3b775d7adfb7b2be374c634f749525c10eb /print-atm.c | |
| parent | c45392de183543487bfebf52a5d2ccbeb9cef462 (diff) | |
| download | tcpdump-ba8936b39b0ce2ff02f3aeb307df4c27657652d8.tar.gz | |
Print truncations with nd_print_trunc() instead of tstr[] strings
Remove the tstr[] strings.
Update the output of some tests accordingly.
Moreover:
Add or update some ndo_protocol fields.
Diffstat (limited to 'print-atm.c')
| -rw-r--r-- | print-atm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/print-atm.c b/print-atm.c index 22acd73f..01194d05 100644 --- a/print-atm.c +++ b/print-atm.c @@ -123,7 +123,6 @@ /* end of the original atmuni31.h */ -static const char tstr[] = "[|atm]"; #define OAM_CRC10_MASK 0x3ff #define OAM_PAYLOAD_LEN 48 @@ -255,7 +254,7 @@ atm_if_print(netdissect_options *ndo, ndo->ndo_protocol = "atm_if"; if (caplen < 1 || length < 1) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return (caplen); } @@ -272,7 +271,7 @@ atm_if_print(netdissect_options *ndo, * control field. */ if (caplen < 3 || length < 3) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return (caplen); } @@ -304,7 +303,7 @@ atm_if_print(netdissect_options *ndo, * new DLT_IEEE802_6 value if we added it? */ if (caplen < 20 || length < 20) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return (caplen); } if (ndo->ndo_eflag) @@ -376,7 +375,7 @@ sig_print(netdissect_options *ndo, return; trunc: - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); } /* @@ -552,6 +551,6 @@ oam_print (netdissect_options *ndo, return; trunc: - ND_PRINT("[|oam]"); + nd_print_trunc(ndo); return; } |