The packets inside IPTalk are just LLAP packets, so call the routine to

print them "llap_print()" (as per NetBSD), not "iptalk_print()".

diff --git a/interface.h b/interface.h
index fceb4f126a044468f4995b6f185c849c5493d2ee..6f4e6321ea078aea6f0c84025381474386a03ed2 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.142 2000-10-30 05:41:30 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.143 2000-10-30 06:22:14 guy Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
@@ -226,11 +226,11 @@ extern void icmp_print(const u_char *, u_int, const u_char *);
 extern void igrp_print(const u_char *, u_int, const u_char *);
 extern void ip_print(const u_char *, u_int);
 extern void ipN_print(const u_char *, u_int);
-extern void iptalk_print(const u_char *, u_int);
 extern void ipx_print(const u_char *, u_int);
 extern void isoclns_print(const u_char *, u_int, u_int, const u_char *,
        const u_char *);
 extern void krb_print(const u_char *, u_int);
+extern void llap_print(const u_char *, u_int);
 extern void nfsreply_print(const u_char *, u_int, const u_char *);
 extern void nfsreq_print(const u_char *, u_int, const u_char *);
 extern void ns_print(const u_char *, u_int);

diff --git a/print-atalk.c b/print-atalk.c
index 6f056be14bba1f9faf4864a6fd21ad011c58a512..b00c08ff5538534beea59ad69aec6cb9217f0253 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.63 2000-10-30 05:41:30 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.64 2000-10-30 06:22:14 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -84,11 +84,10 @@ static void ddp_print(const u_char *, u_int, int, u_short, u_char, u_char);
 static const char *ddpskt_string(int);
 
 /*
- * Print AppleTalk-inside-UDP (Kinetics IPTalk, CAP) Datagram Delivery
- * Protocol packets.
+ * Print AppleTalk LLAP packets.
  */
 void
-iptalk_print(register const u_char *bp, u_int length)
+llap_print(register const u_char *bp, u_int length)
 {
        register const struct LAP *lp;
        register const struct atDDP *dp;
@@ -146,7 +145,9 @@ iptalk_print(register const u_char *bp, u_int length)
 }
 
 /*
- * Print AppleTalk Datagram Delivery Protocol packets.
+ * Print EtherTalk/TokenTalk packets (or FDDITalk, or whatever it's called
+ * when it runs over FDDI; yes, I've seen FDDI captures with AppleTalk
+ * packets in them).
  */
 void
 atalk_print(register const u_char *bp, u_int length)
@@ -204,6 +205,9 @@ aarp_print(register const u_char *bp, u_int length)
            ap->halen, ap->palen);
 }
 
+/*
+ * Print AppleTalk Datagram Delivery Protocol packets.
+ */
 static void
 ddp_print(register const u_char *bp, register u_int length, register int t,
          register u_short snet, register u_char snode, u_char skt)

diff --git a/print-udp.c b/print-udp.c
index 25d4d948371a1b449520d41fc574f7c95a6c18ff..75287c876dd765109ab9357f3175e4943eb5fad5 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.87 2000-10-30 05:41:31 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.88 2000-10-30 06:22:15 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -564,7 +564,7 @@ udp_print(register const u_char *bp, u_int length, register const u_char *bp2)
                    (atalk_port(sport) || atalk_port(dport))) {
                        if (vflag)
                                fputs("kip ", stdout);
-                       iptalk_print(cp, length);
+                       llap_print(cp, length);
                        return;
                }
        }