better idendation and dedicated line for the common header;

diff --git a/print-isoclns.c b/print-isoclns.c
index 0888211563806a7226737bd4d05f0e037156b30b..c45c73d20722b0f7e3e6c5868185064aa1231204 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.53 2002-07-19 09:34:05 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.54 2002-07-19 10:10:34 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -382,7 +382,7 @@ struct isis_common_header {
     u_char version;                    /* Protocol version? */
     u_char id_length;
     u_char pdu_type;                   /* 3 MSbs are reserved */
-    u_char pkt_version;                        /* Packet format version? */
+    u_char pdu_version;                        /* Packet format version? */
     u_char reserved;
     u_char max_area;
 };
@@ -590,7 +590,7 @@ esis_print(const u_char *p, u_int length)
                dst = p; p += *p + 1;
                if (p > snapend)
                        return;
-               printf("\n\t\t\t %s", isonsap_string(dst));
+               printf("\n\t\t %s", isonsap_string(dst));
                snpa = p; p += *p + 1;
                is = p;   p += *p + 1;
                if (p > snapend)
@@ -622,7 +622,7 @@ esis_print(const u_char *p, u_int length)
                if (p > snapend)
                        return;
                if (!qflag)
-                       printf("\n\t\t\t %s", isonsap_string(is));
+                       printf("\n\t\t %s", isonsap_string(is));
                li = ep - p;
                break;
        }
@@ -770,15 +770,15 @@ isis_print_metric_block (const struct isis_metric_block *isis_metric_block)
            ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_default),
            ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_default) ? "External" : "Internal");
     if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_delay))
-        printf("\n\t\t\t  Delay Metric: %d, %s",
+        printf("\n\t\t  Delay Metric: %d, %s",
                ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_delay),
                ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_delay) ? "External" : "Internal");
     if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_expense))
-        printf("\n\t\t\t  Expense Metric: %d, %s",
+        printf("\n\t\t  Expense Metric: %d, %s",
                ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_expense),
                ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_expense) ? "External" : "Internal");
     if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_error))
-        printf("\n\t\t\t  Error Metric: %d, %s",
+        printf("\n\t\t  Error Metric: %d, %s",
                ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_error),
                ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_error) ? "External" : "Internal");
 
@@ -831,31 +831,31 @@ isis_print_tlv_ip_reach (const u_char *cp, int length)
                 * lets dump the mask, otherwise print the prefix_len
                 */
                if (prefix_len == 34)
-                       printf("\n\t\t\tIPv4 prefix: %s mask %s",
+                       printf("\n\t\tIPv4 prefix: %s mask %s",
                               ipaddr_string((tlv_ip_reach->prefix)),
                               ipaddr_string((tlv_ip_reach->mask)));
                else
-                       printf("\n\t\t\tIPv4 prefix: %s/%u",
+                       printf("\n\t\tIPv4 prefix: %s/%u",
                               ipaddr_string((tlv_ip_reach->prefix)),
                               prefix_len);
 
-               printf("\n\t\t\t  Default Metric: %02d, %s, Distribution: %s",
+               printf("\n\t\t  Default Metric: %02d, %s, Distribution: %s",
                    ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_default),
                    ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_default) ? "External" : "Internal",
                    ISIS_LSP_TLV_METRIC_UPDOWN(tlv_ip_reach->isis_metric_block.metric_default) ? "down" : "up");
 
                if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_delay))
-                       printf("\n\t\t\t  Delay Metric: %02d, %s",
+                       printf("\n\t\t  Delay Metric: %02d, %s",
                            ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_delay),
                            ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_delay) ? "External" : "Internal");
 
                if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_expense))
-                       printf("\n\t\t\t  Expense Metric: %02d, %s",
+                       printf("\n\t\t  Expense Metric: %02d, %s",
                            ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_expense),
                            ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_expense) ? "External" : "Internal");
 
                if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_error))
-                       printf("\n\t\t\t  Error Metric: %02d, %s",
+                       printf("\n\t\t  Error Metric: %02d, %s",
                            ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_error),
                            ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_error) ? "External" : "Internal");
 
@@ -894,7 +894,7 @@ isis_print_ip_reach_subtlv (const u_char *tptr,int subt,int subl,const char *lf)
                    lf,
                    subt,
                    subl);
-            if(!print_unknown_data(tptr,"\n\t\t\t    ",
+            if(!print_unknown_data(tptr,"\n\t\t    ",
                                        subl))
                 return(0);
             break;
@@ -1042,7 +1042,7 @@ isis_print_is_reach_subtlv (const u_char *tptr,int subt,int subl,const char *lf)
             /* 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\t    ",
+                if(!print_unknown_data(tptr,"\n\t\t    ",
                                            subl-36))
                     return(0);
             }
@@ -1068,7 +1068,7 @@ isis_print_is_reach_subtlv (const u_char *tptr,int subt,int subl,const char *lf)
                    lf,
                    subt,
                    subl);
-            if(!print_unknown_data(tptr,"\n\t\t\t    ",
+            if(!print_unknown_data(tptr,"\n\t\t    ",
                                        subl))
                 return(0);
             break;
@@ -1140,8 +1140,8 @@ static int isis_print (const u_char *p, u_int length)
        return (0);
     }
 
-    if (header->pkt_version != ISIS_VERSION) {
-       printf(", version %d packet not supported", header->pkt_version);
+    if (header->pdu_version != ISIS_VERSION) {
+       printf(", version %d packet not supported", header->pdu_version);
        return (0);
     }
 
@@ -1180,9 +1180,10 @@ static int isis_print (const u_char *p, u_int length)
        break;
     }
 
-    printf(", hlen: %u, v: %u, sys-id-len: %u (%u), max-area: %u (%u)",
+    printf("\n\thlen: %u, v: %u, pdu-v: %u, sys-id-len: %u (%u), max-area: %u (%u)",
            header->fixed_len,
            header->version,
+           header->pdu_version,
           id_length,
           header->id_length,
            max_area,
@@ -1213,14 +1214,14 @@ static int isis_print (const u_char *p, u_int length)
        }
 
        TCHECK(*header_iih_lan);
-       printf("\n\t\t  source-id: %s,  holding time: %u, %s",
+       printf("\n\t  source-id: %s,  holding time: %u, %s",
                isis_print_sysid(header_iih_lan->source_id,SYSTEM_ID_LEN),
                EXTRACT_16BITS(header_iih_lan->holding_time),
                tok2str(isis_iih_circuit_type_values,
                        "unknown circuit type 0x%02x",
                        header_iih_lan->circuit_type));
 
-       printf("\n\t\t  lan-id:    %s, Priority: %u, PDU length: %u",
+       printf("\n\t  lan-id:    %s, Priority: %u, PDU length: %u",
                isis_print_nodeid(header_iih_lan->lan_id),
                (header_iih_lan->priority) & PRIORITY_MASK,
                pdu_len);
@@ -1243,7 +1244,7 @@ static int isis_print (const u_char *p, u_int length)
        }
 
        TCHECK(*header_iih_ptp);
-       printf("\n\t\t  source-id: %s, holding time: %us, circuit-id: 0x%02x, %s, PDU length: %u",
+       printf("\n\t  source-id: %s, holding time: %us, circuit-id: 0x%02x, %s, PDU length: %u",
                isis_print_sysid(header_iih_ptp->source_id,SYSTEM_ID_LEN),
                EXTRACT_16BITS(header_iih_ptp->holding_time),
                header_iih_ptp->circuit_id,
@@ -1271,14 +1272,14 @@ static int isis_print (const u_char *p, u_int length)
        }
 
        TCHECK(*header_lsp);
-       printf("\n\t\t  lsp-id: %s, seq: 0x%08x, lifetime: %5us",
+       printf("\n\t  lsp-id: %s, seq: 0x%08x, lifetime: %5us",
                isis_print_lspid(header_lsp->lsp_id),
                EXTRACT_32BITS(header_lsp->sequence_number),
                EXTRACT_16BITS(header_lsp->remaining_lifetime));
         /* verify the checksum -
          * checking starts at the lsp-id field
          * which is 12 bytes after the packet start*/
-       printf("\n\t\t  chksum: 0x%04x (%s), PDU length: %u",
+       printf("\n\t  chksum: 0x%04x (%s), PDU length: %u",
                EXTRACT_16BITS(header_lsp->checksum),
                (osi_cksum(optr+12, length-12)) ? "incorrect" : "correct",
                pdu_len);
@@ -1314,12 +1315,12 @@ static int isis_print (const u_char *p, u_int length)
        }
 
        TCHECK(*header_csnp);
-       printf("\n\t\t  source-id:    %s, PDU length: %u",
+       printf("\n\t  source-id:    %s, PDU length: %u",
                isis_print_nodeid(header_csnp->source_id),
                pdu_len);
-       printf("\n\t\t  start lsp-id: %s",
+       printf("\n\t  start lsp-id: %s",
                isis_print_lspid(header_csnp->start_lsp_id));
-       printf("\n\t\t  end lsp-id:   %s",
+       printf("\n\t  end lsp-id:   %s",
                isis_print_lspid(header_csnp->end_lsp_id));
 
        packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE);
@@ -1341,7 +1342,7 @@ static int isis_print (const u_char *p, u_int length)
        }
 
        TCHECK(*header_psnp);
-       printf("\n\t\t  source-id:    %s",
+       printf("\n\t  source-id:    %s",
                isis_print_nodeid(header_psnp->source_id));
 
        packet_len -= (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE);
@@ -1349,7 +1350,7 @@ static int isis_print (const u_char *p, u_int length)
        break;
 
     default:
-       if(!print_unknown_data(pptr,"\n\t\t  ",length))
+       if(!print_unknown_data(pptr,"\n\t  ",length))
            return(0);
        return (0);
     }
@@ -1364,7 +1365,7 @@ static int isis_print (const u_char *p, u_int length)
         }
 
        if (!TTEST2(*pptr, 2)) {
-           printf("\n\t\t\t packet exceeded snapshot (%ld) bytes",
+           printf("\n\t\t packet exceeded snapshot (%ld) bytes",
                  (long)(pptr-snapend));
            return (1);
        }
@@ -1378,7 +1379,7 @@ static int isis_print (const u_char *p, u_int length)
        }
 
         /* first lets see if we know the TLVs name*/
-       printf("\n\t\t    %s TLV #%u, length: %u",
+       printf("\n\t    %s TLV #%u, length: %u",
                tok2str(isis_tlv_values,
                        "unknown",
                        type),
@@ -1392,7 +1393,7 @@ static int isis_print (const u_char *p, u_int length)
                goto trunctlv;
            alen = *tptr++;
            while (tmp && alen < tmp) {
-               printf("\n\t\t\tArea address (%u): %s",
+               printf("\n\t\tArea address (%u): %s",
                        alen,
                        print_nsap(tptr, alen));
                tptr += alen;
@@ -1408,7 +1409,7 @@ static int isis_print (const u_char *p, u_int length)
            while (tmp >= ETHER_ADDR_LEN) {
             if (!TTEST2(*tptr, ETHER_ADDR_LEN))
                goto trunctlv;
-            printf("\n\t\t\tIS Neighbor: %s",isis_print_sysid(tptr,ETHER_ADDR_LEN));
+            printf("\n\t\tIS Neighbor: %s",isis_print_sysid(tptr,ETHER_ADDR_LEN));
             tmp -= ETHER_ADDR_LEN;
             tptr += ETHER_ADDR_LEN;
            }
@@ -1419,11 +1420,11 @@ static int isis_print (const u_char *p, u_int length)
                goto trunctlv;
            lan_alen = *tptr++; /* LAN adress length */
             tmp --;
-            printf("\n\t\t\tLAN address length %u bytes ",lan_alen);
+            printf("\n\t\tLAN address length %u bytes ",lan_alen);
            while (tmp >= lan_alen) {
             if (!TTEST2(*tptr, lan_alen))
                goto trunctlv;
-            printf("\n\t\t\tIS Neighbor: %s",isis_print_sysid(tptr,lan_alen));
+            printf("\n\t\tIS Neighbor: %s",isis_print_sysid(tptr,lan_alen));
             tmp -= lan_alen;
             tptr +=lan_alen;
             }
@@ -1436,7 +1437,7 @@ static int isis_print (const u_char *p, u_int length)
             while (tmp>0) {
                 if (!TTEST2(*tptr, 2))
                    goto trunctlv;
-                printf("\n\t\t\t%s",
+                printf("\n\t\t%s",
                        tok2str(isis_mt_values,
                                "Reserved for IETF Consensus",
                                ISIS_MASK_MTID(EXTRACT_16BITS(tptr))));
@@ -1446,7 +1447,7 @@ static int isis_print (const u_char *p, u_int length)
                 tptr+=2;
                 if (!TTEST2(*tptr, NODE_ID_LEN))
                    goto trunctlv;
-               printf("\n\t\t\t  IS Neighbor: %s", isis_print_nodeid(tptr));
+               printf("\n\t\t  IS Neighbor: %s", isis_print_nodeid(tptr));
                 tptr+=(NODE_ID_LEN);
                 if (!TTEST2(*tptr, 3))
                     goto trunctlv;
@@ -1463,7 +1464,7 @@ static int isis_print (const u_char *p, u_int length)
                             goto trunctlv;
                        subt=*(tptr++);
                        subl=*(tptr++);
-                       if(!isis_print_is_reach_subtlv(tptr,subt,subl,"\n\t\t\t  "))
+                       if(!isis_print_is_reach_subtlv(tptr,subt,subl,"\n\t\t  "))
                            return(0);
                        tptr+=subl;
                        tslen-=(subl+2);
@@ -1478,7 +1479,7 @@ static int isis_print (const u_char *p, u_int length)
             while (tmp>0) {
                 if (!TTEST2(*tptr, NODE_ID_LEN))
                     goto trunctlv;
-               printf("\n\t\t\tIS Neighbor: %s", isis_print_nodeid(tptr));
+               printf("\n\t\tIS Neighbor: %s", isis_print_nodeid(tptr));
                 tptr+=(NODE_ID_LEN);
 
                 if (!TTEST2(*tptr, 3))
@@ -1497,7 +1498,7 @@ static int isis_print (const u_char *p, u_int length)
                             goto trunctlv;
                        subt=*(tptr++);
                        subl=*(tptr++);
-                       if(!isis_print_is_reach_subtlv(tptr,subt,subl,"\n\t\t\t  "))
+                       if(!isis_print_is_reach_subtlv(tptr,subt,subl,"\n\t\t  "))
                            return(0);
                        tptr+=subl;
                        tslen-=(subl+2);
@@ -1510,7 +1511,7 @@ static int isis_print (const u_char *p, u_int length)
         case TLV_IS_REACH:
            if (!TTEST2(*tptr,1))  /* check if there is one byte left to read out the virtual flag */
                 goto trunctlv;
-            printf("\n\t\t\t%s",
+            printf("\n\t\t%s",
                    tok2str(isis_is_reach_virtual_values,
                            "bogus virtual flag 0x%02x",
                            *tptr++));
@@ -1518,7 +1519,7 @@ static int isis_print (const u_char *p, u_int length)
             while (tmp >= sizeof(struct isis_tlv_is_reach)) {
                if (!TTEST(*tlv_is_reach))
                    goto trunctlv;
-               printf("\n\t\t\tIS Neighbor: %s", isis_print_nodeid(tlv_is_reach->neighbor_nodeid));
+               printf("\n\t\tIS Neighbor: %s", isis_print_nodeid(tlv_is_reach->neighbor_nodeid));
                 isis_print_metric_block(&tlv_is_reach->isis_metric_block);
                tmp -= sizeof(struct isis_tlv_is_reach);
                tlv_is_reach++;
@@ -1530,7 +1531,7 @@ static int isis_print (const u_char *p, u_int length)
             while (tmp >= sizeof(struct isis_tlv_es_reach)) {
                if (!TTEST(*tlv_es_reach))
                    goto trunctlv;
-               printf("\n\t\t\tES Neighbor: %s",
+               printf("\n\t\tES Neighbor: %s",
                        isis_print_sysid(tlv_es_reach->neighbor_sysid,SYSTEM_ID_LEN));
                 isis_print_metric_block(&tlv_es_reach->isis_metric_block);
                tmp -= sizeof(struct isis_tlv_es_reach);
@@ -1550,7 +1551,7 @@ static int isis_print (const u_char *p, u_int length)
                 if (!TTEST2(*tptr, 2))
                    goto trunctlv;
 
-                printf("\n\t\t\t%s",
+                printf("\n\t\t%s",
                        tok2str(isis_mt_values,
                                "Reserved for IETF Consensus",
                                ISIS_MASK_MTID(EXTRACT_16BITS(tptr))));
@@ -1575,11 +1576,11 @@ static int isis_print (const u_char *p, u_int length)
                    return (1);
                memcpy(prefix,tptr,byte_length);
                 tptr+=byte_length;
-               printf("\n\t\t\tIPv4 prefix: %s/%d",
+               printf("\n\t\tIPv4 prefix: %s/%d",
                       ipaddr_string(prefix),
                       bit_length);
 
-               printf("\n\t\t\t  Metric: %u, Distribution: %s",
+               printf("\n\t\t  Metric: %u, Distribution: %s",
                       metric,
                       ISIS_MASK_TLV_EXT_IP_UPDOWN(j) ? "down" : "up");
 
@@ -1602,7 +1603,7 @@ static int isis_print (const u_char *p, u_int length)
                             goto trunctlv;
                        subt=*(tptr++);
                        subl=*(tptr++);
-                       if(!isis_print_ip_reach_subtlv(tptr,subt,subl,"\n\t\t\t  "))
+                       if(!isis_print_ip_reach_subtlv(tptr,subt,subl,"\n\t\t  "))
                            return(0);
                        tptr+=subl;
                        tslen-=(subl+2);
@@ -1631,11 +1632,11 @@ static int isis_print (const u_char *p, u_int length)
                    return (1);
                memcpy(prefix,tptr,byte_length);
                 tptr+=byte_length;
-               printf("\n\t\t\tIPv4 prefix: %s/%d",
+               printf("\n\t\tIPv4 prefix: %s/%d",
                       ipaddr_string(prefix),
                       bit_length);
 
-               printf("\n\t\t\t  Metric: %u, Distribution: %s",
+               printf("\n\t\t  Metric: %u, Distribution: %s",
                       metric,
                       ISIS_MASK_TLV_EXT_IP_UPDOWN(j) ? "down" : "up");
 
@@ -1658,7 +1659,7 @@ static int isis_print (const u_char *p, u_int length)
                             goto trunctlv;
                        subt=*(tptr++);
                        subl=*(tptr++);
-                       if(!isis_print_ip_reach_subtlv(tptr,subt,subl,"\n\t\t\t  "))
+                       if(!isis_print_ip_reach_subtlv(tptr,subt,subl,"\n\t\t  "))
                            return(0);
                        tptr+=subl;
                        tslen-=(subl+2);
@@ -1689,11 +1690,11 @@ static int isis_print (const u_char *p, u_int length)
                memset(prefix6, 0, 16);
                memcpy(prefix6,tptr,byte_length);
                 tptr+=byte_length;
-               printf("\n\t\t\tIPv6 prefix: %s/%u",
+               printf("\n\t\tIPv6 prefix: %s/%u",
                       ip6addr_string(prefix6),
                       bit_length);
 
-               printf("\n\t\t\t  Metric: %u, %s, Distribution: %s, %ssub-TLVs present",
+               printf("\n\t\t  Metric: %u, %s, Distribution: %s, %ssub-TLVs present",
                    metric,
                    ISIS_MASK_TLV_IP6_IE(j) ? "External" : "Internal",
                    ISIS_MASK_TLV_IP6_UPDOWN(j) ? "down" : "up",
@@ -1715,7 +1716,7 @@ static int isis_print (const u_char *p, u_int length)
                             goto trunctlv;
                        subt=*(tptr++);
                        subl=*(tptr++);
-                       if(!isis_print_ip_reach_subtlv(tptr,subt,subl,"\n\t\t\t  "))
+                       if(!isis_print_ip_reach_subtlv(tptr,subt,subl,"\n\t\t  "))
                            return(0);
                        tptr+=subl;
                        tslen-=(subl+2);
@@ -1734,7 +1735,7 @@ static int isis_print (const u_char *p, u_int length)
                if (!TTEST2(*tptr, 16))
                    goto trunctlv;
 
-                printf("\n\t\t\tIPv6 interface address: %s",
+                printf("\n\t\tIPv6 interface address: %s",
                       ip6addr_string(tptr));
 
                tptr += 16;
@@ -1746,7 +1747,7 @@ static int isis_print (const u_char *p, u_int length)
            if (!TTEST2(*tptr, 1))
                goto trunctlv;
 
-            printf("\n\t\t\t%s: ",
+            printf("\n\t\t%s: ",
                    tok2str(isis_subtlv_auth_values,
                            "unknown Authentication type 0x%02x",
                            *tptr));
@@ -1770,7 +1771,7 @@ static int isis_print (const u_char *p, u_int length)
                break;
            case SUBTLV_AUTH_PRIVATE:
            default:
-               if(!print_unknown_data(tptr+1,"\n\t\t\t    ",len-1))
+               if(!print_unknown_data(tptr+1,"\n\t\t    ",len-1))
                    return(0);
                break;
            }
@@ -1781,7 +1782,7 @@ static int isis_print (const u_char *p, u_int length)
            if(tmp>=1) {
                if (!TTEST2(*tptr, 1))
                    goto trunctlv;
-               printf("\n\t\t\tAdjacency State: %s",
+               printf("\n\t\tAdjacency State: %s",
                       tok2str(isis_ptp_adjancey_values, "0x%02x", *tptr));
                tmp--;
            }
@@ -1789,14 +1790,14 @@ static int isis_print (const u_char *p, u_int length)
                if (!TTEST2(tlv_ptp_adj->extd_local_circuit_id,
                             sizeof(tlv_ptp_adj->extd_local_circuit_id)))
                    goto trunctlv;
-               printf("\n\t\t\tExtended Local circuit ID: 0x%08x",
+               printf("\n\t\tExtended Local circuit ID: 0x%08x",
                       EXTRACT_32BITS(tlv_ptp_adj->extd_local_circuit_id));
                tmp-=sizeof(tlv_ptp_adj->extd_local_circuit_id);
            }
            if(tmp>=SYSTEM_ID_LEN) {
                if (!TTEST2(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN))
                    goto trunctlv;
-               printf("\n\t\t\tNeighbor SystemID: %s",
+               printf("\n\t\tNeighbor SystemID: %s",
                       isis_print_sysid(tlv_ptp_adj->neighbor_sysid,SYSTEM_ID_LEN));
                tmp-=SYSTEM_ID_LEN;
            }
@@ -1804,13 +1805,13 @@ static int isis_print (const u_char *p, u_int length)
                if (!TTEST2(tlv_ptp_adj->neighbor_extd_local_circuit_id,
                             sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)))
                    goto trunctlv;
-               printf("\n\t\t\tNeighbor Extended Local circuit ID: 0x%08x",
+               printf("\n\t\tNeighbor Extended Local circuit ID: 0x%08x",
                       EXTRACT_32BITS(tlv_ptp_adj->neighbor_extd_local_circuit_id));
            }
            break;
 
        case TLV_PROTOCOLS:
-           printf("\n\t\t\tNLPID(s): ");
+           printf("\n\t\tNLPID(s): ");
            while (tmp>0) {
                if (!TTEST2(*(tptr), 1))
                    goto trunctlv;
@@ -1827,21 +1828,21 @@ static int isis_print (const u_char *p, u_int length)
        case TLV_TE_ROUTER_ID:
            if (!TTEST2(*pptr, 4))
                goto trunctlv;
-           printf("\n\t\t\tTraffic Engineering Router ID: %s", ipaddr_string(pptr));
+           printf("\n\t\tTraffic Engineering Router ID: %s", ipaddr_string(pptr));
            break;
 
        case TLV_IPADDR:
            while (tmp>0) {
                if (!TTEST2(*tptr, 4))
                    goto trunctlv;
-               printf("\n\t\t\tIPv4 interface address: %s", ipaddr_string(tptr));
+               printf("\n\t\tIPv4 interface address: %s", ipaddr_string(tptr));
                tptr += 4;
                tmp -= 4;
            }
            break;
 
        case TLV_HOSTNAME:
-           printf("\n\t\t\tHostname: ");
+           printf("\n\t\tHostname: ");
            while (tmp>0) {
                if (!TTEST2(*tptr, 1))
                    goto trunctlv;
@@ -1853,7 +1854,7 @@ static int isis_print (const u_char *p, u_int length)
        case TLV_SHARED_RISK_GROUP:
            if (!TTEST2(*tptr, NODE_ID_LEN))
              goto trunctlv;
-           printf("\n\t\t\tIS Neighbor: %s", isis_print_nodeid(tptr));
+           printf("\n\t\tIS Neighbor: %s", isis_print_nodeid(tptr));
            tptr+=(NODE_ID_LEN);
            len-=(NODE_ID_LEN);
 
@@ -1864,20 +1865,20 @@ static int isis_print (const u_char *p, u_int length)
 
            if (!TTEST2(*tptr,4))
              goto trunctlv;
-           printf("\n\t\t\tIPv4 interface address: %s", ipaddr_string(tptr));
+           printf("\n\t\tIPv4 interface address: %s", ipaddr_string(tptr));
            tptr+=4;
            len-=4;
 
            if (!TTEST2(*tptr,4))
              goto trunctlv;
-           printf("\n\t\t\tIPv4 neighbor address: %s", ipaddr_string(tptr));
+           printf("\n\t\tIPv4 neighbor address: %s", ipaddr_string(tptr));
            tptr+=4;
            len-=4;
 
            while (tmp>0) {
              if (!TTEST2(*tptr, 4))
                goto trunctlv;
-             printf("\n\t\t\tLink-ID: 0x%08x", EXTRACT_32BITS(tptr));
+             printf("\n\t\tLink-ID: 0x%08x", EXTRACT_32BITS(tptr));
              tptr+=4;
              len-=4;
            }
@@ -1886,7 +1887,7 @@ static int isis_print (const u_char *p, u_int length)
        case TLV_LSP:
            tlv_lsp = (const struct isis_tlv_lsp *)tptr;
            while(tmp>0) {
-               printf("\n\t\t\tlsp-id: %s",
+               printf("\n\t\tlsp-id: %s",
                        isis_print_nodeid(tlv_lsp->lsp_id));
                if (!TTEST((tlv_lsp->lsp_id)[NODE_ID_LEN]))
                    goto trunctlv;
@@ -1908,7 +1909,7 @@ static int isis_print (const u_char *p, u_int length)
        case TLV_CHECKSUM:
            if (!TTEST2(*tptr, 2))
                goto trunctlv;
-           printf("\n\t\t\tchecksum: 0x%04x (%s)",
+           printf("\n\t\tchecksum: 0x%04x (%s)",
                   EXTRACT_16BITS(tptr),
                    (osi_cksum(optr, length)) ? "incorrect" : "correct");
            break;
@@ -1920,7 +1921,7 @@ static int isis_print (const u_char *p, u_int length)
                if (tmp!=1) {
                    if (!TTEST2(*tptr, 2))
                        goto trunctlv;
-                    printf("\n\t\t\t%s",
+                    printf("\n\t\t%s",
                            tok2str(isis_mt_values,
                                    "Reserved for IETF Consensus",
                                    ISIS_MASK_MTID(EXTRACT_16BITS(tptr))));
@@ -1930,7 +1931,7 @@ static int isis_print (const u_char *p, u_int length)
                           ISIS_MASK_MTSUB(EXTRACT_16BITS(tptr)) ? "" : ", no sub-TLVs present",
                           ISIS_MASK_MTATT(EXTRACT_16BITS(tptr)) ? ", ATT bit set" : "" );
                } else {
-                   printf("\n\t\t\tmalformed MT-ID");
+                   printf("\n\t\tmalformed MT-ID");
                    break;
                }
                tmp-=2;
@@ -1945,14 +1946,14 @@ static int isis_print (const u_char *p, u_int length)
            ra = ISIS_MASK_TLV_RESTART_RA(*tptr);
            tptr++;
            time_remain = EXTRACT_16BITS(tptr);
-           printf("\n\t\t\tRestart Request bit %s, Restart Acknowledgement bit %s\n\t\t\tRemaining holding time: %us",
+           printf("\n\t\tRestart Request bit %s, Restart Acknowledgement bit %s\n\t\tRemaining holding time: %us",
                   rr ? "set" : "clear", ra ? "set" : "clear", time_remain);
            break;
 
         case TLV_IDRP_INFO:
             if (!TTEST2(*tptr, 1))
                 goto trunctlv;
-            printf("\n\t\t\tInter-Domain Information Type: %s",
+            printf("\n\t\tInter-Domain Information Type: %s",
                    tok2str(isis_subtlv_idrp_values,
                            "Unknown (0x%02x)",
                            *tptr));
@@ -1965,7 +1966,7 @@ static int isis_print (const u_char *p, u_int length)
             case SUBTLV_IDRP_LOCAL:
             case SUBTLV_IDRP_RES:
             default:
-                if(!print_unknown_data(tptr,"\n\t\t\t",len-1))
+                if(!print_unknown_data(tptr,"\n\t\t",len-1))
                     return(0);
                 break;
             }
@@ -2002,7 +2003,7 @@ static int isis_print (const u_char *p, u_int length)
                 tmp--;
                 if (!TTEST2(*tptr, prefix_len/2))
                     goto trunctlv;
-                printf("\n\t\t\tAddress: %s/%u",
+                printf("\n\t\tAddress: %s/%u",
                        print_nsap(tptr,prefix_len/2),
                        prefix_len*4);
                 tptr+=prefix_len/2;
@@ -2024,7 +2025,7 @@ static int isis_print (const u_char *p, u_int length)
         case TLV_MT_IP6_REACH:
 
        default:
-           if(!print_unknown_data(pptr,"\n\t\t\t",len))
+           if(!print_unknown_data(pptr,"\n\t\t",len))
                return(0);
            break;
        }
@@ -2034,7 +2035,7 @@ static int isis_print (const u_char *p, u_int length)
     }
 
     if (packet_len != 0) {
-       printf("\n\t\t\t %d straggler bytes", packet_len);
+       printf("\n\t\t %d straggler bytes", packet_len);
     }
     return (1);
 
@@ -2043,7 +2044,7 @@ trunc:
     return (1);
 
 trunctlv:
-    printf("\n\t\t\t packet exceeded snapshot");
+    printf("\n\t\t packet exceeded snapshot");
     return(1);
 }