Merge commit 'a5fc59587fe864e4fcfb44eb3be57231b4ca339b' into integrated

Conflicts:

	filter/filter.c
	nest/config.Y

diff --cc filter/config.Y
Simple merge

diff --cc filter/filter.h
Simple merge

diff --cc nest/config.Y
index 35c7a3b796b6ed5226e85e8f27a6da5c7a1212ec,e9b8a21ba4fdb5a1ddf9125c28b0b31006390b29..4315979f8f5ffabc6f833e6d7b5fce680ae8685e
--- 1/nest/config.Y
--- 2/nest/config.Y
+++ b/nest/config.Y
@@@ -44,10 -44,9 +44,10 @@@ CF_DECL
  
  CF_KEYWORDS(ROUTER, ID, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
  CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS)
 +CF_KEYWORDS(IPV4, IPVX, VPN4, VPN6, MPLS)
  CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED)
  CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
- CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, GENERATE, ROA, AS, MAX, FLUSH)
+ CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, GENERATE, ROA, MAX, FLUSH, AS)
  CF_KEYWORDS(LISTEN, BGP, V6ONLY, DUAL, ADDRESS, PORT, PASSWORDS, DESCRIPTION, SORTED)
  CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP)
  

diff --cc proto/ospf/config.Y
index ea186ea1d991c719c6fa6624f2cc578d0c5f3c00,3f5419ddc19bfc6ce73c193a7dc7fd1150c7bf07..68d13fb649a2c7604e9862b22603b3c1847dc17e
--- 1/proto/ospf/config.Y
--- 2/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@@ -99,18 -112,20 +99,18 @@@ ospf_check_defcost(int cost
  }
  
  static inline void
 -set_instance_id(unsigned id)
 +ospf_check_auth(void)
  {
 -#ifdef OSPFv3
 -  OSPF_PATT->instance_id = id;
 -#else
 -  cf_error("Instance ID requires OSPFv3");
 -#endif
 +  if (ospf_cfg_is_v3())
 +    cf_error("Authentication not supported in OSPFv3");
  }
  
 +
  CF_DECLS
  
 -CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID)
 +CF_KEYWORDS(OSPF, OSPF2, OSPF3, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID)
  CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, COST2, RETRANSMIT)
- CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST)
+ CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST, DEFAULT)
  CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP)
  CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC, TTL, SECURITY)
  CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, CHECK, LINK, ONLY)