add EIGRP support for Appletalk, display cosmetics to better indicate that we are...

diff --git a/appletalk.h b/appletalk.h
index 552f3d13f2c3fa0191d0951714b39cfeebd0e632..ff972f65bfa999c9069a9959d16f88b283e06d32 100644 (file)
--- a/appletalk.h
+++ b/appletalk.h
@@ -20,7 +20,7 @@
  *
  * AppleTalk protocol formats (courtesy Bill Croft of Stanford/SUMEX).
  *
  *
  * AppleTalk protocol formats (courtesy Bill Croft of Stanford/SUMEX).
  *

- * @(#) $Header: /tcpdump/master/tcpdump/appletalk.h,v 1.15 2002-12-11 07:13:49 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/appletalk.h,v 1.16 2004-05-01 09:41:50 hannes Exp $ (LBL)

  */
 
 struct LAP {
  */
 
 struct LAP {


@@ -67,6 +67,7 @@ struct atShortDDP {
 #define        ddpECHO         4       /* ECHO type */
 #define        ddpIP           22      /* IP type */
 #define        ddpARP          23      /* ARP type */
 #define        ddpECHO         4       /* ECHO type */
 #define        ddpIP           22      /* IP type */
 #define        ddpARP          23      /* ARP type */

+#define ddpEIGRP        88      /* EIGRP over Appletalk */

 #define        ddpKLAP         0x4b    /* Kinetics KLAP type */
 
 
 #define        ddpKLAP         0x4b    /* Kinetics KLAP type */
 
 

diff --git a/print-atalk.c b/print-atalk.c
index 6829593105f98116314ae256acab48bb59c9cda9..6ea136116788086c3d04f5824839177832c70d51 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.80 2003-11-16 09:36:13 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.81 2004-05-01 09:41:50 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -172,6 +172,9 @@ atalk_print(register const u_char *bp, u_int length)
        register const struct atDDP *dp;
        u_short snet;
 
        register const struct atDDP *dp;
        u_short snet;
 

+        if(!eflag)
+            printf("AT ");
+

        if (length < ddpSize) {
                (void)printf(" [|ddp %d]", length);
                return;
        if (length < ddpSize) {
                (void)printf(" [|ddp %d]", length);
                return;


@@ -180,7 +183,7 @@ atalk_print(register const u_char *bp, u_int length)
        snet = EXTRACT_16BITS(&dp->srcNet);
        printf("%s.%s", ataddr_string(snet, dp->srcNode),
               ddpskt_string(dp->srcSkt));
        snet = EXTRACT_16BITS(&dp->srcNet);
        printf("%s.%s", ataddr_string(snet, dp->srcNode),
               ddpskt_string(dp->srcSkt));

-       printf(" > %s.%s:",
+       printf(" > %s.%s: ",

               ataddr_string(EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
               ddpskt_string(dp->dstSkt));
        bp += ddpSize;
               ataddr_string(EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
               ddpskt_string(dp->dstSkt));
        bp += ddpSize;


@@ -241,6 +244,10 @@ ddp_print(register const u_char *bp, register u_int length, register int t,
                atp_print((const struct atATP *)bp, length);
                break;
 
                atp_print((const struct atATP *)bp, length);
                break;
 

+       case ddpEIGRP:
+               eigrp_print(bp, length);
+               break;
+

        default:
                (void)printf(" at-%s %d", tok2str(type2str, NULL, t), length);
                break;
        default:
                (void)printf(" at-%s %d", tok2str(type2str, NULL, t), length);
                break;