Merge branch 'int-new-channels' of gitlab.labs.nic.cz:labs/bird into int-new-channels (0c8c8151) · Commits · 戴 / Bird

conf/conf.c

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ int config_commit(struct config *, int type, int timeout);
		int config_confirm(void);
		int config_undo(void);
		void config_init(void);
		void cf_error(char *msg, ...) NORET;
		void cf_error(const char *msg, ...) NORET;
		void config_add_obstacle(struct config *);
		void config_del_obstacle(struct config *);
		void order_shutdown(void);

+7 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,12 @@ static int graceful_restart_state;
		static u32 graceful_restart_locks;

		static char *p_states[] = { "DOWN", "START", "UP", "STOP" };
		static char *cs_states[] = {
		[CS_DOWN] = "DOWN",
		[CS_START] = "START",
		[CS_UP] = "UP",
		[CS_FLUSHING] = "FLUSHING"
		};

		extern struct protocol proto_unix_iface;

		@@ -313,7 +319,7 @@ channel_set_state(struct channel *c, uint state)
		uint cs = c->channel_state;
		uint es = c->export_state;

		DBG("%s reporting state transition %s/%s -> */%s\n", p->name, c_states[cs], p_states[ops], p_states[ps]);
		DBG("%s reporting channel %s state transition %s -> %s\n", c->proto->name, c->name, cs_states[cs], cs_states[state]);
		if (state == cs)
		return;

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ dev_ifa_notify(struct proto P, uint flags, struct ifa ad)

		if (!EMPTY_LIST(cf->iface_list) &&
		!iface_patt_find(&cf->iface_list, ad->iface, ad->iface->addr))
		/* Empty list is automagically treated as "" /
		/* Empty list is automatically treated as "" /
		return;

		if (ad->flags & IA_SECONDARY)