summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2020-12-07 22:19:40 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2020-12-07 22:19:40 +0100
commit61dae32b29cc57b9884a1c13e5d630096e157a38 (patch)
tree290fb9c54661a12cf8cc179cd35128940f159f43 /conf
parent8cc5bb09e344038a1f8dff96946e05ec80607c93 (diff)
Nest: Per-channel debug flags
The patch add support for per-channel debug flags, currently just 'states', 'routes', and 'filters'. Flag 'states' is used for channel state changes, remaining two for routes passed through the channel. The per-protocol debug flags 'routes'/'filters' still enable reporting of routes for all channels, to keep existing behavior. The patch causes minor changes in some log messages.
Diffstat (limited to 'conf')
-rw-r--r--conf/conf.h5
-rw-r--r--conf/confbase.Y1
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/conf.h b/conf/conf.h
index 34c6818d..3e47c918 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -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 */
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 67dcac6c..d98f0fee 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -64,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;