Revision 145368f5 proto/ospf/config.Y

View differences:

proto/ospf/config.Y
132 132
CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, TAG, EXTERNAL)
133 133
CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY)
134 134
CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY, LENGTH)
135
CF_KEYWORDS(SECONDARY)
135
CF_KEYWORDS(SECONDARY, MERGE)
136 136

  
137 137
%type <t> opttext
138 138
%type <ld> lsadb_args
......
162 162
 | STUB ROUTER bool { OSPF_CFG->stub_router = $3; }
163 163
 | ECMP bool { OSPF_CFG->ecmp = $2 ? DEFAULT_ECMP_LIMIT : 0; }
164 164
 | ECMP bool LIMIT expr { OSPF_CFG->ecmp = $2 ? $4 : 0; if ($4 < 0) cf_error("ECMP limit cannot be negative"); }
165
 | MERGE EXTERNAL bool { OSPF_CFG->merge_external = $3; }
165 166
 | TICK expr { OSPF_CFG->tick = $2; if($2<=0) cf_error("Tick must be greater than zero"); }
166 167
 | ospf_area
167 168
 ;

Also available in: Unified diff