diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-11-09 22:54:39 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-11-09 22:54:39 +0100 |
| commit | 3f22fa9e74c8643d3e4f7e3a7b4f2aa992ad09f5 (patch) | |
| tree | 703e2606e1f01118098ad662f0ecc54c0c48fcd6 /proto/ospf | |
| parent | a6bc04d59130c49a1dbfadffa4285b11e2ff4939 (diff) | |
| parent | b7c0e93ebd40cdc4f6e89067a3e5f7293263c7f9 (diff) | |
Merge branch 'dev' into ospf3
Diffstat (limited to 'proto/ospf')
| -rw-r--r-- | proto/ospf/config.Y | 5 | ||||
| -rw-r--r-- | proto/ospf/ospf.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 7b2641b2..f75e8eb5 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -45,12 +45,13 @@ finish_iface_config(struct ospf_iface_patt *ip) CF_DECLS -CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG) +CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, BROADCAST) CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, RETRANSMIT) CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, NONBROADCAST, POINTOPOINT, TYPE) CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC) CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, LINK) -CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, LSADB) +CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY) +CF_KEYWORDS(WAIT, DELAY, LSADB) %type <t> opttext diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index 3e33e453..5a11418f 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -786,6 +786,8 @@ static inline void schedule_link_lsa(struct ospf_iface *ifa) {} void ospf_sh_neigh(struct proto *p, char *iff); void ospf_sh(struct proto *p); void ospf_sh_iface(struct proto *p, char *iff); +void ospf_sh_state(struct proto *p, int verbose); + #define EA_OSPF_METRIC1 EA_CODE(EAP_OSPF, 0) #define EA_OSPF_METRIC2 EA_CODE(EAP_OSPF, 1) |