peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-02 05:43:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: refactor, make lydx_is_enabled() available to all modules

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-06-20 11:11:52 +02:00
committed by Tobias Waldekranz
parent 86304e2656
commit 352a1f1f64
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/confd/infix-dhcp.c
+2 -13
View File
@@ -18,17 +18,6 @@ static const struct srx_module_requirement infix_dhcp_reqs[] = {
{ NULL }
};
static int is_enabled(struct lyd_node *parent, const char *name)
{
const char *attr;
attr = lydx_get_cattr(parent, name);
if (!attr || strcmp(attr, "true"))
return 0;
return 1;
}
static void add(const char *ifname, const char *client_id)
{
char *args = NULL;
@@ -87,7 +76,7 @@ static int client_change(sr_session_ctx_t *session, uint32_t sub_id, const char
goto err_release_data;
global = lydx_get_descendant(cfg->tree, "dhcp-client", NULL);
ena = is_enabled(global, "enabled");
ena = lydx_is_enabled(global, "enabled");
cifs = lydx_get_descendant(cfg->tree, "dhcp-client", "client-if", NULL);
difs = lydx_get_descendant(diff, "dhcp-client", "client-if", NULL);
@@ -105,7 +94,7 @@ static int client_change(sr_session_ctx_t *session, uint32_t sub_id, const char
if (strcmp(ifname, lydx_get_cattr(cif, "if-name")))
continue;
if (!ena || !is_enabled(cif, "enabled"))
if (!ena || !lydx_is_enabled(cif, "enabled"))
del(ifname);
else
add(ifname, lydx_get_cattr(cif, "client-id"));
src/confd/src/lib/lyx.h
+11
View File
@@ -48,4 +48,15 @@ int lydx_new_path(const struct ly_ctx *ctx, struct lyd_node **parent, int *first
char *node, const char *fmt, ...)
__attribute__ ((format (printf, 6, 7)));
static inline int lydx_is_enabled(struct lyd_node *parent, const char *name)
{
const char *attr;
attr = lydx_get_cattr(parent, name);
if (!attr || strcmp(attr, "true"))
return 0;
return 1;
}
#endif /* CONFD_LY_EXT_H_ */