Pipe: Propagate debug flags from protocol to channels (2f981534) · Commits · 戴 / Bird

nest/proto.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2210,10 +2210,17 @@ proto_cmd_reload(struct proto *p, uintptr_t dir, int cnt UNUSED)
		cli_msg(-15, "%s: reloading", p->name);
		}

		extern void pipe_update_debug(struct proto *P);

		void
		proto_cmd_debug(struct proto *p, uintptr_t mask, int cnt UNUSED)
		{
		p->debug = mask;

		#ifdef CONFIG_PIPE
		if (p->proto == &proto_pipe)
		pipe_update_debug(p);
		#endif
		}

		void

+12 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,8 @@ pipe_postconfig(struct proto_config *CF)

		if (cc->in_keep_filtered)
		cf_error("Pipe protocol prohibits keeping filtered routes");

		cc->debug = cf->c.debug;
		}

		static int
		@@ -155,6 +157,7 @@ pipe_configure_channels(struct pipe_proto p, struct pipe_config cf)
		.out_filter = cc->out_filter,
		.in_limit = cc->in_limit,
		.ra_mode = RA_ANY,
		.debug = cc->debug,
		.rpki_reload = cc->rpki_reload,
		};

		@@ -165,6 +168,7 @@ pipe_configure_channels(struct pipe_proto p, struct pipe_config cf)
		.out_filter = cc->in_filter,
		.in_limit = cc->out_limit,
		.ra_mode = RA_ANY,
		.debug = cc->debug,
		.rpki_reload = cc->rpki_reload,
		};

		@@ -278,6 +282,14 @@ pipe_show_proto_info(struct proto *P)
		pipe_show_stats(p);
		}

		void
		pipe_update_debug(struct proto *P)
		{
		struct pipe_proto p = (void ) P;

		p->pri->debug = p->sec->debug = p->p.debug;
		}


		struct protocol proto_pipe = {
		.name = "Pipe",