Merge remote-tracking branch 'origin/master' into HEAD (0f49a5fa) · Commits · 戴 / Bird

conf/cf-lex.l

+1 −1

Original line number	Diff line number	Diff line
		@@ -739,7 +739,7 @@ cf_lex_init(int is_cli, struct config *c)
		void
		cf_push_scope(struct symbol *sym)
		{
		struct sym_scope *s = cfg_alloc(sizeof(struct sym_scope));
		struct sym_scope *s = cfg_allocz(sizeof(struct sym_scope));

		s->next = conf_this_scope;
		conf_this_scope = s;

+1 −0

Original line number	Diff line number	Diff line
		@@ -572,6 +572,7 @@ cfg_copy_list(list dest, list src, unsigned node_size)
		{
		dn = cfg_alloc(node_size);
		memcpy(dn, sn, node_size);
		memset(dn, 0, sizeof(node));
		add_tail(dest, dn);
		}
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,9 @@ struct config {
		struct iface_patt router_id_from; / Configured list of router ID iface patterns */

		u32 router_id; /* Our Router ID */
		unsigned proto_default_debug; /* Default protocol debug mask */
		unsigned proto_default_mrtdump; /* Default protocol mrtdump mask */
		u32 proto_default_debug; /* Default protocol debug mask */
		u32 proto_default_mrtdump; /* Default protocol mrtdump mask */
		u32 channel_default_debug; /* Default channel debug mask */
		struct timeformat tf_route; /* Time format for 'show route' */
		struct timeformat tf_proto; /* Time format for 'show protocol' */
		struct timeformat tf_log; /* Time format for the logfile */

+3 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ CF_HDR
		#include "nest/protocol.h"
		#include "nest/iface.h"
		#include "nest/route.h"
		#include "nest/bfd.h"
		#include "nest/cli.h"
		#include "filter/filter.h"

		@@ -63,6 +64,7 @@ CF_DECLS
		const char *t;
		struct rtable_config *r;
		struct channel_config *cc;
		struct channel *c;
		struct f_inst *x;
		struct {
		struct f_inst begin, end;
		@@ -147,7 +149,7 @@ conf: definition ;

		definition:
		DEFINE symbol '=' term ';' {
		struct f_val *val = cfg_alloc(sizeof(struct f_val));
		struct f_val *val = cfg_allocz(sizeof(struct f_val));
		if (f_eval(f_linearize($4), cfg_mem, val) > F_RETURN) cf_error("Runtime error");
		cf_define_symbol($2, SYM_CONSTANT \| val->type, val, val);
		}

+1 −1

Original line number	Diff line number	Diff line
		/*
		* This is an example configuration file for MB-BGP setting
		* This is an example configuration file for MP-BGP setting
		*/