code cleanup:

  - remove the private print_nsap() and use isonsap_string() instead
  - pass on a length indicator to isonsap_string as CLNP and ES-IS,IS-IS TLVs
    and options store the length differently (semioctets vs. octets)
  - make the isonsap_string() output equal to the now abandoned print_nsap()
    printer which reflects representation of contemporary router software

diff --git a/addrtoname.c b/addrtoname.c
index 2c1c6403beefd6de81dae45f1cbf2dd865107501..e6907254078f9bcd97d4e053e95544ca9c3ad688 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -23,7 +23,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.106 2005-01-04 00:07:09 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.107 2005-03-08 08:52:38 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -578,26 +578,32 @@ llcsap_string(u_char sap)
        return (tp->name);
 }
 
        return (tp->name);
 }
 

+#define ISONSAP_MAX_LENGTH 20

 const char *
 const char *

-isonsap_string(const u_char *nsap)
+isonsap_string(const u_char *nsap, register u_int nsap_length)

 {
 {

-       register u_int i, nlen = nsap[0];
+       register u_int nsap_idx;

        register char *cp;
        register struct enamemem *tp;
 
        register char *cp;
        register struct enamemem *tp;
 

+        if (nsap_length < 1 || nsap_length > ISONSAP_MAX_LENGTH)
+               error("isonsap_string: illegal length");
+

        tp = lookup_nsap(nsap);
        if (tp->e_name)
                return tp->e_name;
 
        tp = lookup_nsap(nsap);
        if (tp->e_name)
                return tp->e_name;
 

-       tp->e_name = cp = (char *)malloc(nlen * 2 + 2);
+       tp->e_name = cp = (char *)malloc(sizeof("xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx"));

        if (cp == NULL)
                error("isonsap_string: malloc");
 
        if (cp == NULL)
                error("isonsap_string: malloc");
 

-       nsap++;
-       *cp++ = '/';
-       for (i = nlen; (int)--i >= 0;) {
+       for (nsap_idx = 0; nsap_idx < nsap_length; nsap_idx++) {

                *cp++ = hex[*nsap >> 4];
                *cp++ = hex[*nsap++ & 0xf];
                *cp++ = hex[*nsap >> 4];
                *cp++ = hex[*nsap++ & 0xf];

+               if (((nsap_idx & 1) == 0) &&
+                     (nsap_idx + 1 < nsap_length)) {
+                       *cp++ = '.';
+               }

        }
        *cp = '\0';
        return (tp->e_name);
        }
        *cp = '\0';
        return (tp->e_name);

diff --git a/interface.h b/interface.h
index 05e7ecfa2b030222dbeb4826161705db54eb8969..c67e6a6a79ba548faed9b41dc489fdb121f5dbea 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.242 2005-01-27 18:30:37 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.243 2005-03-08 08:52:38 hannes Exp $ (LBL)

  */
 
 #ifndef tcpdump_interface_h
  */
 
 #ifndef tcpdump_interface_h


@@ -149,7 +149,7 @@ extern char *copy_argv(char **);
 extern void safeputchar(int);
 extern void safeputs(const char *);
 
 extern void safeputchar(int);
 extern void safeputs(const char *);
 

-extern const char *isonsap_string(const u_char *);
+extern const char *isonsap_string(const u_char *, register u_int);

 extern const char *llcsap_string(u_char);
 extern const char *protoid_string(const u_char *);
 extern const char *ipxsap_string(u_short);
 extern const char *llcsap_string(u_char);
 extern const char *protoid_string(const u_char *);
 extern const char *ipxsap_string(u_short);

diff --git a/print-isoclns.c b/print-isoclns.c
index eca58d34a6a2ecb774ba411533b56e45f37568dd..1154e2809011a8580eb7559c12be7e5e44ea76e2 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -21,12 +21,12 @@
  * Original code by Matt Thomas, Digital Equipment Corporation
  *
  * Extensively modified by Hannes Gredler ([email protected]) for more
  * Original code by Matt Thomas, Digital Equipment Corporation
  *
  * Extensively modified by Hannes Gredler ([email protected]) for more

- * complete IS-IS support.
+ * complete IS-IS & CLNP support.

  */
 
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.127 2005-03-07 14:36:16 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.128 2005-03-08 08:52:39 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -57,7 +57,6 @@ static const char rcsid[] _U_ =
 #define SYSTEM_ID_LEN  ETHER_ADDR_LEN
 #define NODE_ID_LEN     SYSTEM_ID_LEN+1
 #define LSP_ID_LEN      SYSTEM_ID_LEN+2
 #define SYSTEM_ID_LEN  ETHER_ADDR_LEN
 #define NODE_ID_LEN     SYSTEM_ID_LEN+1
 #define LSP_ID_LEN      SYSTEM_ID_LEN+2

-#define NSAP_MAX_LENGTH 20

 
 #define ISIS_VERSION   1
 #define ESIS_VERSION   1
 
 #define ISIS_VERSION   1
 #define ESIS_VERSION   1


@@ -470,35 +469,6 @@ struct isis_tlv_lsp {
     u_int8_t checksum[2];
 };
 
     u_int8_t checksum[2];
 };
 

-static char *
-print_nsap(register const u_int8_t *pptr, register int nsap_length)
-{
-       int nsap_idx;
-       static char nsap_ascii_output[sizeof("xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx")];
-        char *junk_buf = nsap_ascii_output;
-
-        if (nsap_length < 1 || nsap_length > NSAP_MAX_LENGTH) {
-                snprintf(nsap_ascii_output, sizeof(nsap_ascii_output),
-                    "illegal length");
-                return (nsap_ascii_output);
-        }
-
-       for (nsap_idx = 0; nsap_idx < nsap_length; nsap_idx++) {
-               if (!TTEST2(*pptr, 1))
-                       return (0);
-               snprintf(junk_buf,
-                   sizeof(nsap_ascii_output) - (junk_buf - nsap_ascii_output),
-                   "%02x", *pptr++);
-               junk_buf += strlen(junk_buf);
-               if (((nsap_idx & 1) == 0) &&
-                     (nsap_idx + 1 < nsap_length)) {
-                       *junk_buf++ = '.';
-               }
-       }
-        *(junk_buf) = '\0';
-       return (nsap_ascii_output);
-}
-

 #define ISIS_COMMON_HEADER_SIZE (sizeof(struct isis_common_header))
 #define ISIS_IIH_LAN_HEADER_SIZE (sizeof(struct isis_iih_lan_header))
 #define ISIS_IIH_PTP_HEADER_SIZE (sizeof(struct isis_iih_ptp_header))
 #define ISIS_COMMON_HEADER_SIZE (sizeof(struct isis_common_header))
 #define ISIS_IIH_LAN_HEADER_SIZE (sizeof(struct isis_iih_lan_header))
 #define ISIS_IIH_PTP_HEADER_SIZE (sizeof(struct isis_iih_ptp_header))


@@ -650,26 +620,24 @@ static int clnp_print (const u_int8_t *pptr, u_int length)
         li -= (1 + source_address_length);
 
         if (vflag < 1) {
         li -= (1 + source_address_length);
 
         if (vflag < 1) {

-            printf("%s%s",
+            printf("%s%s > %s, %s, length %u",

                    eflag ? "" : ", ",
                    eflag ? "" : ", ",

-                   print_nsap(source_address, source_address_length));
-            printf("> %s, length %u",
-                   print_nsap(dest_address, dest_address_length),
+                   isonsap_string(source_address, source_address_length),
+                   isonsap_string(dest_address, dest_address_length),
+                   tok2str(clnp_pdu_values,"unknown (%u)",clnp_pdu_type),

                    length);
             return (1);
         }
         printf("%slength %u",eflag ? "" : ", ",length);
 
                    length);
             return (1);
         }
         printf("%slength %u",eflag ? "" : ", ",length);
 

-    printf("\n\t%s PDU, hlen: %u, v: %u, lifetime: %u.%us, Segment PDU length: %u, checksum: 0x%04x ",
-           tok2str(clnp_pdu_values,
-                   "unknown (%u)",
-                   clnp_pdu_type),
-           clnp_header->length_indicator,
-           clnp_header->version,
-           clnp_header->lifetime/2,
-           (clnp_header->lifetime%2)*5,
-           EXTRACT_16BITS(clnp_header->segment_length),
-           EXTRACT_16BITS(clnp_header->cksum));
+        printf("\n\t%s PDU, hlen: %u, v: %u, lifetime: %u.%us, Segment PDU length: %u, checksum: 0x%04x ",
+               tok2str(clnp_pdu_values, "unknown (%u)",clnp_pdu_type),
+               clnp_header->length_indicator,
+               clnp_header->version,
+               clnp_header->lifetime/2,
+               (clnp_header->lifetime%2)*5,
+               EXTRACT_16BITS(clnp_header->segment_length),
+               EXTRACT_16BITS(clnp_header->cksum));

 
         /* do not attempt to verify the checksum if it is zero */
         if (EXTRACT_16BITS(clnp_header->cksum) == 0)
 
         /* do not attempt to verify the checksum if it is zero */
         if (EXTRACT_16BITS(clnp_header->cksum) == 0)


@@ -679,12 +647,11 @@ static int clnp_print (const u_int8_t *pptr, u_int length)
         printf("\n\tFlags [%s]",
                bittok2str(clnp_flag_values,"none",clnp_flags));
 
         printf("\n\tFlags [%s]",
                bittok2str(clnp_flag_values,"none",clnp_flags));
 

-        printf("\n\tsource address (length %u): %s",
+        printf("\n\tsource address (length %u): %s\n\tdest   address (length %u): %s",

                source_address_length,
                source_address_length,

-               print_nsap(source_address, source_address_length));
-        printf("\n\tdest   address (length %u): %s",
+               isonsap_string(source_address, source_address_length),

                dest_address_length,
                dest_address_length,

-               print_nsap(dest_address, dest_address_length));
+               isonsap_string(dest_address,dest_address_length));

 
         if (clnp_flags & CLNP_SEGMENT_PART) {
                clnp_segment_header = (const struct clnp_segment_header_t *) pptr;
 
         if (clnp_flags & CLNP_SEGMENT_PART) {
                clnp_segment_header = (const struct clnp_segment_header_t *) pptr;


@@ -877,7 +844,7 @@ esis_print(const u_int8_t *pptr, u_int length)
                dst = pptr; pptr += *pptr + 1;
                if (pptr > snapend)
                        return;
                dst = pptr; pptr += *pptr + 1;
                if (pptr > snapend)
                        return;

-               printf("\n\t  %s", isonsap_string(dst));
+               printf("\n\t  %s", isonsap_string(dst+1,*dst));

                snpa = pptr; pptr += *pptr + 1;
                tptr = pptr;   pptr += *pptr + 1;
                if (pptr > snapend)
                snpa = pptr; pptr += *pptr + 1;
                tptr = pptr;   pptr += *pptr + 1;
                if (pptr > snapend)


@@ -886,7 +853,7 @@ esis_print(const u_int8_t *pptr, u_int length)
                if (tptr[0] == 0)
                        printf("\n\t  %s", etheraddr_string(&snpa[1]));
                else
                if (tptr[0] == 0)
                        printf("\n\t  %s", etheraddr_string(&snpa[1]));
                else

-                       printf("\n\t  %s", isonsap_string(tptr));
+                       printf("\n\t  %s", isonsap_string(tptr+1,*tptr));

                break;
        }
 
                break;
        }
 


@@ -901,7 +868,7 @@ esis_print(const u_int8_t *pptr, u_int length)
                 source_address_length = *pptr;
                 printf("\n\t  NET (length: %u): %s",
                        source_address_length,
                 source_address_length = *pptr;
                 printf("\n\t  NET (length: %u): %s",
                        source_address_length,

-                       print_nsap(pptr+1, source_address_length));
+                       isonsap_string(pptr+1,source_address_length));

 
                 pptr += source_address_length+1;
                 li -= source_address_length+1;
 
                 pptr += source_address_length+1;
                 li -= source_address_length+1;


@@ -912,7 +879,7 @@ esis_print(const u_int8_t *pptr, u_int length)
 
        case ESIS_PDU_ISH: {
             source_address_length = *pptr;
 
        case ESIS_PDU_ISH: {
             source_address_length = *pptr;

-            printf("\n\t  NET (length: %u): %s", source_address_length, print_nsap(pptr+1, source_address_length));
+            printf("\n\t  NET (length: %u): %s", source_address_length, isonsap_string(pptr+1, source_address_length));

             pptr += source_address_length+1;
             li -= source_address_length +1;
             break;
             pptr += source_address_length+1;
             li -= source_address_length +1;
             break;


@@ -1853,7 +1820,7 @@ static int isis_print (const u_int8_t *p, u_int length)
            while (tmp && alen < tmp) {
                printf("\n\t      Area address (length: %u): %s",
                        alen,
            while (tmp && alen < tmp) {
                printf("\n\t      Area address (length: %u): %s",
                        alen,

-                       print_nsap(tptr, alen));
+                       isonsap_string(tptr,alen));

                tptr += alen;
                tmp -= alen + 1;
                if (tmp==0) /* if this is the last area address do not attemt a boundary check */
                tptr += alen;
                tmp -= alen + 1;
                if (tmp==0) /* if this is the last area address do not attemt a boundary check */


@@ -2291,7 +2258,7 @@ static int isis_print (const u_int8_t *p, u_int length)
                 if (!TTEST2(*tptr, prefix_len/2))
                     goto trunctlv;
                 printf("\n\t\tAddress: %s/%u",
                 if (!TTEST2(*tptr, prefix_len/2))
                     goto trunctlv;
                 printf("\n\t\tAddress: %s/%u",

-                       print_nsap(tptr,prefix_len/2),
+                       isonsap_string(tptr,prefix_len/2),

                        prefix_len*4);
                 tptr+=prefix_len/2;
                 tmp-=prefix_len/2;
                        prefix_len*4);
                 tptr+=prefix_len/2;
                 tmp-=prefix_len/2;