experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #162 from s-bauer/patch-2

Browse source 
Fixed filter-namespace not recognized correctly
This commit is contained in:
Olof Hagsand 2020-12-16 16:22:29 +01:00 • committed by GitHub
commit 4fe3486d4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
apps/netconf/netconf_rpc.c
View file

@ -164,9 +164,19 @@ netconf_get_config(clicon_handle h,
int retval = -1; int retval = -1;
cxobj *xfilter; /* filter */ cxobj *xfilter; /* filter */
char *ftype = NULL; char *ftype = NULL;
cvec *nsc = NULL;
char *prefix = NULL;
if(xml_nsctx_node(xn, &nsc) < 0)
goto done;
/* Get prefix of netconf base namespace in the incoming message */
if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){
goto done;
}
/* ie <filter>...</filter> */ /* ie <filter>...</filter> */
if ((xfilter = xpath_first(xn, NULL, "filter")) != NULL) if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL)
ftype = xml_find_value(xfilter, "type"); ftype = xml_find_value(xfilter, "type");
if (xfilter == NULL || ftype == NULL || strcmp(ftype, "xpath")==0){ if (xfilter == NULL || ftype == NULL || strcmp(ftype, "xpath")==0){
if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0) if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
@ -193,6 +203,8 @@ netconf_get_config(clicon_handle h,
} }
retval = 0; retval = 0;
done: done:
if (nsc)
cvec_free(nsc);
return retval; return retval;
} }
@ -364,9 +376,19 @@ netconf_get(clicon_handle h,
int retval = -1; int retval = -1;
cxobj *xfilter; /* filter */ cxobj *xfilter; /* filter */
char *ftype = NULL; char *ftype = NULL;
cvec *nsc = NULL;
char *prefix = NULL;
if(xml_nsctx_node(xn, &nsc) < 0)
goto done;
/* Get prefix of netconf base namespace in the incoming message */
if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){
goto done;
}
/* ie <filter>...</filter> */ /* ie <filter>...</filter> */
if ((xfilter = xpath_first(xn, NULL, "filter")) != NULL) if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL)
ftype = xml_find_value(xfilter, "type"); ftype = xml_find_value(xfilter, "type");
if (xfilter == NULL || ftype == NULL || strcmp(ftype, "xpath")==0){ if (xfilter == NULL || ftype == NULL || strcmp(ftype, "xpath")==0){
if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0) if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0)
@ -393,6 +415,8 @@ netconf_get(clicon_handle h,
} }
retval = 0; retval = 0;
done: done:
if(nsc)
cvec_free(nsc);
return retval; return retval;
} }