diff options
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_asbr.c | 9 | ||||
| -rw-r--r-- | ospf6d/ospf6_zebra.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6d.c | 18 |
3 files changed, 19 insertions, 10 deletions
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 8caae50221..da90e2f966 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -1170,6 +1170,15 @@ ospf6_routemap_init (void) route_map_set_metric_hook (generic_set_add); route_map_no_set_metric_hook (generic_set_delete); + route_map_match_tag_hook (generic_match_add); + route_map_no_match_tag_hook (generic_match_delete); + + route_map_match_ipv6_address_prefix_list_hook (generic_match_add); + route_map_no_match_ipv6_address_prefix_list_hook (generic_match_delete); + + route_map_match_interface_hook (generic_match_add); + route_map_no_match_interface_hook (generic_match_delete); + route_map_install_match (&ospf6_routemap_rule_match_address_prefixlist_cmd); route_map_install_match (&ospf6_routemap_rule_match_interface_cmd); route_map_install_match (&ospf6_routemap_rule_match_tag_cmd); diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 1904623e71..d0c9e4f042 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -289,7 +289,7 @@ ospf6_zebra_read_ipv6 (int command, struct zclient *zclient, snprintf (nexthopstr, sizeof (nexthopstr), "::"); zlog_debug ("Zebra Receive route %s: %s %s nexthop %s ifindex %ld tag %"ROUTE_TAG_PRI, - (command == ZEBRA_IPV6_ROUTE_ADD ? "add" : "delete"), + (command == ZEBRA_REDISTRIBUTE_IPV6_ADD ? "add" : "delete"), zebra_route_string(api.type), prefixstr, nexthopstr, ifindex, api.tag); } diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index 036cc6d4c8..aa219c7807 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -147,19 +147,19 @@ parse_type_spec (int idx_lsa, int argc, struct cmd_token **argv) if (argc > idx_lsa) { - if (strmatch (argv[0]->text, "router")) + if (strmatch (argv[idx_lsa]->text, "router")) type = htons (OSPF6_LSTYPE_ROUTER); - else if (strmatch (argv[0]->text, "network")) + else if (strmatch (argv[idx_lsa]->text, "network")) type = htons (OSPF6_LSTYPE_NETWORK); - else if (strmatch (argv[0]->text, "as-external")) + else if (strmatch (argv[idx_lsa]->text, "as-external")) type = htons (OSPF6_LSTYPE_AS_EXTERNAL); - else if (strmatch (argv[0]->text, "intra-prefix")) + else if (strmatch (argv[idx_lsa]->text, "intra-prefix")) type = htons (OSPF6_LSTYPE_INTRA_PREFIX); - else if (strmatch (argv[0]->text, "inter-router")) + else if (strmatch (argv[idx_lsa]->text, "inter-router")) type = htons (OSPF6_LSTYPE_INTER_ROUTER); - else if (strmatch (argv[0]->text, "inter-prefix")) + else if (strmatch (argv[idx_lsa]->text, "inter-prefix")) type = htons (OSPF6_LSTYPE_INTER_PREFIX); - else if (strmatch (argv[0]->text, "link")) + else if (strmatch (argv[idx_lsa]->text, "link")) type = htons (OSPF6_LSTYPE_LINK); } @@ -296,7 +296,7 @@ DEFUN (show_ipv6_ospf6_database_id, "Dump LSAs\n" "Display LSA's internal information\n") { - int idx_ipv4 = 4; + int idx_ipv4 = 5; int idx_level = 6; int level; struct listnode *i, *j; @@ -388,7 +388,7 @@ DEFUN (show_ipv6_ospf6_database_router, DEFUN (show_ipv6_ospf6_database_type_id, show_ipv6_ospf6_database_type_id_cmd, - "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> [linkstate-id] A.B.C.D [<detail|dump|internal>]", + "show ipv6 ospf6 database <router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix> linkstate-id A.B.C.D [<detail|dump|internal>]", SHOW_STR IPV6_STR OSPF6_STR |