Revision e04555c0

View differences:

nest/config.Y
44 44
CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS)
45 45
CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
46 46
CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, GENERATE)
47
CF_KEYWORDS(LISTEN, BGP, V6ONLY, ADDRESS, PORT, PASSWORDS)
47
CF_KEYWORDS(LISTEN, BGP, V6ONLY, ADDRESS, PORT, PASSWORDS, DESCRIPTION)
48 48

  
49 49
CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
50 50
	RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE)
......
141 141
 | EXPORT imexport { this_proto->out_filter = $2; }
142 142
 | TABLE rtable { this_proto->table = $2; }
143 143
 | ROUTER ID idval { this_proto->router_id = $3; }
144
 | DESCRIPTION dsc { this_proto->dsc = $2; }
144 145
 ;
145 146

  
146 147
imexport:
nest/proto.c
307 307
	  if (sym && sym->class == SYM_PROTO && !new->shutdown)
308 308
	    {
309 309
	      /* Found match, let's check if we can smoothly switch to new configuration */
310
	      /* No need to check description */
310 311
	      nc = sym->def;
311 312
	      if (!force_reconfig
312 313
		  && nc->protocol == oc->protocol
......
702 703
	  buf);
703 704
  if (verbose)
704 705
    {
706
      if (p->cf->dsc)
707
	cli_msg(-1006, "  Description:    %s", p->cf->dsc);
705 708
      cli_msg(-1006, "  Preference:     %d", p->preference);
706 709
      cli_msg(-1006, "  Input filter:   %s", filter_name(p->in_filter));
707 710
      cli_msg(-1006, "  Output filter:  %s", filter_name(p->out_filter));
nest/protocol.h
81 81
  struct protocol *protocol;		/* Protocol */
82 82
  struct proto *proto;			/* Instance we've created */
83 83
  char *name;
84
  char *dsc;
84 85
  unsigned debug, preference, disabled;	/* Generic parameters */
85 86
  u32 router_id;			/* Protocol specific router ID */
86 87
  struct rtable_config *table;		/* Table we're attached to */

Also available in: Unified diff