diff options
| author | Guy Harris <gharris@sonic.net> | 2020-05-27 23:17:47 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-05-27 23:17:47 -0700 |
| commit | 2c2ad4f4ae108fffd2b1f1ee963d183ef62ca149 (patch) | |
| tree | ee7e8ea02737d663285f4cab4cd2314a84f739ad /print-ether.c | |
| parent | ed2df84be4d4b16bd595bacc23c6df208ff84401 (diff) | |
| download | tcpdump-2c2ad4f4ae108fffd2b1f1ee963d183ef62ca149.tar.gz | |
macsec: more cleanups.
Get rid of code that knows about Ethernet; this is 802.1AE, not 802.3AE.
Get rid o some unused variables.
Diffstat (limited to 'print-ether.c')
| -rw-r--r-- | print-ether.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/print-ether.c b/print-ether.c index 4dd253ac..0d8dbba9 100644 --- a/print-ether.c +++ b/print-ether.c @@ -209,7 +209,7 @@ recurse: * MACsec, aka IEEE 802.1AE-2006 * Print the header, and try to print the payload if it's not encrypted */ - int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen, &length_type); + int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen); if (ret == 0) { /* Payload is encrypted; just quit. */ @@ -217,6 +217,11 @@ recurse: } else if (ret > 0) { /* Problem printing the header; just quit. */ return (ret); + } else { + /* + * Keep processing type/length fields. + */ + goto recurse; } } |