proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/defaults: add bool variable support

Browse Source 
(I hadn't initially added this because I thought it superfluous, but it
kinda makes things nicer.)

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2019-12-04 04:20:55 +01:00
parent ac4adef441
commit f210b3e300
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/defaults.c
View File

@ -166,6 +166,8 @@ static void frr_default_apply_one(struct frr_default *dflt, bool check)
if (!saveentry) if (!saveentry)
saveentry = entry; saveentry = entry;
if (dflt->dflt_bool)
*dflt->dflt_bool = dfltentry->val_bool;
if (dflt->dflt_str) if (dflt->dflt_str)
*dflt->dflt_str = dfltentry->val_str; *dflt->dflt_str = dfltentry->val_str;
if (dflt->dflt_long) if (dflt->dflt_long)
@ -174,6 +176,8 @@ static void frr_default_apply_one(struct frr_default *dflt, bool check)
*dflt->dflt_ulong = dfltentry->val_ulong; *dflt->dflt_ulong = dfltentry->val_ulong;
if (dflt->dflt_float) if (dflt->dflt_float)
*dflt->dflt_float = dfltentry->val_float; *dflt->dflt_float = dfltentry->val_float;
if (dflt->save_bool)
*dflt->save_bool = saveentry->val_bool;
if (dflt->save_str) if (dflt->save_str)
*dflt->save_str = saveentry->val_str; *dflt->save_str = saveentry->val_str;
if (dflt->save_long) if (dflt->save_long)

8
lib/defaults.h
View File

@ -19,6 +19,9 @@
#define _FRR_DEFAULTS_H #define _FRR_DEFAULTS_H
#include "config.h" #include "config.h"
#include <stdbool.h>
#include "compiler.h" #include "compiler.h"
#ifdef HAVE_DATACENTER #ifdef HAVE_DATACENTER
@ -67,6 +70,7 @@ struct frr_default_entry {
const char *match_profile; const char *match_profile;
/* value to use */ /* value to use */
bool val_bool;
const char *val_str; const char *val_str;
long val_long; long val_long;
unsigned long val_ulong; unsigned long val_ulong;
@ -90,12 +94,14 @@ struct frr_default {
*/ */
/* variable holding the default value for reading/use */ /* variable holding the default value for reading/use */
bool *dflt_bool;
const char **dflt_str; const char **dflt_str;
long *dflt_long; long *dflt_long;
unsigned long *dflt_ulong; unsigned long *dflt_ulong;
float *dflt_float; float *dflt_float;
/* variable to use when comparing for config save */ /* variable to use when comparing for config save */
bool *save_bool;
const char **save_str; const char **save_str;
long *save_long; long *save_long;
unsigned long *save_ulong; unsigned long *save_ulong;
@ -133,6 +139,8 @@ struct frr_default {
* will be expanded and blow up with a compile error. Use an enum or add an * will be expanded and blow up with a compile error. Use an enum or add an
* extra _ at the beginning (e.g. _SHARP_BLUNTNESS => DFLT__SHARP_BLUNTNESS) * extra _ at the beginning (e.g. _SHARP_BLUNTNESS => DFLT__SHARP_BLUNTNESS)
*/ */
#define FRR_CFG_DEFAULT_BOOL(varname, ...) \
_FRR_CFG_DEFAULT(bool, bool, varname, ## __VA_ARGS__)
#define FRR_CFG_DEFAULT_LONG(varname, ...) \ #define FRR_CFG_DEFAULT_LONG(varname, ...) \
_FRR_CFG_DEFAULT(long, long, varname, ## __VA_ARGS__) _FRR_CFG_DEFAULT(long, long, varname, ## __VA_ARGS__)
#define FRR_CFG_DEFAULT_ULONG(varname, ...) \ #define FRR_CFG_DEFAULT_ULONG(varname, ...) \