Merge branch 'master' of https://github.com/freerangerouting/frr into coverity

This commit is contained in:
Donald Sharp 2017-02-08 09:35:57 -05:00
commit ce45c9cc64
2 changed files with 4 additions and 4 deletions

View File

@ -2303,9 +2303,9 @@ DEFUN (no_match_metric,
if (argc <= idx_number)
return rmap_match_set_hook.no_match_metric (vty, index, "metric",
NULL, RMAP_EVENT_MATCH_DELETED);
return rmap_match_set_hook.no_match_metric(vty, index, "metric",
argv[idx_number]->arg,
RMAP_EVENT_MATCH_DELETED);
return rmap_match_set_hook.no_match_metric(vty, index, "metric",
argv[idx_number]->arg,
RMAP_EVENT_MATCH_DELETED);
}
return CMD_SUCCESS;
}

View File

@ -709,7 +709,7 @@ parse_test (struct peer *peer, struct test_segment *t, int type)
parse_ret = bgp_mp_unreach_parse (&attr_args, &nlri);
if (!parse_ret)
{
afi_t pkt_afi;
iana_afi_t pkt_afi;
safi_t pkt_safi;
/* Convert AFI, SAFI to internal values, check. */