remove the old lspping sample

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index af17385325c1295d4a4109e1558350059095c1cb..c1c1fda7a966bab4ca91d78972976d1ddb0f3755 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.138 2004-04-28 22:02:23 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.140 2004-05-01 10:15:33 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -388,7 +388,7 @@ ip_print(register const u_char *bp, register u_int length)
            if (IP_V(ip) == 6)
                printf(", wrong link-layer encapsulation");
        }
            if (IP_V(ip) == 6)
                printf(", wrong link-layer encapsulation");
        }

-        else
+        else if (!eflag)

            printf("IP ");
 
        if ((u_char *)(ip + 1) > snapend) {
            printf("IP ");
 
        if ((u_char *)(ip + 1) > snapend) {


@@ -545,7 +545,6 @@ again:
                        break;
 
                case IPPROTO_PIGP:
                        break;
 
                case IPPROTO_PIGP:

-               case IPPROTO_EIGRP:

                        /*
                         * XXX - the current IANA protocol number assignments
                         * page lists 9 as "any private interior gateway
                        /*
                         * XXX - the current IANA protocol number assignments
                         * page lists 9 as "any private interior gateway


@@ -558,17 +557,14 @@ again:
                         * IP_PROTO_EIGRP as 88; those names better
                         * match was the current protocol number
                         * assignments say.
                         * IP_PROTO_EIGRP as 88; those names better
                         * match was the current protocol number
                         * assignments say.

-                        *
-                        * XXX - at least according to the Ethereal
-                        * dissectors, Cisco IGRP and Cisco EIGRP are
-                        * *not* the same, so it's not clear that both
-                        * IPPROTO_PIGP and IPPROTO_EIGRP should be
-                        * handed to the same print routine; "igrp_print()"
-                        * appears to be for IGRP, not EIGRP.

                         */
                        igrp_print(cp, len, (const u_char *)ip);
                        break;
 
                         */
                        igrp_print(cp, len, (const u_char *)ip);
                        break;
 

+               case IPPROTO_EIGRP:
+                       eigrp_print(cp, len);
+                       break;
+

                case IPPROTO_ND:
                        (void)printf(" nd %d", len);
                        break;
                case IPPROTO_ND:
                        (void)printf(" nd %d", len);
                        break;