X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/477fe09d005dd951c6404f843a75811fdc993167..d08b4abef4de825b3aecbb7c7e7601ac010806fc:/print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index 262c9bda..2d609388 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -14,11 +14,6 @@
  *  and Steinar Haug (sthaug@nethelp.no)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.20 2006-06-23 02:03:09 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,7 +25,6 @@ static const char rcsid[] _U_ =
 #include <string.h>
 
 #include "interface.h"
-#include "decode_prefix.h"
 #include "extract.h"
 #include "addrtoname.h"
 
@@ -91,8 +85,8 @@ struct ldp_msg_header {
     u_int8_t id[4];
 };
 
-#define	LDP_MASK_MSG_TYPE(x)  ((x)&0x7fff) 
-#define	LDP_MASK_U_BIT(x)     ((x)&0x8000) 
+#define	LDP_MASK_MSG_TYPE(x)  ((x)&0x7fff)
+#define	LDP_MASK_U_BIT(x)     ((x)&0x8000)
 
 #define	LDP_MSG_NOTIF                0x0001
 #define	LDP_MSG_HELLO                0x0100
@@ -126,8 +120,8 @@ static const struct tok ldp_msg_values[] = {
     { 0, NULL}
 };
 
-#define	LDP_MASK_TLV_TYPE(x)  ((x)&0x3fff) 
-#define	LDP_MASK_F_BIT(x) ((x)&0x4000) 
+#define	LDP_MASK_TLV_TYPE(x)  ((x)&0x3fff)
+#define	LDP_MASK_F_BIT(x) ((x)&0x4000)
 
 #define	LDP_TLV_FEC                  0x0100
 #define	LDP_TLV_ADDRESS_LIST         0x0101
@@ -220,8 +214,8 @@ static const struct tok ldp_fec_martini_ifparm_vccv_cv_values[] = {
 
 int ldp_msg_print(register const u_char *);
 int ldp_tlv_print(register const u_char *);
-   
-/* 
+
+/*
  * ldp tlv header
  *
  *  0                   1                   2                   3
@@ -256,7 +250,7 @@ ldp_tlv_print(register const u_char *tptr) {
     char buf[100];
     int i;
 
-    ldp_tlv_header = (const struct ldp_tlv_header *)tptr;    
+    ldp_tlv_header = (const struct ldp_tlv_header *)tptr;
     tlv_len=EXTRACT_16BITS(ldp_tlv_header->length);
     tlv_tlen=tlv_len;
     tlv_type=LDP_MASK_TLV_TYPE(EXTRACT_16BITS(ldp_tlv_header->type));
@@ -311,7 +305,7 @@ ldp_tlv_print(register const u_char *tptr) {
 		TCHECK2(*tptr, sizeof(struct in_addr));
 		printf(" %s",ipaddr_string(tptr));
 		tlv_tlen-=sizeof(struct in_addr);
-		tptr+=sizeof(struct in_addr);                
+		tptr+=sizeof(struct in_addr);
 	    }
             break;
 #ifdef INET6
@@ -320,7 +314,7 @@ ldp_tlv_print(register const u_char *tptr) {
 		TCHECK2(*tptr, sizeof(struct in6_addr));
 		printf(" %s",ip6addr_string(tptr));
 		tlv_tlen-=sizeof(struct in6_addr);
-		tptr+=sizeof(struct in6_addr);                
+		tptr+=sizeof(struct in6_addr);
 	    }
             break;
 #endif
@@ -455,7 +449,7 @@ ldp_tlv_print(register const u_char *tptr) {
                     break;
 
                 default:
-                    print_unknown_data(tptr+2,"\n\t\t  ",vc_info_tlv_len-2);
+                    print_unknown_data(gndo,tptr+2,"\n\t\t  ",vc_info_tlv_len-2);
                     break;
                 }
 
@@ -529,11 +523,11 @@ ldp_tlv_print(register const u_char *tptr) {
 
     default:
         if (vflag <= 1)
-            print_unknown_data(tptr,"\n\t      ",tlv_tlen);
+            print_unknown_data(gndo,tptr,"\n\t      ",tlv_tlen);
         break;
     }
     return(tlv_len+4); /* Type & Length fields not included */
- 
+
 trunc:
     printf("\n\t\t packet exceeded snapshot");
     return 0;
@@ -589,7 +583,7 @@ ldp_msg_print(register const u_char *pptr) {
            EXTRACT_16BITS(&ldp_com_header->label_space),
            pdu_len);
 
-    /* bail out if non-verbose */ 
+    /* bail out if non-verbose */
     if (vflag < 1)
         return 0;
 
@@ -628,7 +622,7 @@ ldp_msg_print(register const u_char *pptr) {
         hexdump=FALSE;
 
         switch(msg_type) {
- 
+
         case LDP_MSG_NOTIF:
         case LDP_MSG_HELLO:
         case LDP_MSG_INIT:
@@ -657,12 +651,12 @@ ldp_msg_print(register const u_char *pptr) {
 
         default:
             if (vflag <= 1)
-                print_unknown_data(msg_tptr,"\n\t  ",msg_tlen);
+                print_unknown_data(gndo,msg_tptr,"\n\t  ",msg_tlen);
             break;
         }
         /* do we want to see an additionally hexdump ? */
         if (vflag > 1 || hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(struct ldp_msg_header),"\n\t  ",
+            print_unknown_data(gndo,tptr+sizeof(struct ldp_msg_header),"\n\t  ",
                                msg_len);
 
         tptr += msg_len+4;
@@ -674,3 +668,9 @@ trunc:
     return 0;
 }
 
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */