diff options
Diffstat (limited to 'bgpd/bgp_updgrp_adv.c')
| -rw-r--r-- | bgpd/bgp_updgrp_adv.c | 1357 | 
1 files changed, 671 insertions, 686 deletions
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c index efb2046e12..b2231f7972 100644 --- a/bgpd/bgp_updgrp_adv.c +++ b/bgpd/bgp_updgrp_adv.c @@ -56,308 +56,311 @@   * PRIVATE FUNCTIONS   ********************/ -static inline struct bgp_adj_out * -adj_lookup (struct bgp_node *rn, struct update_subgroup *subgrp, -            u_int32_t addpath_tx_id) +static inline struct bgp_adj_out *adj_lookup(struct bgp_node *rn, +					     struct update_subgroup *subgrp, +					     u_int32_t addpath_tx_id)  { -  struct bgp_adj_out *adj; -  struct peer *peer; -  afi_t afi; -  safi_t safi; -  int addpath_capable; - -  if (!rn || !subgrp) -    return NULL; - -  peer = SUBGRP_PEER (subgrp); -  afi = SUBGRP_AFI (subgrp); -  safi = SUBGRP_SAFI (subgrp); -  addpath_capable = bgp_addpath_encode_tx (peer, afi, safi); - -  /* update-groups that do not support addpath will pass 0 for -   * addpath_tx_id so do not both matching against it */ -  for (adj = rn->adj_out; adj; adj = adj->next) -    { -      if (adj->subgroup == subgrp) -        { -          if (addpath_capable) -            { -              if (adj->addpath_tx_id == addpath_tx_id) -                { -                  break; -                } -            } -          else -            { -              break; -            } -        } -    } - -  return adj; -} +	struct bgp_adj_out *adj; +	struct peer *peer; +	afi_t afi; +	safi_t safi; +	int addpath_capable; + +	if (!rn || !subgrp) +		return NULL; + +	peer = SUBGRP_PEER(subgrp); +	afi = SUBGRP_AFI(subgrp); +	safi = SUBGRP_SAFI(subgrp); +	addpath_capable = bgp_addpath_encode_tx(peer, afi, safi); + +	/* update-groups that do not support addpath will pass 0 for +	 * addpath_tx_id so do not both matching against it */ +	for (adj = rn->adj_out; adj; adj = adj->next) { +		if (adj->subgroup == subgrp) { +			if (addpath_capable) { +				if (adj->addpath_tx_id == addpath_tx_id) { +					break; +				} +			} else { +				break; +			} +		} +	} -static void -adj_free (struct bgp_adj_out *adj) -{ -  TAILQ_REMOVE (&(adj->subgroup->adjq), adj, subgrp_adj_train); -  SUBGRP_DECR_STAT (adj->subgroup, adj_count); -  XFREE (MTYPE_BGP_ADJ_OUT, adj); +	return adj;  } -static int -group_announce_route_walkcb (struct update_group *updgrp, void *arg) +static void adj_free(struct bgp_adj_out *adj)  { -  struct updwalk_context *ctx = arg; -  struct update_subgroup *subgrp; -  struct bgp_info *ri; -  afi_t afi; -  safi_t safi; -  struct peer *peer; -  struct bgp_adj_out *adj, *adj_next; -  int addpath_capable; - -  afi = UPDGRP_AFI (updgrp); -  safi = UPDGRP_SAFI (updgrp); -  peer = UPDGRP_PEER (updgrp); -  addpath_capable = bgp_addpath_encode_tx (peer, afi, safi); - -  UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) -    { - -      /* -       * Skip the subgroups that have coalesce timer running. We will -       * walk the entire prefix table for those subgroups when the -       * coalesce timer fires. -       */ -      if (!subgrp->t_coalesce) -        { -          /* An update-group that uses addpath */ -          if (addpath_capable) -            { -              /* Look through all of the paths we have advertised for this rn and -               * send a withdraw for the ones that are no longer present */ -              for (adj = ctx->rn->adj_out; adj; adj = adj_next) -                { -                  adj_next = adj->next; - -                  if (adj->subgroup == subgrp) -                    { -                      for (ri = ctx->rn->info; ri; ri = ri->next) -                        { -                          if (ri->addpath_tx_id == adj->addpath_tx_id) -                            { -                              break; -                            } -                        } - -                      if (!ri) -                        { -                          subgroup_process_announce_selected (subgrp, NULL, ctx->rn, adj->addpath_tx_id); -                        } -                    } -                } - -              for (ri = ctx->rn->info; ri; ri = ri->next) -                { -                  /* Skip the bestpath for now */ -                  if (ri == ctx->ri) -                    continue; - -                  subgroup_process_announce_selected (subgrp, ri, ctx->rn, ri->addpath_tx_id); -                } - -              /* Process the bestpath last so the "show [ip] bgp neighbor x.x.x.x advertised" -               * output shows the attributes from the bestpath */ -              if (ctx->ri) -                subgroup_process_announce_selected (subgrp, ctx->ri, ctx->rn, ctx->ri->addpath_tx_id); -            } - -          /* An update-group that does not use addpath */ -          else -            { -              if (ctx->ri) -                { -                  subgroup_process_announce_selected (subgrp, ctx->ri, ctx->rn, ctx->ri->addpath_tx_id); -                } -              else -                { -                  /* Find the addpath_tx_id of the path we had advertised and -                   * send a withdraw */ -                  for (adj = ctx->rn->adj_out; adj; adj = adj_next) -                    { -                      adj_next = adj->next; - -                      if (adj->subgroup == subgrp) -                        { -                          subgroup_process_announce_selected (subgrp, NULL, ctx->rn, adj->addpath_tx_id); -                        } -                    } -                } -            } -        } -    } - -  return UPDWALK_CONTINUE; +	TAILQ_REMOVE(&(adj->subgroup->adjq), adj, subgrp_adj_train); +	SUBGRP_DECR_STAT(adj->subgroup, adj_count); +	XFREE(MTYPE_BGP_ADJ_OUT, adj);  } -static void -subgrp_show_adjq_vty (struct update_subgroup *subgrp, struct vty *vty, -		      u_int8_t flags) +static int group_announce_route_walkcb(struct update_group *updgrp, void *arg)  { -  struct bgp_table *table; -  struct bgp_adj_out *adj; -  unsigned long output_count; -  struct bgp_node *rn; -  int header1 = 1; -  struct bgp *bgp; -  int header2 = 1; - -  bgp = SUBGRP_INST (subgrp); -  if (!bgp) -    return; +	struct updwalk_context *ctx = arg; +	struct update_subgroup *subgrp; +	struct bgp_info *ri; +	afi_t afi; +	safi_t safi; +	struct peer *peer; +	struct bgp_adj_out *adj, *adj_next; +	int addpath_capable; + +	afi = UPDGRP_AFI(updgrp); +	safi = UPDGRP_SAFI(updgrp); +	peer = UPDGRP_PEER(updgrp); +	addpath_capable = bgp_addpath_encode_tx(peer, afi, safi); + +	UPDGRP_FOREACH_SUBGRP(updgrp, subgrp) +	{ -  table = bgp->rib[SUBGRP_AFI (subgrp)][SUBGRP_SAFI (subgrp)]; +		/* +		 * Skip the subgroups that have coalesce timer running. We will +		 * walk the entire prefix table for those subgroups when the +		 * coalesce timer fires. +		 */ +		if (!subgrp->t_coalesce) { +			/* An update-group that uses addpath */ +			if (addpath_capable) { +				/* Look through all of the paths we have +				 * advertised for this rn and +				 * send a withdraw for the ones that are no +				 * longer present */ +				for (adj = ctx->rn->adj_out; adj; +				     adj = adj_next) { +					adj_next = adj->next; + +					if (adj->subgroup == subgrp) { +						for (ri = ctx->rn->info; ri; +						     ri = ri->next) { +							if (ri->addpath_tx_id +							    == adj->addpath_tx_id) { +								break; +							} +						} + +						if (!ri) { +							subgroup_process_announce_selected( +								subgrp, NULL, +								ctx->rn, +								adj->addpath_tx_id); +						} +					} +				} + +				for (ri = ctx->rn->info; ri; ri = ri->next) { +					/* Skip the bestpath for now */ +					if (ri == ctx->ri) +						continue; + +					subgroup_process_announce_selected( +						subgrp, ri, ctx->rn, +						ri->addpath_tx_id); +				} + +				/* Process the bestpath last so the "show [ip] +				 * bgp neighbor x.x.x.x advertised" +				 * output shows the attributes from the bestpath +				 */ +				if (ctx->ri) +					subgroup_process_announce_selected( +						subgrp, ctx->ri, ctx->rn, +						ctx->ri->addpath_tx_id); +			} + +			/* An update-group that does not use addpath */ +			else { +				if (ctx->ri) { +					subgroup_process_announce_selected( +						subgrp, ctx->ri, ctx->rn, +						ctx->ri->addpath_tx_id); +				} else { +					/* Find the addpath_tx_id of the path we +					 * had advertised and +					 * send a withdraw */ +					for (adj = ctx->rn->adj_out; adj; +					     adj = adj_next) { +						adj_next = adj->next; + +						if (adj->subgroup == subgrp) { +							subgroup_process_announce_selected( +								subgrp, NULL, +								ctx->rn, +								adj->addpath_tx_id); +						} +					} +				} +			} +		} +	} -  output_count = 0; +	return UPDWALK_CONTINUE; +} -  for (rn = bgp_table_top (table); rn; rn = bgp_route_next (rn)) -    for (adj = rn->adj_out; adj; adj = adj->next) -      if (adj->subgroup == subgrp) -	{ -	  if (header1) -	    { -	      vty_out (vty, -		       "BGP table version is %" PRIu64 ", local router ID is %s%s", -		       table->version, inet_ntoa (bgp->router_id), -		       VTY_NEWLINE); -	      vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE); -	      vty_out (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE); -	      header1 = 0; -	    } -	  if (header2) -	    { -	      vty_out (vty, BGP_SHOW_HEADER, VTY_NEWLINE); -	      header2 = 0; -	    } -	  if ((flags & UPDWALK_FLAGS_ADVQUEUE) && adj->adv && adj->adv->baa) -	    { -	      route_vty_out_tmp (vty, &rn->p, adj->adv->baa->attr, SUBGRP_SAFI (subgrp), 0, NULL); -	      output_count++; -	    } -	  if ((flags & UPDWALK_FLAGS_ADVERTISED) && adj->attr) -	    { -	      route_vty_out_tmp (vty, &rn->p, adj->attr, SUBGRP_SAFI (subgrp), 0, NULL); -	      output_count++; -	    } -	} -  if (output_count != 0) -    vty_out (vty, "%sTotal number of prefixes %ld%s", -	     VTY_NEWLINE, output_count, VTY_NEWLINE); +static void subgrp_show_adjq_vty(struct update_subgroup *subgrp, +				 struct vty *vty, u_int8_t flags) +{ +	struct bgp_table *table; +	struct bgp_adj_out *adj; +	unsigned long output_count; +	struct bgp_node *rn; +	int header1 = 1; +	struct bgp *bgp; +	int header2 = 1; + +	bgp = SUBGRP_INST(subgrp); +	if (!bgp) +		return; + +	table = bgp->rib[SUBGRP_AFI(subgrp)][SUBGRP_SAFI(subgrp)]; + +	output_count = 0; + +	for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) +		for (adj = rn->adj_out; adj; adj = adj->next) +			if (adj->subgroup == subgrp) { +				if (header1) { +					vty_out(vty, +						"BGP table version is %" PRIu64 +						", local router ID is %s%s", +						table->version, +						inet_ntoa(bgp->router_id), +						VTY_NEWLINE); +					vty_out(vty, BGP_SHOW_SCODE_HEADER, +						VTY_NEWLINE, VTY_NEWLINE); +					vty_out(vty, BGP_SHOW_OCODE_HEADER, +						VTY_NEWLINE, VTY_NEWLINE); +					header1 = 0; +				} +				if (header2) { +					vty_out(vty, BGP_SHOW_HEADER, +						VTY_NEWLINE); +					header2 = 0; +				} +				if ((flags & UPDWALK_FLAGS_ADVQUEUE) && adj->adv +				    && adj->adv->baa) { +					route_vty_out_tmp(vty, &rn->p, +							  adj->adv->baa->attr, +							  SUBGRP_SAFI(subgrp), +							  0, NULL); +					output_count++; +				} +				if ((flags & UPDWALK_FLAGS_ADVERTISED) +				    && adj->attr) { +					route_vty_out_tmp( +						vty, &rn->p, adj->attr, +						SUBGRP_SAFI(subgrp), 0, NULL); +					output_count++; +				} +			} +	if (output_count != 0) +		vty_out(vty, "%sTotal number of prefixes %ld%s", VTY_NEWLINE, +			output_count, VTY_NEWLINE);  } -static int -updgrp_show_adj_walkcb (struct update_group *updgrp, void *arg) +static int updgrp_show_adj_walkcb(struct update_group *updgrp, void *arg)  { -  struct updwalk_context *ctx = arg; -  struct update_subgroup *subgrp; -  struct vty *vty; - -  vty = ctx->vty; -  UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) -  { -    if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id)) -      continue; -    vty_out (vty, "update group %" PRIu64 ", subgroup %" PRIu64 "%s", updgrp->id, -	     subgrp->id, VTY_NEWLINE); -    subgrp_show_adjq_vty (subgrp, vty, ctx->flags); -  } -  return UPDWALK_CONTINUE; +	struct updwalk_context *ctx = arg; +	struct update_subgroup *subgrp; +	struct vty *vty; + +	vty = ctx->vty; +	UPDGRP_FOREACH_SUBGRP(updgrp, subgrp) +	{ +		if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id)) +			continue; +		vty_out(vty, "update group %" PRIu64 ", subgroup %" PRIu64 "%s", +			updgrp->id, subgrp->id, VTY_NEWLINE); +		subgrp_show_adjq_vty(subgrp, vty, ctx->flags); +	} +	return UPDWALK_CONTINUE;  } -static void -updgrp_show_adj (struct bgp *bgp, afi_t afi, safi_t safi, -		 struct vty *vty, uint64_t id, u_int8_t flags) +static void updgrp_show_adj(struct bgp *bgp, afi_t afi, safi_t safi, +			    struct vty *vty, uint64_t id, u_int8_t flags)  { -  struct updwalk_context ctx; -  memset (&ctx, 0, sizeof (ctx)); -  ctx.vty = vty; -  ctx.subgrp_id = id; -  ctx.flags = flags; +	struct updwalk_context ctx; +	memset(&ctx, 0, sizeof(ctx)); +	ctx.vty = vty; +	ctx.subgrp_id = id; +	ctx.flags = flags; -  update_group_af_walk (bgp, afi, safi, updgrp_show_adj_walkcb, &ctx); +	update_group_af_walk(bgp, afi, safi, updgrp_show_adj_walkcb, &ctx);  } -static int -subgroup_coalesce_timer (struct thread *thread) +static int subgroup_coalesce_timer(struct thread *thread)  { -  struct update_subgroup *subgrp; - -  subgrp = THREAD_ARG (thread); -  if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0)) -    zlog_debug ("u%" PRIu64 ":s%" PRIu64 " announcing routes upon coalesce timer expiry", -		(SUBGRP_UPDGRP (subgrp))->id, subgrp->id); -  subgrp->t_coalesce = NULL; -  subgrp->v_coalesce = 0; -  subgroup_announce_route (subgrp); - - -  /* While the announce_route() may kick off the route advertisement timer for -   * the members of the subgroup, we'd like to send the initial updates much -   * faster (i.e., without enforcing MRAI). Also, if there were no routes to -   * announce, this is the method currently employed to trigger the EOR. -   */ -  if (!bgp_update_delay_active(SUBGRP_INST(subgrp))) -    { -      struct peer_af *paf; -      struct peer *peer; - -      SUBGRP_FOREACH_PEER (subgrp, paf) -        { -          peer = PAF_PEER(paf); -          BGP_TIMER_OFF(peer->t_routeadv); -          BGP_TIMER_ON (peer->t_routeadv, bgp_routeadv_timer, 0); -        } -    } - -  return 0; +	struct update_subgroup *subgrp; + +	subgrp = THREAD_ARG(thread); +	if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0)) +		zlog_debug("u%" PRIu64 ":s%" PRIu64 +			   " announcing routes upon coalesce timer expiry", +			   (SUBGRP_UPDGRP(subgrp))->id, subgrp->id); +	subgrp->t_coalesce = NULL; +	subgrp->v_coalesce = 0; +	subgroup_announce_route(subgrp); + + +	/* While the announce_route() may kick off the route advertisement timer +	 * for +	 * the members of the subgroup, we'd like to send the initial updates +	 * much +	 * faster (i.e., without enforcing MRAI). Also, if there were no routes +	 * to +	 * announce, this is the method currently employed to trigger the EOR. +	 */ +	if (!bgp_update_delay_active(SUBGRP_INST(subgrp))) { +		struct peer_af *paf; +		struct peer *peer; + +		SUBGRP_FOREACH_PEER(subgrp, paf) +		{ +			peer = PAF_PEER(paf); +			BGP_TIMER_OFF(peer->t_routeadv); +			BGP_TIMER_ON(peer->t_routeadv, bgp_routeadv_timer, 0); +		} +	} + +	return 0;  } -static int -update_group_announce_walkcb (struct update_group *updgrp, void *arg) +static int update_group_announce_walkcb(struct update_group *updgrp, void *arg)  { -  struct update_subgroup *subgrp; +	struct update_subgroup *subgrp; -  UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) -    { -      subgroup_announce_all (subgrp); -    } +	UPDGRP_FOREACH_SUBGRP(updgrp, subgrp) +	{ +		subgroup_announce_all(subgrp); +	} -  return UPDWALK_CONTINUE; +	return UPDWALK_CONTINUE;  } -static int -update_group_announce_rrc_walkcb (struct update_group *updgrp, void *arg) +static int update_group_announce_rrc_walkcb(struct update_group *updgrp, +					    void *arg)  { -  struct update_subgroup *subgrp; -  afi_t afi; -  safi_t safi; -  struct peer *peer; - -  afi = UPDGRP_AFI (updgrp); -  safi = UPDGRP_SAFI (updgrp); -  peer = UPDGRP_PEER (updgrp); - -  /* Only announce if this is a group of route-reflector-clients */ -  if (CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT)) -    { -      UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) -        { -          subgroup_announce_all (subgrp); -        } -    } - -  return UPDWALK_CONTINUE; +	struct update_subgroup *subgrp; +	afi_t afi; +	safi_t safi; +	struct peer *peer; + +	afi = UPDGRP_AFI(updgrp); +	safi = UPDGRP_SAFI(updgrp); +	peer = UPDGRP_PEER(updgrp); + +	/* Only announce if this is a group of route-reflector-clients */ +	if (CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT)) { +		UPDGRP_FOREACH_SUBGRP(updgrp, subgrp) +		{ +			subgroup_announce_all(subgrp); +		} +	} + +	return UPDWALK_CONTINUE;  }  /******************** @@ -368,276 +371,266 @@ update_group_announce_rrc_walkcb (struct update_group *updgrp, void *arg)   * Allocate an adj-out object. Do proper initialization of its fields,   * primarily its association with the subgroup and the prefix.   */ -struct bgp_adj_out * -bgp_adj_out_alloc (struct update_subgroup *subgrp, struct bgp_node *rn, -                   u_int32_t addpath_tx_id) +struct bgp_adj_out *bgp_adj_out_alloc(struct update_subgroup *subgrp, +				      struct bgp_node *rn, +				      u_int32_t addpath_tx_id)  { -  struct bgp_adj_out *adj; - -  adj = XCALLOC (MTYPE_BGP_ADJ_OUT, sizeof (struct bgp_adj_out)); -  adj->subgroup = subgrp; -  if (rn) -    { -      BGP_ADJ_OUT_ADD (rn, adj); -      bgp_lock_node (rn); -      adj->rn = rn; -    } - -  adj->addpath_tx_id = addpath_tx_id; -  TAILQ_INSERT_TAIL (&(subgrp->adjq), adj, subgrp_adj_train); -  SUBGRP_INCR_STAT (subgrp, adj_count); -  return adj; +	struct bgp_adj_out *adj; + +	adj = XCALLOC(MTYPE_BGP_ADJ_OUT, sizeof(struct bgp_adj_out)); +	adj->subgroup = subgrp; +	if (rn) { +		BGP_ADJ_OUT_ADD(rn, adj); +		bgp_lock_node(rn); +		adj->rn = rn; +	} + +	adj->addpath_tx_id = addpath_tx_id; +	TAILQ_INSERT_TAIL(&(subgrp->adjq), adj, subgrp_adj_train); +	SUBGRP_INCR_STAT(subgrp, adj_count); +	return adj;  }  struct bgp_advertise * -bgp_advertise_clean_subgroup (struct update_subgroup *subgrp, -			      struct bgp_adj_out *adj) +bgp_advertise_clean_subgroup(struct update_subgroup *subgrp, +			     struct bgp_adj_out *adj)  { -  struct bgp_advertise *adv; -  struct bgp_advertise_attr *baa; -  struct bgp_advertise *next; -  struct bgp_advertise_fifo *fhead; +	struct bgp_advertise *adv; +	struct bgp_advertise_attr *baa; +	struct bgp_advertise *next; +	struct bgp_advertise_fifo *fhead; -  adv = adj->adv; -  baa = adv->baa; -  next = NULL; +	adv = adj->adv; +	baa = adv->baa; +	next = NULL; -  if (baa) -    { -      fhead = &subgrp->sync->update; +	if (baa) { +		fhead = &subgrp->sync->update; -      /* Unlink myself from advertise attribute FIFO.  */ -      bgp_advertise_delete (baa, adv); +		/* Unlink myself from advertise attribute FIFO.  */ +		bgp_advertise_delete(baa, adv); -      /* Fetch next advertise candidate. */ -      next = baa->adv; +		/* Fetch next advertise candidate. */ +		next = baa->adv; -      /* Unintern BGP advertise attribute.  */ -      bgp_advertise_unintern (subgrp->hash, baa); -    } -  else -    fhead = &subgrp->sync->withdraw; +		/* Unintern BGP advertise attribute.  */ +		bgp_advertise_unintern(subgrp->hash, baa); +	} else +		fhead = &subgrp->sync->withdraw; -  /* Unlink myself from advertisement FIFO.  */ -  BGP_ADV_FIFO_DEL (fhead, adv); +	/* Unlink myself from advertisement FIFO.  */ +	BGP_ADV_FIFO_DEL(fhead, adv); -  /* Free memory.  */ -  bgp_advertise_free (adj->adv); -  adj->adv = NULL; +	/* Free memory.  */ +	bgp_advertise_free(adj->adv); +	adj->adv = NULL; -  return next; +	return next;  } -void -bgp_adj_out_set_subgroup (struct bgp_node *rn, -			  struct update_subgroup *subgrp, -			  struct attr *attr, struct bgp_info *binfo) +void bgp_adj_out_set_subgroup(struct bgp_node *rn, +			      struct update_subgroup *subgrp, struct attr *attr, +			      struct bgp_info *binfo)  { -  struct bgp_adj_out *adj = NULL; -  struct bgp_advertise *adv; - -  if (DISABLE_BGP_ANNOUNCE) -    return; - -  /* Look for adjacency information. */ -  adj = adj_lookup (rn, subgrp, binfo->addpath_tx_id); - -  if (!adj) -    { -      adj = bgp_adj_out_alloc (subgrp, rn, binfo->addpath_tx_id); -      if (!adj) -	return; -    } - -  if (adj->adv) -    bgp_advertise_clean_subgroup (subgrp, adj); -  adj->adv = bgp_advertise_new (); - -  adv = adj->adv; -  adv->rn = rn; -  assert (adv->binfo == NULL); -  adv->binfo = bgp_info_lock (binfo);	/* bgp_info adj_out reference */ - -  if (attr) -    adv->baa = bgp_advertise_intern (subgrp->hash, attr); -  else -    adv->baa = baa_new (); -  adv->adj = adj; - -  /* Add new advertisement to advertisement attribute list. */ -  bgp_advertise_add (adv->baa, adv); - -  /* -   * If the update adv list is empty, trigger the member peers' -   * mrai timers so the socket writes can happen. -   */ -  if (BGP_ADV_FIFO_EMPTY (&subgrp->sync->update)) -    { -      struct peer_af *paf; - -      SUBGRP_FOREACH_PEER (subgrp, paf) -	{ -	  bgp_adjust_routeadv (PAF_PEER (paf)); +	struct bgp_adj_out *adj = NULL; +	struct bgp_advertise *adv; + +	if (DISABLE_BGP_ANNOUNCE) +		return; + +	/* Look for adjacency information. */ +	adj = adj_lookup(rn, subgrp, binfo->addpath_tx_id); + +	if (!adj) { +		adj = bgp_adj_out_alloc(subgrp, rn, binfo->addpath_tx_id); +		if (!adj) +			return; +	} + +	if (adj->adv) +		bgp_advertise_clean_subgroup(subgrp, adj); +	adj->adv = bgp_advertise_new(); + +	adv = adj->adv; +	adv->rn = rn; +	assert(adv->binfo == NULL); +	adv->binfo = bgp_info_lock(binfo); /* bgp_info adj_out reference */ + +	if (attr) +		adv->baa = bgp_advertise_intern(subgrp->hash, attr); +	else +		adv->baa = baa_new(); +	adv->adj = adj; + +	/* Add new advertisement to advertisement attribute list. */ +	bgp_advertise_add(adv->baa, adv); + +	/* +	 * If the update adv list is empty, trigger the member peers' +	 * mrai timers so the socket writes can happen. +	 */ +	if (BGP_ADV_FIFO_EMPTY(&subgrp->sync->update)) { +		struct peer_af *paf; + +		SUBGRP_FOREACH_PEER(subgrp, paf) +		{ +			bgp_adjust_routeadv(PAF_PEER(paf)); +		}  	} -    } -  BGP_ADV_FIFO_ADD (&subgrp->sync->update, &adv->fifo); +	BGP_ADV_FIFO_ADD(&subgrp->sync->update, &adv->fifo); -  subgrp->version = max (subgrp->version, rn->version); +	subgrp->version = max(subgrp->version, rn->version);  }  /* The only time 'withdraw' will be false is if we are sending   * the "neighbor x.x.x.x default-originate" default and need to clear   * bgp_adj_out for the 0.0.0.0/0 route in the BGP table.   */ -void -bgp_adj_out_unset_subgroup (struct bgp_node *rn, -			    struct update_subgroup *subgrp, -                            char withdraw, -                            u_int32_t addpath_tx_id) +void bgp_adj_out_unset_subgroup(struct bgp_node *rn, +				struct update_subgroup *subgrp, char withdraw, +				u_int32_t addpath_tx_id)  { -  struct bgp_adj_out *adj; -  struct bgp_advertise *adv; -  char trigger_write; - -  if (DISABLE_BGP_ANNOUNCE) -    return; - -  /* Lookup existing adjacency */ -  if ((adj = adj_lookup (rn, subgrp, addpath_tx_id)) != NULL) -    { -      /* Clean up previous advertisement.  */ -      if (adj->adv) -        bgp_advertise_clean_subgroup (subgrp, adj); - -      if (adj->attr && withdraw) -        { -          /* We need advertisement structure.  */ -          adj->adv = bgp_advertise_new (); -          adv = adj->adv; -          adv->rn = rn; -          adv->adj = adj; - -          /* Note if we need to trigger a packet write */ -          if (BGP_ADV_FIFO_EMPTY (&subgrp->sync->withdraw)) -            trigger_write = 1; -          else -            trigger_write = 0; - -          /* Add to synchronization entry for withdraw announcement.  */ -          BGP_ADV_FIFO_ADD (&subgrp->sync->withdraw, &adv->fifo); - -          /* Schedule packet write, if FIFO is getting its first entry. */ -          if (trigger_write) -            subgroup_trigger_write(subgrp); -        } -      else -        { -          /* Remove myself from adjacency. */ -          BGP_ADJ_OUT_DEL (rn, adj); - -          /* Free allocated information.  */ -          adj_free (adj); - -          bgp_unlock_node (rn); -        } -    } - -  subgrp->version = max (subgrp->version, rn->version); +	struct bgp_adj_out *adj; +	struct bgp_advertise *adv; +	char trigger_write; + +	if (DISABLE_BGP_ANNOUNCE) +		return; + +	/* Lookup existing adjacency */ +	if ((adj = adj_lookup(rn, subgrp, addpath_tx_id)) != NULL) { +		/* Clean up previous advertisement.  */ +		if (adj->adv) +			bgp_advertise_clean_subgroup(subgrp, adj); + +		if (adj->attr && withdraw) { +			/* We need advertisement structure.  */ +			adj->adv = bgp_advertise_new(); +			adv = adj->adv; +			adv->rn = rn; +			adv->adj = adj; + +			/* Note if we need to trigger a packet write */ +			if (BGP_ADV_FIFO_EMPTY(&subgrp->sync->withdraw)) +				trigger_write = 1; +			else +				trigger_write = 0; + +			/* Add to synchronization entry for withdraw +			 * announcement.  */ +			BGP_ADV_FIFO_ADD(&subgrp->sync->withdraw, &adv->fifo); + +			/* Schedule packet write, if FIFO is getting its first +			 * entry. */ +			if (trigger_write) +				subgroup_trigger_write(subgrp); +		} else { +			/* Remove myself from adjacency. */ +			BGP_ADJ_OUT_DEL(rn, adj); + +			/* Free allocated information.  */ +			adj_free(adj); + +			bgp_unlock_node(rn); +		} +	} + +	subgrp->version = max(subgrp->version, rn->version);  } -void -bgp_adj_out_remove_subgroup (struct bgp_node *rn, struct bgp_adj_out *adj, -			     struct update_subgroup *subgrp) +void bgp_adj_out_remove_subgroup(struct bgp_node *rn, struct bgp_adj_out *adj, +				 struct update_subgroup *subgrp)  { -  if (adj->attr) -    bgp_attr_unintern (&adj->attr); +	if (adj->attr) +		bgp_attr_unintern(&adj->attr); -  if (adj->adv) -    bgp_advertise_clean_subgroup (subgrp, adj); +	if (adj->adv) +		bgp_advertise_clean_subgroup(subgrp, adj); -  BGP_ADJ_OUT_DEL (rn, adj); -  adj_free (adj); +	BGP_ADJ_OUT_DEL(rn, adj); +	adj_free(adj);  }  /*   * Go through all the routes and clean up the adj/adv structures corresponding   * to the subgroup.   */ -void -subgroup_clear_table (struct update_subgroup *subgrp) +void subgroup_clear_table(struct update_subgroup *subgrp)  { -  struct bgp_adj_out *aout, *taout; - -  SUBGRP_FOREACH_ADJ_SAFE (subgrp, aout, taout) -  { -    struct bgp_node *rn = aout->rn; -    bgp_adj_out_remove_subgroup (rn, aout, subgrp); -    bgp_unlock_node (rn); -  } +	struct bgp_adj_out *aout, *taout; + +	SUBGRP_FOREACH_ADJ_SAFE(subgrp, aout, taout) +	{ +		struct bgp_node *rn = aout->rn; +		bgp_adj_out_remove_subgroup(rn, aout, subgrp); +		bgp_unlock_node(rn); +	}  }  /*   * subgroup_announce_table   */ -void -subgroup_announce_table (struct update_subgroup *subgrp, -			 struct bgp_table *table) +void subgroup_announce_table(struct update_subgroup *subgrp, +			     struct bgp_table *table)  { -  struct bgp_node *rn; -  struct bgp_info *ri; -  struct attr attr; -  struct attr_extra extra; -  struct peer *peer; -  afi_t afi; -  safi_t safi; -  int addpath_capable; - -  peer = SUBGRP_PEER (subgrp); -  afi = SUBGRP_AFI (subgrp); -  safi = SUBGRP_SAFI (subgrp); -  addpath_capable = bgp_addpath_encode_tx (peer, afi, safi); - -  if (!table) -    table = peer->bgp->rib[afi][safi]; - -  if (safi != SAFI_MPLS_VPN -      && safi != SAFI_ENCAP -      && safi != SAFI_EVPN -      && CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_DEFAULT_ORIGINATE)) -    subgroup_default_originate (subgrp, 0); - -  /* It's initialized in bgp_announce_check() */ -  attr.extra = &extra; - -  for (rn = bgp_table_top (table); rn; rn = bgp_route_next (rn)) -    for (ri = rn->info; ri; ri = ri->next) - -      if (CHECK_FLAG (ri->flags, BGP_INFO_SELECTED) || -          (addpath_capable && bgp_addpath_tx_path(peer, afi, safi, ri))) -	{ -	  if (subgroup_announce_check (ri, subgrp, &rn->p, &attr)) -	    bgp_adj_out_set_subgroup (rn, subgrp, &attr, ri); -	  else -	    bgp_adj_out_unset_subgroup (rn, subgrp, 1, ri->addpath_tx_id); -	} - -  /* -   * We walked through the whole table -- make sure our version number -   * is consistent with the one on the table. This should allow -   * subgroups to merge sooner if a peer comes up when the route node -   * with the largest version is no longer in the table. This also -   * covers the pathological case where all routes in the table have -   * now been deleted. -   */ -  subgrp->version = max (subgrp->version, table->version); - -  /* -   * Start a task to merge the subgroup if necessary. -   */ -  update_subgroup_trigger_merge_check (subgrp, 0); +	struct bgp_node *rn; +	struct bgp_info *ri; +	struct attr attr; +	struct attr_extra extra; +	struct peer *peer; +	afi_t afi; +	safi_t safi; +	int addpath_capable; + +	peer = SUBGRP_PEER(subgrp); +	afi = SUBGRP_AFI(subgrp); +	safi = SUBGRP_SAFI(subgrp); +	addpath_capable = bgp_addpath_encode_tx(peer, afi, safi); + +	if (!table) +		table = peer->bgp->rib[afi][safi]; + +	if (safi != SAFI_MPLS_VPN && safi != SAFI_ENCAP && safi != SAFI_EVPN +	    && CHECK_FLAG(peer->af_flags[afi][safi], +			  PEER_FLAG_DEFAULT_ORIGINATE)) +		subgroup_default_originate(subgrp, 0); + +	/* It's initialized in bgp_announce_check() */ +	attr.extra = &extra; + +	for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) +		for (ri = rn->info; ri; ri = ri->next) + +			if (CHECK_FLAG(ri->flags, BGP_INFO_SELECTED) +			    || (addpath_capable +				&& bgp_addpath_tx_path(peer, afi, safi, ri))) { +				if (subgroup_announce_check(ri, subgrp, &rn->p, +							    &attr)) +					bgp_adj_out_set_subgroup(rn, subgrp, +								 &attr, ri); +				else +					bgp_adj_out_unset_subgroup( +						rn, subgrp, 1, +						ri->addpath_tx_id); +			} + +	/* +	 * We walked through the whole table -- make sure our version number +	 * is consistent with the one on the table. This should allow +	 * subgroups to merge sooner if a peer comes up when the route node +	 * with the largest version is no longer in the table. This also +	 * covers the pathological case where all routes in the table have +	 * now been deleted. +	 */ +	subgrp->version = max(subgrp->version, table->version); + +	/* +	 * Start a task to merge the subgroup if necessary. +	 */ +	update_subgroup_trigger_merge_check(subgrp, 0);  }  /* @@ -645,156 +638,154 @@ subgroup_announce_table (struct update_subgroup *subgrp,   *   * Refresh all routes out to a subgroup.   */ -void -subgroup_announce_route (struct update_subgroup *subgrp) +void subgroup_announce_route(struct update_subgroup *subgrp)  { -  struct bgp_node *rn; -  struct bgp_table *table; -  struct peer *onlypeer; - -  if (update_subgroup_needs_refresh (subgrp)) -    { -      update_subgroup_set_needs_refresh (subgrp, 0); -    } - -  /* -   * First update is deferred until ORF or ROUTE-REFRESH is received -   */ -  onlypeer = ((SUBGRP_PCOUNT (subgrp) == 1) ? -	      (SUBGRP_PFIRST (subgrp))->peer : NULL); -  if (onlypeer && -      CHECK_FLAG (onlypeer-> -		  af_sflags[SUBGRP_AFI (subgrp)][SUBGRP_SAFI (subgrp)], -		  PEER_STATUS_ORF_WAIT_REFRESH)) -    return; - -  if (SUBGRP_SAFI (subgrp) != SAFI_MPLS_VPN && -      SUBGRP_SAFI (subgrp) != SAFI_ENCAP && -      SUBGRP_SAFI (subgrp) != SAFI_EVPN) -    subgroup_announce_table (subgrp, NULL); -  else -    for (rn = bgp_table_top (update_subgroup_rib (subgrp)); rn; -	 rn = bgp_route_next (rn)) -      if ((table = (rn->info)) != NULL) -	subgroup_announce_table (subgrp, table); +	struct bgp_node *rn; +	struct bgp_table *table; +	struct peer *onlypeer; + +	if (update_subgroup_needs_refresh(subgrp)) { +		update_subgroup_set_needs_refresh(subgrp, 0); +	} + +	/* +	 * First update is deferred until ORF or ROUTE-REFRESH is received +	 */ +	onlypeer = ((SUBGRP_PCOUNT(subgrp) == 1) ? (SUBGRP_PFIRST(subgrp))->peer +						 : NULL); +	if (onlypeer && CHECK_FLAG(onlypeer->af_sflags[SUBGRP_AFI(subgrp)] +						      [SUBGRP_SAFI(subgrp)], +				   PEER_STATUS_ORF_WAIT_REFRESH)) +		return; + +	if (SUBGRP_SAFI(subgrp) != SAFI_MPLS_VPN +	    && SUBGRP_SAFI(subgrp) != SAFI_ENCAP +	    && SUBGRP_SAFI(subgrp) != SAFI_EVPN) +		subgroup_announce_table(subgrp, NULL); +	else +		for (rn = bgp_table_top(update_subgroup_rib(subgrp)); rn; +		     rn = bgp_route_next(rn)) +			if ((table = (rn->info)) != NULL) +				subgroup_announce_table(subgrp, table);  } -void -subgroup_default_originate (struct update_subgroup *subgrp, int withdraw) +void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)  { -  struct bgp *bgp; -  struct attr attr; -  struct aspath *aspath; -  struct prefix p; -  struct peer *from; -  struct bgp_node *rn; -  struct bgp_info *ri; -  struct peer *peer; -  int ret = RMAP_DENYMATCH; -  afi_t afi; -  safi_t safi; - -  if (!subgrp) -    return; - -  peer = SUBGRP_PEER (subgrp); -  afi = SUBGRP_AFI (subgrp); -  safi = SUBGRP_SAFI (subgrp); - -  if (!(afi == AFI_IP || afi == AFI_IP6)) -    return; - -  bgp = peer->bgp; -  from = bgp->peer_self; - -  bgp_attr_default_set (&attr, BGP_ORIGIN_IGP); -  aspath = attr.aspath; -  attr.local_pref = bgp->default_local_pref; - -  if (afi == AFI_IP) -    str2prefix ("0.0.0.0/0", &p); -  else if (afi == AFI_IP6) -    { -      struct attr_extra *ae = attr.extra; - -      str2prefix ("::/0", &p); - -      /* IPv6 global nexthop must be included. */ -      ae->mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL; - -      /* If the peer is on shared nextwork and we have link-local -         nexthop set it. */ -      if (peer->shared_network -	  && !IN6_IS_ADDR_UNSPECIFIED (&peer->nexthop.v6_local)) -        ae->mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL; -    } - -  if (peer->default_rmap[afi][safi].name) -    { -      SET_FLAG (bgp->peer_self->rmap_type, PEER_RMAP_TYPE_DEFAULT); -      for (rn = bgp_table_top (bgp->rib[afi][safi]); rn; -	   rn = bgp_route_next (rn)) -	{ -	  for (ri = rn->info; ri; ri = ri->next) -	    { -	      struct attr dummy_attr; -	      struct attr_extra dummy_extra; -	      struct bgp_info info; - -	      /* Provide dummy so the route-map can't modify the attributes */ -	      dummy_attr.extra = &dummy_extra; -	      bgp_attr_dup (&dummy_attr, ri->attr); -	      info.peer = ri->peer; -	      info.attr = &dummy_attr; - -	      ret = -		route_map_apply (peer->default_rmap[afi][safi].map, &rn->p, -				 RMAP_BGP, &info); - -	      /* The route map might have set attributes. If we don't flush them -	       * here, they will be leaked. */ -	      bgp_attr_flush (&dummy_attr); -	      if (ret != RMAP_DENYMATCH) -		break; -	    } -	  if (ret != RMAP_DENYMATCH) -	    break; +	struct bgp *bgp; +	struct attr attr; +	struct aspath *aspath; +	struct prefix p; +	struct peer *from; +	struct bgp_node *rn; +	struct bgp_info *ri; +	struct peer *peer; +	int ret = RMAP_DENYMATCH; +	afi_t afi; +	safi_t safi; + +	if (!subgrp) +		return; + +	peer = SUBGRP_PEER(subgrp); +	afi = SUBGRP_AFI(subgrp); +	safi = SUBGRP_SAFI(subgrp); + +	if (!(afi == AFI_IP || afi == AFI_IP6)) +		return; + +	bgp = peer->bgp; +	from = bgp->peer_self; + +	bgp_attr_default_set(&attr, BGP_ORIGIN_IGP); +	aspath = attr.aspath; +	attr.local_pref = bgp->default_local_pref; + +	if (afi == AFI_IP) +		str2prefix("0.0.0.0/0", &p); +	else if (afi == AFI_IP6) { +		struct attr_extra *ae = attr.extra; + +		str2prefix("::/0", &p); + +		/* IPv6 global nexthop must be included. */ +		ae->mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL; + +		/* If the peer is on shared nextwork and we have link-local +		   nexthop set it. */ +		if (peer->shared_network +		    && !IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_local)) +			ae->mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL;  	} -      bgp->peer_self->rmap_type = 0; - -      if (ret == RMAP_DENYMATCH) -	withdraw = 1; -    } - -  if (withdraw) -    { -      if (CHECK_FLAG (subgrp->sflags, SUBGRP_STATUS_DEFAULT_ORIGINATE)) -	subgroup_default_withdraw_packet (subgrp); -      UNSET_FLAG (subgrp->sflags, SUBGRP_STATUS_DEFAULT_ORIGINATE); -    } -  else -    { -      if (!CHECK_FLAG (subgrp->sflags, SUBGRP_STATUS_DEFAULT_ORIGINATE)) -	{ -	  SET_FLAG (subgrp->sflags, SUBGRP_STATUS_DEFAULT_ORIGINATE); -	  subgroup_default_update_packet (subgrp, &attr, from); - -          /* The 'neighbor x.x.x.x default-originate' default will act as an -           * implicit withdraw for any previous UPDATEs sent for 0.0.0.0/0 so -           * clear adj_out for the 0.0.0.0/0 prefix in the BGP table. -           */ -          if (afi == AFI_IP) -            str2prefix ("0.0.0.0/0", &p); -          else -            str2prefix ("::/0", &p); - -          rn = bgp_afi_node_get (bgp->rib[afi][safi], afi, safi, &p, NULL); -          bgp_adj_out_unset_subgroup (rn, subgrp, 0, BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE); + +	if (peer->default_rmap[afi][safi].name) { +		SET_FLAG(bgp->peer_self->rmap_type, PEER_RMAP_TYPE_DEFAULT); +		for (rn = bgp_table_top(bgp->rib[afi][safi]); rn; +		     rn = bgp_route_next(rn)) { +			for (ri = rn->info; ri; ri = ri->next) { +				struct attr dummy_attr; +				struct attr_extra dummy_extra; +				struct bgp_info info; + +				/* Provide dummy so the route-map can't modify +				 * the attributes */ +				dummy_attr.extra = &dummy_extra; +				bgp_attr_dup(&dummy_attr, ri->attr); +				info.peer = ri->peer; +				info.attr = &dummy_attr; + +				ret = route_map_apply( +					peer->default_rmap[afi][safi].map, +					&rn->p, RMAP_BGP, &info); + +				/* The route map might have set attributes. If +				 * we don't flush them +				 * here, they will be leaked. */ +				bgp_attr_flush(&dummy_attr); +				if (ret != RMAP_DENYMATCH) +					break; +			} +			if (ret != RMAP_DENYMATCH) +				break; +		} +		bgp->peer_self->rmap_type = 0; + +		if (ret == RMAP_DENYMATCH) +			withdraw = 1;  	} -    } -  bgp_attr_extra_free (&attr); -  aspath_unintern (&aspath); +	if (withdraw) { +		if (CHECK_FLAG(subgrp->sflags, SUBGRP_STATUS_DEFAULT_ORIGINATE)) +			subgroup_default_withdraw_packet(subgrp); +		UNSET_FLAG(subgrp->sflags, SUBGRP_STATUS_DEFAULT_ORIGINATE); +	} else { +		if (!CHECK_FLAG(subgrp->sflags, +				SUBGRP_STATUS_DEFAULT_ORIGINATE)) { +			SET_FLAG(subgrp->sflags, +				 SUBGRP_STATUS_DEFAULT_ORIGINATE); +			subgroup_default_update_packet(subgrp, &attr, from); + +			/* The 'neighbor x.x.x.x default-originate' default will +			 * act as an +			 * implicit withdraw for any previous UPDATEs sent for +			 * 0.0.0.0/0 so +			 * clear adj_out for the 0.0.0.0/0 prefix in the BGP +			 * table. +			 */ +			if (afi == AFI_IP) +				str2prefix("0.0.0.0/0", &p); +			else +				str2prefix("::/0", &p); + +			rn = bgp_afi_node_get(bgp->rib[afi][safi], afi, safi, +					      &p, NULL); +			bgp_adj_out_unset_subgroup( +				rn, subgrp, 0, +				BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE); +		} +	} + +	bgp_attr_extra_free(&attr); +	aspath_unintern(&aspath);  }  /* @@ -805,70 +796,64 @@ subgroup_default_originate (struct update_subgroup *subgrp, int withdraw)   * subgrp->v_coalesce will be set to zero and the normal logic   * prevails.   */ -void -subgroup_announce_all (struct update_subgroup *subgrp) +void subgroup_announce_all(struct update_subgroup *subgrp)  { -  if (!subgrp) -    return; - -  /* -   * If coalesce timer value is not set, announce routes immediately. -   */ -  if (!subgrp->v_coalesce) -    { -      if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0)) -        zlog_debug ("u%" PRIu64 ":s%" PRIu64 " announcing all routes", -                    subgrp->update_group->id, subgrp->id); -      subgroup_announce_route (subgrp); -      return; -    } - -  /* -   * We should wait for the coalesce timer. Arm the timer if not done. -   */ -  if (!subgrp->t_coalesce) -    { -      THREAD_TIMER_MSEC_ON (bm->master, subgrp->t_coalesce, subgroup_coalesce_timer, -		            subgrp, subgrp->v_coalesce); -    } +	if (!subgrp) +		return; + +	/* +	 * If coalesce timer value is not set, announce routes immediately. +	 */ +	if (!subgrp->v_coalesce) { +		if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0)) +			zlog_debug("u%" PRIu64 ":s%" PRIu64 +				   " announcing all routes", +				   subgrp->update_group->id, subgrp->id); +		subgroup_announce_route(subgrp); +		return; +	} + +	/* +	 * We should wait for the coalesce timer. Arm the timer if not done. +	 */ +	if (!subgrp->t_coalesce) { +		THREAD_TIMER_MSEC_ON(bm->master, subgrp->t_coalesce, +				     subgroup_coalesce_timer, subgrp, +				     subgrp->v_coalesce); +	}  }  /*   * Go through all update subgroups and set up the adv queue for the   * input route.   */ -void -group_announce_route (struct bgp *bgp, afi_t afi, safi_t safi, -		      struct bgp_node *rn, struct bgp_info *ri) +void group_announce_route(struct bgp *bgp, afi_t afi, safi_t safi, +			  struct bgp_node *rn, struct bgp_info *ri)  { -  struct updwalk_context ctx; -  ctx.ri = ri; -  ctx.rn = rn; -  update_group_af_walk (bgp, afi, safi, group_announce_route_walkcb, &ctx); +	struct updwalk_context ctx; +	ctx.ri = ri; +	ctx.rn = rn; +	update_group_af_walk(bgp, afi, safi, group_announce_route_walkcb, &ctx);  } -void -update_group_show_adj_queue (struct bgp *bgp, afi_t afi, safi_t safi, -			     struct vty *vty, uint64_t id) +void update_group_show_adj_queue(struct bgp *bgp, afi_t afi, safi_t safi, +				 struct vty *vty, uint64_t id)  { -  updgrp_show_adj (bgp, afi, safi, vty, id, UPDWALK_FLAGS_ADVQUEUE); +	updgrp_show_adj(bgp, afi, safi, vty, id, UPDWALK_FLAGS_ADVQUEUE);  } -void -update_group_show_advertised (struct bgp *bgp, afi_t afi, safi_t safi, -			      struct vty *vty, uint64_t id) +void update_group_show_advertised(struct bgp *bgp, afi_t afi, safi_t safi, +				  struct vty *vty, uint64_t id)  { -  updgrp_show_adj (bgp, afi, safi, vty, id, UPDWALK_FLAGS_ADVERTISED); +	updgrp_show_adj(bgp, afi, safi, vty, id, UPDWALK_FLAGS_ADVERTISED);  } -void -update_group_announce (struct bgp *bgp) +void update_group_announce(struct bgp *bgp)  { -  update_group_walk (bgp, update_group_announce_walkcb, NULL); +	update_group_walk(bgp, update_group_announce_walkcb, NULL);  } -void -update_group_announce_rrclients (struct bgp *bgp) +void update_group_announce_rrclients(struct bgp *bgp)  { -  update_group_walk (bgp, update_group_announce_rrc_walkcb, NULL); +	update_group_walk(bgp, update_group_announce_rrc_walkcb, NULL);  }  | 
