Temporary integrated OSPF commit. (70945cb6) · Commits · 戴 / Bird

doc/bird.sgml

+10 −2

Original line number	Diff line number	Diff line
		@@ -2332,6 +2332,7 @@ protocol ospf <name> {
		tx length <num>;
		type [broadcast\|bcast\|pointopoint\|ptp\|
		nonbroadcast\|nbma\|pointomultipoint\|ptmp];
		link lsa suppression <switch>;
		strict nonbroadcast <switch>;
		real broadcast <switch>;
		ptp netmask <switch>;
		@@ -2596,9 +2597,16 @@ protocol ospf <name> {
		communication, or if the NBMA network is used as an (possibly
		unnumbered) PtP link.

		<tag>strict nonbroadcast <M>switch</M></tag>
		<tag>link lsa suppression <m/switch/</tag>
		In OSPFv3, link LSAs are generated for each link, announcing link-local
		IPv6 address of the router to its local neighbors. These are useless on
		PtP or PtMP networks and this option allows to suppress the link LSA
		origination for such interfaces. The option is ignored on other than PtP
		or PtMP interfaces. Default value is no.

		<tag>strict nonbroadcast <m/switch/</tag>
		If set, don't send hello to any undefined neighbor. This switch is
		ignored on other than NBMA or PtMP networks. Default value is no.
		ignored on other than NBMA or PtMP interfaces. Default value is no.

		<tag>real broadcast <m/switch/</tag>
		In <cf/type broadcast/ or <cf/type ptp/ network configuration, OSPF

lib/birdlib.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,12 @@
		#define ABS(a) ((a)>=0 ? (a) : -(a))
		#define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))

		#define BIT32_VAL(p) (((u32) 1) << ((p) % 32))
		#define BIT32_TEST(b,p) ((b)[(p)/32] & BIT32_VAL(p))
		#define BIT32_SET(b,p) ((b)[(p)/32] \|= BIT32_VAL(p))
		#define BIT32_CLR(b,p) ((b)[(p)/32] &= ~BIT32_VAL(p))
		#define BIT32_ZERO(b,l) memset((b), 0, (l)/8)

		#ifndef NULL
		#define NULL ((void *) 0)
		#endif

lib/slists.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -68,10 +68,12 @@ typedef struct siterator {
		#define SNODE (snode *)
		#define SHEAD(list) ((void *)((list).head))
		#define STAIL(list) ((void *)((list).tail))
		#define WALK_SLIST(n,list) for(n=SHEAD(list);(SNODE (n))->next; \
		n=(void *)((SNODE (n))->next))
		#define SNODE_NEXT(n) ((void *)((SNODE (n))->next))
		#define SNODE_VALID(n) ((SNODE (n))->next)

		#define WALK_SLIST(n,list) for(n=SHEAD(list); SNODE_VALID(n); n=SNODE_NEXT(n))
		#define WALK_SLIST_DELSAFE(n,nxt,list) \
		for(n=SHEAD(list); nxt=(void )((SNODE (n))->next); n=(void ) nxt)
		for(n=SHEAD(list); nxt=SNODE_NEXT(n); n=(void *) nxt)
		#define EMPTY_SLIST(list) (!(list).head->next)

		void s_add_tail(slist , snode );

proto/ospf/config.Y

+45 −49

Original line number	Diff line number	Diff line
		@@ -21,7 +21,9 @@ static list *this_nets;
		static struct area_net_config *this_pref;
		static struct ospf_stubnet_config *this_stubnet;

		#ifdef OSPFv2
		static inline int ospf_cfg_is_v2(void) { return OSPF_CFG->ospf2; }
		static inline int ospf_cfg_is_v3(void) { return ! OSPF_CFG->ospf2; }

		static void
		ospf_iface_finish(void)
		{
		@@ -38,21 +40,6 @@ ospf_iface_finish(void)
		if ((ip->autype == OSPF_AUTH_NONE) && (ip->passwords != NULL))
		log(L_WARN "Password option without authentication option does not make sense");
		}
		#endif

		#ifdef OSPFv3
		static void
		ospf_iface_finish(void)
		{
		struct ospf_iface_patt *ip = OSPF_PATT;

		if (ip->deadint == 0)
		ip->deadint = ip->deadc * ip->helloint;

		if ((ip->autype != OSPF_AUTH_NONE) \|\| (get_passwords() != NULL))
		cf_error("Authentication not supported in OSPFv3");
		}
		#endif

		static void
		ospf_area_finish(void)
		@@ -61,12 +48,12 @@ ospf_area_finish(void)
		cf_error("Backbone area cannot be stub/NSSA");

		if (this_area->summary && (this_area->type == OPT_E))
		cf_error("Only Stub/NSSA areas can use summary propagation");
		cf_error("Only stub/NSSA areas can use summary propagation");

		if (this_area->default_nssa && ((this_area->type != OPT_N) \|\| ! this_area->summary))
		cf_error("Only NSSA areas with summary propagation can use NSSA default route");

		if ((this_area->default_cost & LSA_EXT_EBIT) && ! this_area->default_nssa)
		if ((this_area->default_cost & LSA_EXT3_EBIT) && ! this_area->default_nssa)
		cf_error("Only NSSA default route can use type 2 metric");
		}

		@@ -80,15 +67,22 @@ ospf_proto_finish(void)

		int areano = 0;
		int backbone = 0;
		int nssa = 0;
		struct ospf_area_config *ac;
		WALK_LIST(ac, cf->area_list)
		{
		areano++;
		if (ac->areaid == 0)
		backbone = 1;
		if (ac->type == OPT_N)
		nssa = 1;
		}

		cf->abr = areano > 1;

		/* Route export or NSSA translation (RFC 3101 3.1) */
		cf->asbr = (this_proto->out_filter != FILTER_REJECT) \|\| (nssa && cf->abr);

		if (cf->abr && !backbone)
		{
		struct ospf_area_config *ac = cfg_allocz(sizeof(struct ospf_area_config));
		@@ -102,25 +96,26 @@ ospf_proto_finish(void)

		if (!cf->abr && !EMPTY_LIST(cf->vlink_list))
		cf_error("Vlinks cannot be used on single area router");

		if (cf->asbr && (areano == 1) && (this_area->type == 0))
		cf_error("ASBR must be in non-stub area");
		}

		static inline void
		check_defcost(int cost)
		ospf_check_defcost(int cost)
		{
		if ((cost <= 0) \|\| (cost >= LSINFINITY))
		cf_error("Default cost must be in range 1-%d", LSINFINITY-1);
		}

		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)
		@@ -132,7 +127,7 @@ CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, CHECK, LINK, ONLY, BFD)
		CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, TAG, EXTERNAL)
		CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY)
		CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY, LENGTH)
		CF_KEYWORDS(SECONDARY, MERGE)
		CF_KEYWORDS(SECONDARY, MERGE, LSA, SUPPRESSION)

		%type <t> opttext
		%type <ld> lsadb_args
		@@ -146,8 +141,8 @@ ospf_proto_start: proto_start OSPF {
		this_proto = proto_config_new(&proto_ospf, sizeof(struct ospf_config), $1);
		init_list(&OSPF_CFG->area_list);
		init_list(&OSPF_CFG->vlink_list);
		OSPF_CFG->rfc1583 = DEFAULT_RFC1583;
		OSPF_CFG->tick = DEFAULT_OSPFTICK;
		OSPF_CFG->tick = OSPF_DEFAULT_TICK;
		OSPF_CFG->ospf2 = OSPF_IS_V2;
		}
		;

		@@ -160,7 +155,7 @@ ospf_proto_item:
		proto_item
		\| RFC1583COMPAT bool { OSPF_CFG->rfc1583 = $2; }
		\| STUB ROUTER bool { OSPF_CFG->stub_router = $3; }
		\| ECMP bool { OSPF_CFG->ecmp = $2 ? DEFAULT_ECMP_LIMIT : 0; }
		\| ECMP bool { OSPF_CFG->ecmp = $2 ? OSPF_DEFAULT_ECMP_LIMIT : 0; }
		\| ECMP bool LIMIT expr { OSPF_CFG->ecmp = $2 ? $4 : 0; if ($4 < 0) cf_error("ECMP limit cannot be negative"); }
		\| MERGE EXTERNAL bool { OSPF_CFG->merge_external = $3; }
		\| TICK expr { OSPF_CFG->tick = $2; if($2<=0) cf_error("Tick must be greater than zero"); }
		@@ -171,9 +166,9 @@ ospf_area_start: AREA idval {
		this_area = cfg_allocz(sizeof(struct ospf_area_config));
		add_tail(&OSPF_CFG->area_list, NODE this_area);
		this_area->areaid = $2;
		this_area->default_cost = DEFAULT_STUB_COST;
		this_area->default_cost = OSPF_DEFAULT_STUB_COST;
		this_area->type = OPT_E;
		this_area->transint = DEFAULT_TRANSINT;
		this_area->transint = OSPF_DEFAULT_TRANSINT;

		init_list(&this_area->patt_list);
		init_list(&this_area->net_list);
		@@ -195,9 +190,9 @@ ospf_area_item:
		\| NSSA { this_area->type = OPT_N; }
		\| SUMMARY bool { this_area->summary = $2; }
		\| DEFAULT NSSA bool { this_area->default_nssa = $3; }
		\| DEFAULT COST expr { this_area->default_cost = $3; check_defcost($3); }
		\| DEFAULT COST2 expr { this_area->default_cost = $3 \| LSA_EXT_EBIT; check_defcost($3); }
		\| STUB COST expr { this_area->default_cost = $3; check_defcost($3); }
		\| DEFAULT COST expr { this_area->default_cost = $3; ospf_check_defcost($3); }
		\| DEFAULT COST2 expr { this_area->default_cost = $3 \| LSA_EXT3_EBIT; ospf_check_defcost($3); }
		\| STUB COST expr { this_area->default_cost = $3; ospf_check_defcost($3); }
		\| TRANSLATOR bool { this_area->translator = $2; }
		\| TRANSLATOR STABILITY expr { this_area->transint = $3; }
		\| NETWORKS { this_nets = &this_area->net_list; } '{' pref_list '}'
		@@ -250,9 +245,9 @@ ospf_vlink_item:
		\| DEAD expr { OSPF_PATT->deadint = $2 ; if ($2<=1) cf_error("Dead interval must be greater than one"); }
		\| DEAD COUNT expr { OSPF_PATT->deadc = $3 ; if ($3<=1) cf_error("Dead count must be greater than one"); }
		\| AUTHENTICATION NONE { OSPF_PATT->autype = OSPF_AUTH_NONE; }
		\| AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE ; }
		\| AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT ; }
		\| password_list
		\| AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE; ospf_check_auth(); }
		\| AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT; ospf_check_auth(); }
		\| password_list { ospf_check_auth(); }
		;

		ospf_vlink_start: VIRTUAL LINK idval
		@@ -292,18 +287,19 @@ ospf_iface_item:
		\| TYPE PTP { OSPF_PATT->type = OSPF_IT_PTP ; }
		\| TYPE POINTOMULTIPOINT { OSPF_PATT->type = OSPF_IT_PTMP ; }
		\| TYPE PTMP { OSPF_PATT->type = OSPF_IT_PTMP ; }
		\| REAL BROADCAST bool { OSPF_PATT->real_bcast = $3; if (OSPF_VERSION != 2) cf_error("Real broadcast option requires OSPFv2"); }
		\| PTP NETMASK bool { OSPF_PATT->ptp_netmask = $3; if (OSPF_VERSION != 2) cf_error("Real netmask option requires OSPFv2"); }
		\| REAL BROADCAST bool { OSPF_PATT->real_bcast = $3; if (!ospf_cfg_is_v2()) cf_error("Real broadcast option requires OSPFv2"); }
		\| PTP NETMASK bool { OSPF_PATT->ptp_netmask = $3; if (!ospf_cfg_is_v2()) cf_error("PtP netmask option requires OSPFv2"); }
		\| TRANSMIT DELAY expr { OSPF_PATT->inftransdelay = $3 ; if (($3<=0) \|\| ($3>65535)) cf_error("Transmit delay must be in range 1-65535"); }
		\| PRIORITY expr { OSPF_PATT->priority = $2 ; if (($2<0) \|\| ($2>255)) cf_error("Priority must be in range 0-255"); }
		\| STRICT NONBROADCAST bool { OSPF_PATT->strictnbma = $3 ; }
		\| STUB bool { OSPF_PATT->stub = $2 ; }
		\| CHECK LINK bool { OSPF_PATT->check_link = $3; }
		\| ECMP WEIGHT expr { OSPF_PATT->ecmp_weight = $3 - 1; if (($3<1) \|\| ($3>256)) cf_error("ECMP weight must be in range 1-256"); }
		\| LINK LSA SUPPRESSION bool { OSPF_PATT->link_lsa_suppression = $4; if (!ospf_cfg_is_v3()) cf_error("Link LSA suppression option requires OSPFv3"); }
		\| NEIGHBORS '{' nbma_list '}'
		\| AUTHENTICATION NONE { OSPF_PATT->autype = OSPF_AUTH_NONE; }
		\| AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE ; }
		\| AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT ; }
		\| AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE; ospf_check_auth(); }
		\| AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT; ospf_check_auth(); }
		\| RX BUFFER NORMAL { OSPF_PATT->rx_buffer = 0; }
		\| RX BUFFER LARGE { OSPF_PATT->rx_buffer = OSPF_MAX_PKT_SIZE; }
		\| RX BUFFER expr { OSPF_PATT->rx_buffer = $3; if (($3 < OSPF_MIN_PKT_SIZE) \|\| ($3 > OSPF_MAX_PKT_SIZE)) cf_error("Buffer size must be in range 256-65535"); }
		@@ -314,7 +310,7 @@ ospf_iface_item:
		\| TTL SECURITY TX ONLY { OSPF_PATT->ttl_security = 2; }
		\| BFD bool { OSPF_PATT->bfd = $2; cf_check_bfd($2); }
		\| SECONDARY bool { OSPF_PATT->bsd_secondary = $2; }
		\| password_list
		\| password_list { ospf_check_auth(); }
		;

		pref_list:
		@@ -349,7 +345,7 @@ nbma_eligible:
		\| ELIGIBLE { $$ = 1; }
		;

		nbma_item: IPA nbma_eligible ';'
		nbma_item: ipa nbma_eligible ';'
		{
		this_nbma = cfg_allocz(sizeof(struct nbma_node));
		add_tail(&OSPF_PATT->nbma_list, NODE this_nbma);
		@@ -384,11 +380,11 @@ ospf_iface_start:

		ospf_instance_id:
		/* empty */
		\| INSTANCE expr { set_instance_id($2); }
		\| INSTANCE expr { OSPF_PATT->instance_id = $2; }
		;

		ospf_iface_patt_list:
		iface_patt_list { if (OSPF_VERSION == 3) iface_patt_check(); } ospf_instance_id
		iface_patt_list { if (ospf_cfg_is_v3()) iface_patt_check(); } ospf_instance_id
		;

		ospf_iface_opts:

proto/ospf/dbdes.c

+342 −250

File changed.

Preview size limit exceeded, changes collapsed.

Admin message