NDOize OpenFlow, IEEE slow and telnet decoders

[tcpdump] / print-isoclns.c

diff --git a/print-isoclns.c b/print-isoclns.c
index 2097a8559136969d0b8523f3a19f579a7e3aa16b..6b21936101617220e56dbc1c8fba6c01e983529a 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -24,11 +24,6 @@
  * complete IS-IS & CLNP support.
  */
 
  * complete IS-IS & CLNP support.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.165 2008-08-16 13:38:15 hannes Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -686,7 +681,7 @@ void isoclns_print(const u_int8_t *p, u_int length, u_int caplen)
 
        case NLPID_CLNP:
                if (!clnp_print(p, length))
 
        case NLPID_CLNP:
                if (!clnp_print(p, length))

-                        print_unknown_data(p,"\n\t",caplen);
+                        print_unknown_data(gndo,p,"\n\t",caplen);

                break;
 
        case NLPID_ESIS:
                break;
 
        case NLPID_ESIS:


@@ -695,7 +690,7 @@ void isoclns_print(const u_int8_t *p, u_int length, u_int caplen)
 
        case NLPID_ISIS:
                if (!isis_print(p, length))
 
        case NLPID_ISIS:
                if (!isis_print(p, length))

-                        print_unknown_data(p,"\n\t",caplen);
+                        print_unknown_data(gndo,p,"\n\t",caplen);

                break;
 
        case NLPID_NULLNS:
                break;
 
        case NLPID_NULLNS:


@@ -729,7 +724,7 @@ void isoclns_print(const u_int8_t *p, u_int length, u_int caplen)
                             eflag ? "" : ", ",
                              length);
                if (caplen > 1)
                             eflag ? "" : ", ",
                              length);
                if (caplen > 1)

-                        print_unknown_data(p,"\n\t",caplen);
+                        print_unknown_data(gndo,p,"\n\t",caplen);

                break;
        }
 }
                break;
        }
 }


@@ -962,11 +957,11 @@ static int clnp_print (const u_int8_t *pptr, u_int length)
                  */
 
             default:
                  */
 
             default:

-                print_unknown_data(tptr,"\n\t  ",opli);
+                print_unknown_data(gndo,tptr,"\n\t  ",opli);

                 break;
             }
             if (vflag > 1)
                 break;
             }
             if (vflag > 1)

-                print_unknown_data(pptr,"\n\t  ",opli);
+                print_unknown_data(gndo,pptr,"\n\t  ",opli);

             pptr += opli;
         }
 
             pptr += opli;
         }
 


@@ -990,7 +985,7 @@ static int clnp_print (const u_int8_t *pptr, u_int length)
             /* dump the PDU specific data */
             if (length-(pptr-optr) > 0) {
                 printf("\n\t  undecoded non-header data, length %u",length-clnp_header->length_indicator);
             /* dump the PDU specific data */
             if (length-(pptr-optr) > 0) {
                 printf("\n\t  undecoded non-header data, length %u",length-clnp_header->length_indicator);

-                print_unknown_data(pptr,"\n\t  ",length-(pptr-optr));
+                print_unknown_data(gndo,pptr,"\n\t  ",length-(pptr-optr));

             }
         }
 
             }
         }
 


@@ -1096,7 +1091,7 @@ esis_print(const u_int8_t *pptr, u_int length)
         printf(", holding time: %us, length indicator: %u",EXTRACT_16BITS(esis_header->holdtime),li);
 
         if (vflag > 1)
         printf(", holding time: %us, length indicator: %u",EXTRACT_16BITS(esis_header->holdtime),li);
 
         if (vflag > 1)

-            print_unknown_data(optr,"\n\t",sizeof(struct esis_header_t));
+            print_unknown_data(gndo,optr,"\n\t",sizeof(struct esis_header_t));

 
        pptr += sizeof(struct esis_header_t);
        li -= sizeof(struct esis_header_t);
 
        pptr += sizeof(struct esis_header_t);
        li -= sizeof(struct esis_header_t);


@@ -1223,7 +1218,7 @@ esis_print(const u_int8_t *pptr, u_int length)
        default:
             if (vflag <= 1) {
                    if (pptr < snapend)
        default:
             if (vflag <= 1) {
                    if (pptr < snapend)

-                            print_unknown_data(pptr,"\n\t  ",snapend-pptr);
+                            print_unknown_data(gndo,pptr,"\n\t  ",snapend-pptr);

             }
             return;
        }
             }
             return;
        }


@@ -1290,11 +1285,11 @@ esis_print(const u_int8_t *pptr, u_int length)
             case ESIS_OPTION_SNPA_MASK:
 
             default:
             case ESIS_OPTION_SNPA_MASK:
 
             default:

-                print_unknown_data(tptr,"\n\t  ",opli);
+                print_unknown_data(gndo,tptr,"\n\t  ",opli);

                 break;
             }
             if (vflag > 1)
                 break;
             }
             if (vflag > 1)

-                print_unknown_data(pptr,"\n\t  ",opli);
+                print_unknown_data(gndo,pptr,"\n\t  ",opli);

             pptr += opli;
         }
 trunc:
             pptr += opli;
         }
 trunc:


@@ -1701,7 +1696,7 @@ isis_print_ip_reach_subtlv (const u_int8_t *tptr,int subt,int subl,const char *i
        }
        break;
     default:
        }
        break;
     default:

-       if(!print_unknown_data(tptr,"\n\t\t    ",
+       if(!print_unknown_data(gndo,tptr,"\n\t\t    ",

                               subl))
          return(0);
        break;
                               subl))
          return(0);
        break;


@@ -1815,7 +1810,8 @@ isis_print_is_reach_subtlv (const u_int8_t *tptr,u_int subt,u_int subl,const cha
               printf (", LM: %u", EXTRACT_24BITS(tptr));
               tptr=tptr+3;
               printf (", P: %u", *(tptr));
               printf (", LM: %u", EXTRACT_24BITS(tptr));
               tptr=tptr+3;
               printf (", P: %u", *(tptr));

-              printf (", P-ID: %u", EXTRACT_16BITS(++tptr));
+              tptr++;
+              printf (", P-ID: %u", EXTRACT_16BITS(tptr));

             }
             break;
         case ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR:
             }
             break;
         case ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR:


@@ -1856,7 +1852,7 @@ isis_print_is_reach_subtlv (const u_int8_t *tptr,u_int subt,u_int subl,const cha
                 /* there is some optional stuff left to decode but this is as of yet
                    not specified so just lets hexdump what is left */
                 if(subl>0){
                 /* there is some optional stuff left to decode but this is as of yet
                    not specified so just lets hexdump what is left */
                 if(subl>0){

-                  if(!print_unknown_data(tptr,"\n\t\t    ",
+                  if(!print_unknown_data(gndo,tptr,"\n\t\t    ",

                                          subl))
                     return(0);
                 }
                                          subl))
                     return(0);
                 }


@@ -1864,7 +1860,7 @@ isis_print_is_reach_subtlv (const u_int8_t *tptr,u_int subt,u_int subl,const cha
             }
             break;
         default:
             }
             break;
         default:

-            if(!print_unknown_data(tptr,"\n\t\t    ",
+            if(!print_unknown_data(gndo,tptr,"\n\t\t    ",

                                   subl))
                 return(0);
             break;
                                   subl))
                 return(0);
             break;


@@ -2230,7 +2226,7 @@ static int isis_print (const u_int8_t *p, u_int length)
            isis_header->max_area);
 
     if (vflag > 1) {
            isis_header->max_area);
 
     if (vflag > 1) {

-        if(!print_unknown_data(optr,"\n\t",8)) /* provide the _o_riginal pointer */
+        if(!print_unknown_data(gndo,optr,"\n\t",8)) /* provide the _o_riginal pointer */

             return(0);                         /* for optionally debugging the common header */
     }
 
             return(0);                         /* for optionally debugging the common header */
     }
 


@@ -2264,7 +2260,7 @@ static int isis_print (const u_int8_t *p, u_int length)
                pdu_len);
 
         if (vflag > 1) {
                pdu_len);
 
         if (vflag > 1) {

-            if(!print_unknown_data(pptr,"\n\t  ",ISIS_IIH_LAN_HEADER_SIZE))
+            if(!print_unknown_data(gndo,pptr,"\n\t  ",ISIS_IIH_LAN_HEADER_SIZE))

                 return(0);
         }
 
                 return(0);
         }
 


@@ -2298,7 +2294,7 @@ static int isis_print (const u_int8_t *p, u_int length)
                pdu_len);
 
         if (vflag > 1) {
                pdu_len);
 
         if (vflag > 1) {

-            if(!print_unknown_data(pptr,"\n\t  ",ISIS_IIH_PTP_HEADER_SIZE))
+            if(!print_unknown_data(gndo,pptr,"\n\t  ",ISIS_IIH_PTP_HEADER_SIZE))

                 return(0);
         }
 
                 return(0);
         }
 


@@ -2355,7 +2351,7 @@ static int isis_print (const u_int8_t *p, u_int length)
        printf("%s ]", tok2str(isis_lsp_istype_values,"Unknown(0x%x)",ISIS_MASK_LSP_ISTYPE_BITS(header_lsp->typeblock)));
 
         if (vflag > 1) {
        printf("%s ]", tok2str(isis_lsp_istype_values,"Unknown(0x%x)",ISIS_MASK_LSP_ISTYPE_BITS(header_lsp->typeblock)));
 
         if (vflag > 1) {

-            if(!print_unknown_data(pptr,"\n\t  ",ISIS_LSP_HEADER_SIZE))
+            if(!print_unknown_data(gndo,pptr,"\n\t  ",ISIS_LSP_HEADER_SIZE))

                 return(0);
         }
 
                 return(0);
         }
 


@@ -2387,7 +2383,7 @@ static int isis_print (const u_int8_t *p, u_int length)
                isis_print_id(header_csnp->end_lsp_id, LSP_ID_LEN));
 
         if (vflag > 1) {
                isis_print_id(header_csnp->end_lsp_id, LSP_ID_LEN));
 
         if (vflag > 1) {

-            if(!print_unknown_data(pptr,"\n\t  ",ISIS_CSNP_HEADER_SIZE))
+            if(!print_unknown_data(gndo,pptr,"\n\t  ",ISIS_CSNP_HEADER_SIZE))

                 return(0);
         }
 
                 return(0);
         }
 


@@ -2415,7 +2411,7 @@ static int isis_print (const u_int8_t *p, u_int length)
                pdu_len);
 
         if (vflag > 1) {
                pdu_len);
 
         if (vflag > 1) {

-            if(!print_unknown_data(pptr,"\n\t  ",ISIS_PSNP_HEADER_SIZE))
+            if(!print_unknown_data(gndo,pptr,"\n\t  ",ISIS_PSNP_HEADER_SIZE))

                 return(0);
         }
 
                 return(0);
         }
 


@@ -2424,7 +2420,7 @@ static int isis_print (const u_int8_t *p, u_int length)
        break;
 
     default:
        break;
 
     default:

-       if(!print_unknown_data(pptr,"\n\t  ",length))
+       if(!print_unknown_data(gndo,pptr,"\n\t  ",length))

            return(0);
        return (0);
     }
            return(0);
        return (0);
     }


@@ -2702,7 +2698,7 @@ static int isis_print (const u_int8_t *p, u_int length)
                 break;
            case ISIS_SUBTLV_AUTH_PRIVATE:
            default:
                 break;
            case ISIS_SUBTLV_AUTH_PRIVATE:
            default:

-               if(!print_unknown_data(tptr+1,"\n\t\t  ",tlv_len-1))
+               if(!print_unknown_data(gndo,tptr+1,"\n\t\t  ",tlv_len-1))

                    return(0);
                break;
            }
                    return(0);
                break;
            }


@@ -2966,7 +2962,7 @@ static int isis_print (const u_int8_t *p, u_int length)
             case ISIS_SUBTLV_IDRP_LOCAL:
             case ISIS_SUBTLV_IDRP_RES:
             default:
             case ISIS_SUBTLV_IDRP_LOCAL:
             case ISIS_SUBTLV_IDRP_RES:
             default:

-                if(!print_unknown_data(tptr,"\n\t      ",tlv_len-1))
+                if(!print_unknown_data(gndo,tptr,"\n\t      ",tlv_len-1))

                     return(0);
                 break;
             }
                     return(0);
                 break;
             }


@@ -3041,7 +3037,7 @@ static int isis_print (const u_int8_t *p, u_int length)
             tptr+=3;
             tmp-=3;
             if (tmp > 0) /* hexdump the rest */
             tptr+=3;
             tmp-=3;
             if (tmp > 0) /* hexdump the rest */

-                if(!print_unknown_data(tptr,"\n\t\t",tmp))
+                if(!print_unknown_data(gndo,tptr,"\n\t\t",tmp))

                     return(0);
             break;
             /*
                     return(0);
             break;
             /*


@@ -3057,14 +3053,14 @@ static int isis_print (const u_int8_t *p, u_int length)
 
        default:
             if (vflag <= 1) {
 
        default:
             if (vflag <= 1) {

-                if(!print_unknown_data(pptr,"\n\t\t",tlv_len))
+                if(!print_unknown_data(gndo,pptr,"\n\t\t",tlv_len))

                     return(0);
             }
            break;
        }
         /* do we want to see an additionally hexdump ? */
         if (vflag> 1) {
                     return(0);
             }
            break;
        }
         /* do we want to see an additionally hexdump ? */
         if (vflag> 1) {

-           if(!print_unknown_data(pptr,"\n\t      ",tlv_len))
+           if(!print_unknown_data(gndo,pptr,"\n\t      ",tlv_len))

                return(0);
         }
 
                return(0);
         }