Make it clearer that the hex or hex-and-ASCII dump for "-x", "-xx",

[tcpdump] / print-lspping.c

diff --git a/print-lspping.c b/print-lspping.c
index 7c02b8f47d2411776647c07d0a940be5a99ed23a..058fe3e854814f7c99e3910aebaa6e1a513568e3 100644 (file)
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-lspping.c,v 1.12 2004-11-11 12:02:31 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lspping.c,v 1.12.2.3 2005-05-03 08:12:31 hannes Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -137,7 +137,7 @@ struct lspping_tlv_header {
 #define        LSPPING_TLV_DOWNSTREAM_MAPPING    2
 #define        LSPPING_TLV_PAD                   3
 #define        LSPPING_TLV_ERROR_CODE            4
 #define        LSPPING_TLV_DOWNSTREAM_MAPPING    2
 #define        LSPPING_TLV_PAD                   3
 #define        LSPPING_TLV_ERROR_CODE            4

-#define        LSPPING_TLV_VENDOR_PRIVATE        5 
+#define        LSPPING_TLV_VENDOR_PRIVATE        0xfc00

 
 static const struct tok lspping_tlv_values[] = {
     { LSPPING_TLV_TARGET_FEC_STACK, "Target FEC Stack" },
 
 static const struct tok lspping_tlv_values[] = {
     { LSPPING_TLV_TARGET_FEC_STACK, "Target FEC Stack" },


@@ -515,10 +515,11 @@ lspping_print(register const u_char *pptr, register u_int len) {
 
     tlen=len;
 
 
     tlen=len;
 

-    printf("\n\tLSP-PINGv%u, msg-type: %s (%u), reply-mode: %s (%u)",
+    printf("\n\tLSP-PINGv%u, msg-type: %s (%u), length: %u\n\t  reply-mode: %s (%u)",

            EXTRACT_16BITS(&lspping_com_header->version[0]),
            tok2str(lspping_msg_type_values, "unknown",lspping_com_header->msg_type),
            lspping_com_header->msg_type,
            EXTRACT_16BITS(&lspping_com_header->version[0]),
            tok2str(lspping_msg_type_values, "unknown",lspping_com_header->msg_type),
            lspping_com_header->msg_type,

+           len,

            tok2str(lspping_reply_mode_values, "unknown",lspping_com_header->reply_mode),
            lspping_com_header->reply_mode);
 
            tok2str(lspping_reply_mode_values, "unknown",lspping_com_header->reply_mode),
            lspping_com_header->reply_mode);
 


@@ -532,13 +533,13 @@ lspping_print(register const u_char *pptr, register u_int len) {
         lspping_com_header->return_code == 10 ||
         lspping_com_header->return_code == 11 ||
         lspping_com_header->return_code == 12 )
         lspping_com_header->return_code == 10 ||
         lspping_com_header->return_code == 11 ||
         lspping_com_header->return_code == 12 )

-        printf("\n\t  Return Code: %s %u (%u), Return Subcode: (%u)",
+        printf("\n\t  Return Code: %s %u (%u)\n\t  Return Subcode: (%u)",

                tok2str(lspping_return_code_values, "unknown",lspping_com_header->return_code),
                lspping_com_header->return_subcode,    
                lspping_com_header->return_code,
                lspping_com_header->return_subcode);
     else
                tok2str(lspping_return_code_values, "unknown",lspping_com_header->return_code),
                lspping_com_header->return_subcode,    
                lspping_com_header->return_code,
                lspping_com_header->return_subcode);
     else

-        printf("\n\t  Return Code: %s (%u), Return Subcode: (%u)",
+        printf("\n\t  Return Code: %s (%u)\n\t  Return Subcode: (%u)",

                tok2str(lspping_return_code_values, "unknown",lspping_com_header->return_code),   
                lspping_com_header->return_code,
                lspping_com_header->return_subcode);
                tok2str(lspping_return_code_values, "unknown",lspping_com_header->return_code),   
                lspping_com_header->return_code,
                lspping_com_header->return_subcode);


@@ -850,7 +851,7 @@ lspping_print(register const u_char *pptr, register u_int len) {
             print_unknown_data(tptr+sizeof(sizeof(struct lspping_tlv_header)),"\n\t    ",
                                lspping_tlv_len);
 
             print_unknown_data(tptr+sizeof(sizeof(struct lspping_tlv_header)),"\n\t    ",
                                lspping_tlv_len);
 

-        tptr+=lspping_tlv_len;
+        tptr+=lspping_tlv_len+sizeof(struct lspping_tlv_header);

         tlen-=lspping_tlv_len+sizeof(struct lspping_tlv_header);
     }
     return;
         tlen-=lspping_tlv_len+sizeof(struct lspping_tlv_header);
     }
     return;