Revert partially the commit 21b1273

[tcpdump] / print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 57bd140fc49e06a6438f49bd5c131eeb9dab0667..398e9a41533998dad008f474f18ac3a57bac7852 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -72,19 +72,20 @@ static const char *ddpskt_string(netdissect_options *, u_int);
 /*
  * Print LLAP packets received on a physical LocalTalk interface.
  */
-u_int
+void
 ltalk_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int hdrlen;
 
-       ndo->ndo_protocol = "ltalk_if";
+       ndo->ndo_protocol = "ltalk";
        hdrlen = llap_print(ndo, p, h->len);
        if (hdrlen == 0) {
                /* Cut short by the snapshot length. */
-               return (h->caplen);
+               ndo->ndo_ll_hdr_len += h->caplen;
+               return;
        }
-       return (hdrlen);
+       ndo->ndo_ll_hdr_len += hdrlen;
 }
 
 /*
@@ -245,7 +246,7 @@ aarp_print(netdissect_options *ndo,
                        return;
 
                case 2:                         /* response */
-                       ND_PRINT("reply %s is-at %s", AT(psaddr), etheraddr_string(ndo, ap->hsaddr));
+                       ND_PRINT("reply %s is-at %s", AT(psaddr), GET_ETHERADDR_STRING(ap->hsaddr));
                        return;
 
                case 3:                         /* probe (oy!) */