diff options
author | Ondrej Filip <feela@majklik.network.cz> | 2010-04-27 11:28:44 +0200 |
---|---|---|
committer | Ondrej Filip <feela@majklik.network.cz> | 2010-04-27 11:28:44 +0200 |
commit | 96599c957baa9c82bde91d610ce4f519aead05e9 (patch) | |
tree | 28fc5b3e90afb11e288a6c428d1203dd7992bd35 /proto/ospf/config.Y | |
parent | ba130172549ef2313f713e048083432f74e7d03d (diff) | |
parent | 9d1ee1388771a3caa6c23163571a80457adfab2c (diff) | |
download | bird-96599c957baa9c82bde91d610ce4f519aead05e9.tar bird-96599c957baa9c82bde91d610ce4f519aead05e9.zip |
Merge branch 'master' of ssh://git.nic.cz/projects/bird/GIT/bird
Diffstat (limited to 'proto/ospf/config.Y')
-rw-r--r-- | proto/ospf/config.Y | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index da7c97e..5caba00 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -164,7 +164,6 @@ ospf_vlink_start: VIRTUAL LINK idval add_tail(&this_area->vlink_list, NODE this_ipatt); init_list(&this_ipatt->ipn_list); OSPF_PATT->vid = $3; - OSPF_PATT->cost = COST_D; OSPF_PATT->helloint = HELLOINT_D; OSPF_PATT->rxmtint = RXMTINT_D; OSPF_PATT->inftransdelay = INFTRANSDELAY_D; @@ -315,11 +314,21 @@ CF_CLI(SHOW OSPF NEIGHBORS, optsym opttext, [<name>] [\"<interface>\"], [[Show i CF_CLI(SHOW OSPF INTERFACE, optsym opttext, [<name>] [\"<interface>\"], [[Show information about interface]]) { ospf_sh_iface(proto_get_named($4, &proto_ospf), $5); }; -CF_CLI(SHOW OSPF TOPOLOGY, optsym opttext, [<name>], [[Show information about OSPF network topology]]) -{ ospf_sh_state(proto_get_named($4, &proto_ospf), 0); }; +CF_CLI_HELP(SHOW OSPF TOPOLOGY, [all] [<name>], [[Show information about OSPF network topology]]) + +CF_CLI(SHOW OSPF TOPOLOGY, optsym opttext, [<name>], [[Show information about reachable OSPF network topology]]) +{ ospf_sh_state(proto_get_named($4, &proto_ospf), 0, 1); }; + +CF_CLI(SHOW OSPF TOPOLOGY ALL, optsym opttext, [<name>], [[Show information about all OSPF network topology]]) +{ ospf_sh_state(proto_get_named($5, &proto_ospf), 0, 0); }; + +CF_CLI_HELP(SHOW OSPF STATE, [all] [<name>], [[Show information about OSPF network state]]) + +CF_CLI(SHOW OSPF STATE, optsym opttext, [<name>], [[Show information about reachable OSPF network state]]) +{ ospf_sh_state(proto_get_named($4, &proto_ospf), 1, 1); }; -CF_CLI(SHOW OSPF STATE, optsym opttext, [<name>], [[Show information about OSPF network state]]) -{ ospf_sh_state(proto_get_named($4, &proto_ospf), 1); }; +CF_CLI(SHOW OSPF STATE ALL, optsym opttext, [<name>], [[Show information about all OSPF network state]]) +{ ospf_sh_state(proto_get_named($5, &proto_ospf), 1, 0); }; CF_CLI(SHOW OSPF LSADB, optsym opttext, [<name>], [[Show content of OSPF LSA database]]) { ospf_sh_lsadb(proto_get_named($4, &proto_ospf)); }; |