Merge remote-tracking branch 'origin/stable/2.0'

6 files changed, 18 insertions, 17 deletions

diff --git a/isisd/dict.c b/isisd/dict.c
index a038028d2..56676edaf 100644
--- a/isisd/dict.c
+++ b/isisd/dict.c
@@ -649,6 +649,7 @@ dnode_t *dict_delete(dict_t *dict, dnode_t *delete)
 
     if (delete->left != nil && delete->right != nil) {
 	dnode_t *next = dict_next(dict, delete);
+	assert (next);
 	dnode_t *nextparent = next->parent;
 	dnode_color_t nextcolor = next->color;
 
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index b138b8950..6207ae189 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -306,12 +306,12 @@ isis_circuit_del_addr (struct isis_circuit *circuit,
       else
 	{
 	  prefix2str (connected->address, buf, sizeof (buf));
-	  zlog_warn ("Nonexitant ip address %s removal attempt from \
+	  zlog_warn ("Nonexistant ip address %s removal attempt from \
                       circuit %d", buf, circuit->circuit_id);
 	  zlog_warn ("Current ip addresses on %s:", circuit->interface->name);
 	  for (ALL_LIST_ELEMENTS_RO(circuit->ip_addrs, node, ip))
 	    {
-	      prefix2str((struct prefix*)ip, (char *)buf, BUFSIZ);
+	      prefix2str(ip, buf, sizeof(buf));
 	      zlog_warn("  %s", buf);
 	    }
 	  zlog_warn("End of addresses");
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index da24a7f0d..fac62f6e1 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -2460,8 +2460,7 @@ lsp_regenerate_schedule_pseudo (struct isis_circuit *circuit, int level)
   int lvl;
   struct isis_area *area = circuit->area;
 
-  if (circuit == NULL ||
-      circuit->circ_type != CIRCUIT_T_BROADCAST ||
+  if (circuit->circ_type != CIRCUIT_T_BROADCAST ||
       circuit->state != C_STATE_UP)
     return ISIS_OK;
 
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index e111a17de..5fbf6c194 100644
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -2408,7 +2408,7 @@ send_lan_l1_hello (struct thread *thread)
     }
 
   if (circuit->u.bc.run_dr_elect[0])
-    retval = isis_dr_elect (circuit, 1);
+    isis_dr_elect (circuit, 1);
 
   retval = send_hello (circuit, 1);
 
@@ -2438,7 +2438,7 @@ send_lan_l2_hello (struct thread *thread)
     }
 
   if (circuit->u.bc.run_dr_elect[1])
-    retval = isis_dr_elect (circuit, 2);
+    isis_dr_elect (circuit, 2);
 
   retval = send_hello (circuit, 2);
 
diff --git a/isisd/isis_route.c b/isisd/isis_route.c
index b2b858feb..4f82edaef 100644
--- a/isisd/isis_route.c
+++ b/isisd/isis_route.c
@@ -570,6 +570,12 @@ isis_route_validate_merge (struct isis_area *area, int family)
     table = area->route_table[0];
   else if (family == AF_INET6)
     table = area->route_table6[0];
+  else
+    {
+      zlog_warn ("ISIS-Rte (%s) %s called for unknown family %d",
+                 area->area_tag, __func__, family);
+      return;
+    }
 
   for (rnode = route_top (table); rnode; rnode = route_next (rnode))
     {
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);