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

Fixed filter namespace in netconf_rpc.o

Browse source 
The "filter" node was not detected when an a namespace was used. The fix is similar to d045e8abce and related to bug #154 #143
This commit is contained in:
Simon Bauer 2020-12-13 18:05:49 +01:00 • committed by GitHub
parent d6db28c47a
commit be329dac6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/netconf/netconf_rpc.c
View file

@ -164,6 +164,16 @@ 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, NULL, "filter")) != NULL)
@ -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,6 +376,16 @@ 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, NULL, "filter")) != NULL)
@ -393,6 +415,8 @@ netconf_get(clicon_handle h,
} }
retval = 0; retval = 0;
done: done:
if(nsc)
cvec_free(nsc);
return retval; return retval;
} }