diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-01-23 15:12:43 +0100 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-01-23 15:12:43 +0100 |
commit | ace3072e09e445b2fd8554492b80bea5cc1f3411 (patch) | |
tree | a3afd6f646a071cca3574d35a531cf9fefa4c347 /sysdep/unix/krt.c | |
parent | e5ff7929c4d85b84496cdfc46f006b8cd1b4c0e5 (diff) |
KRT: Fix option 'merge paths'
Diffstat (limited to 'sysdep/unix/krt.c')
-rw-r--r-- | sysdep/unix/krt.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index d4c0db72..bfdbfa4e 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -1059,11 +1059,18 @@ krt_postconfig(struct proto_config *CF) cf_error("All kernel syncers must use the same table scan interval"); #endif - struct rtable_config *tab = proto_cf_main_channel(CF)->table; + struct channel_config *cc = proto_cf_main_channel(CF); + struct rtable_config *tab = cc->table; if (tab->krt_attached) cf_error("Kernel syncer (%s) already attached to table %s", tab->krt_attached->name, tab->name); tab->krt_attached = CF; + if (cf->merge_paths) + { + cc->ra_mode = RA_MERGED; + cc->merge_limit = cf->merge_paths; + } + krt_sys_postconfig(cf); } |