don't pass on src & dst MAC adresses to the isoclns decoder as MAC adresses

[tcpdump] / print-ppp.c

diff --git a/print-ppp.c b/print-ppp.c
index 8c60baf1cfc96240f6b97ebe8e98ca2bad0310b1..3067bbdffaf2286d6a039953b9505f7892e8b2d4 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.85 2003-05-22 15:29:22 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.88 2003-05-22 16:52:38 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -402,7 +402,7 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
        case CPCODES_VEXT:
                if (length < 11)
                        break;
-               printf(", Magic-Num=%08x", EXTRACT_32BITS(tptr));
+               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
                tptr += 4;
                printf(" OUI 0x%06x", EXTRACT_24BITS(tptr));
                /* XXX: need to decode Kind and Value(s)? */
@@ -463,14 +463,14 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
        case CPCODES_ID:
                if (length < 8)
                        break;
-               printf(", Magic-Num=%08x", EXTRACT_32BITS(tptr));
+               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
                /* XXX: need to decode Data? */
                break;
        case CPCODES_TIME_REM:
                if (length < 12)
                        break;
-               printf(", Magic-Num=%08x", EXTRACT_32BITS(tptr));
-               printf(" Seconds-Remaining=%u", EXTRACT_32BITS(tptr + 4));
+               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
+               printf(", Seconds-Remaining %us", EXTRACT_32BITS(tptr + 4));
                /* XXX: need to decode Message? */
                break;
        default:
@@ -481,6 +481,7 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
                     print_unknown_data(pptr-2,"\n\t",length+2);
                break;
        }
+       printf(", length %u", length);
 
         if (vflag >1)
             print_unknown_data(pptr-2,"\n\t",length+2);
@@ -989,7 +990,7 @@ handle_ppp(u_int proto, const u_char *p, int length)
                ipx_print(p, length);
                break;
        case PPP_OSI:
-               isoclns_print(p, length, length, NULL, NULL);
+               isoclns_print(p, length, length);
                break;
        case PPP_MPLS_UCAST:
        case PPP_MPLS_MCAST:
@@ -1037,7 +1038,7 @@ ppp_print(register const u_char *p, u_int length)
        }
 
         if (eflag)
-            printf("PPP-%s (0x%04x), length %u, ",
+            printf("PPP-%s (0x%04x), length %u: ",
                    tok2str(ppptype2str, "unknown", proto),
                    proto,
                    olen);