Commit 39c028e9 authored by Ondrej Zajicek's avatar Ondrej Zajicek
Browse files

Assign default protocol preference via proto_config_new(). 

The patch from Alexander V. Chernikov.
parent 09686693

nest/config.Y

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ CF_ADDTO(proto, dev_proto '}') 


dev_proto_start: proto_start DIRECT {

     this_proto = proto_config_new(&proto_device, sizeof(struct rt_dev_config), $1);

     this_proto->preference = DEF_PREF_DIRECT;

     init_list(&DIRECT_CFG->iface_list);

   }

 ;

nest/proto.c

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ proto_config_new(struct protocol *pr, unsigned size, int class) 
  c->global = new_config;

  c->protocol = pr;

  c->name = pr->name;

  c->preference = pr->preference;

  c->class = class;

  c->out_filter = FILTER_REJECT;

  c->table = c->global->master_rtc;

nest/protocol.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct protocol { 
  char *template;			/* Template for automatic generation of names */

  int name_counter;			/* Counter for automatic name generation */

  int attr_class;			/* Attribute class known to this protocol */

  unsigned preference;			/* Default protocol preference */



  void (*preconfig)(struct protocol *, struct config *);	/* Just before configuring */

  void (*postconfig)(struct proto_config *);			/* After configuring each instance */

nest/rt-dev.c

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ dev_copy_config(struct proto_config *dest, struct proto_config *src) 
struct protocol proto_device = {

  name:		"Direct",

  template:	"direct%d",

  preference:	DEF_PREF_DIRECT,

  init:		dev_init,

  reconfigure:	dev_reconfigure,

  copy_config:	dev_copy_config

proto/bgp/bgp.c

+1 −0
Original line number Diff line number Diff line
@@ -1178,6 +1178,7 @@ struct protocol proto_bgp = { 
  name:			"BGP",

  template:		"bgp%d",

  attr_class:		EAP_BGP,

  preference:		DEF_PREF_BGP,

  init:			bgp_init,

  start:		bgp_start,

  shutdown:		bgp_shutdown,

CRA Git | Maintained and supported by SUSTech CRA and CCSE