diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-24 15:32:47 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-24 15:32:47 +0100 |
| commit | 3f3169a2e6d9d710135ea54100b3517fae59290c (patch) | |
| tree | f4ff6b26113a4e8c2d6e1c479b1b5c61ce0a4936 /isisd/isis_te.c | |
| parent | Merge branch 'frr/pull/210' ("tools: frr-reload removes "ipv6 nd ra-interval"... (diff) | |
| parent | Merge pull request #221 from LabNConsulting/working/2.0/patch/issue-218 (diff) | |
| download | frr-3f3169a2e6d9d710135ea54100b3517fae59290c.tar.xz frr-3f3169a2e6d9d710135ea54100b3517fae59290c.zip | |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'isisd/isis_te.c')
| -rw-r--r-- | isisd/isis_te.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 34cd8397f..830ccb37c 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -985,17 +985,15 @@ show_vty_unknown_tlv (struct vty *vty, struct subtlv_header *tlvh) void mpls_te_print_detail(struct vty *vty, struct te_is_neigh *te) { - struct subtlv_header *tlvh, *next; + struct subtlv_header *tlvh; u_int16_t sum = 0; zlog_debug ("ISIS MPLS-TE: Show database TE detail"); tlvh = (struct subtlv_header *)te->sub_tlvs; - for (; sum < te->sub_tlvs_length; tlvh = (next ? next : SUBTLV_HDR_NEXT (tlvh))) + for (; sum < te->sub_tlvs_length; tlvh = SUBTLV_HDR_NEXT (tlvh)) { - next = NULL; - switch (tlvh->type) { case TE_SUBTLV_ADMIN_GRP: @@ -1223,13 +1221,10 @@ DEFUN (show_isis_mpls_te_router, { vty_out (vty, "--- MPLS-TE router parameters ---%s", VTY_NEWLINE); - if (vty != NULL) - { - if (ntohs (isisMplsTE.router_id.s_addr) != 0) - vty_out (vty, " Router-Address: %s%s", inet_ntoa (isisMplsTE.router_id), VTY_NEWLINE); - else - vty_out (vty, " N/A%s", VTY_NEWLINE); - } + if (ntohs (isisMplsTE.router_id.s_addr) != 0) + vty_out (vty, " Router-Address: %s%s", inet_ntoa (isisMplsTE.router_id), VTY_NEWLINE); + else + vty_out (vty, " N/A%s", VTY_NEWLINE); } else vty_out (vty, " MPLS-TE is disable on this router%s", VTY_NEWLINE); |