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

* Implementation of "chunked framing" according to RFC6242 for Netconf 1.1.

Browse source 
* First hello is 1.0 EOM framing, then successing rpc is chunked framing
  * See
    * [Netconf framing](https://github.com/clicon/clixon/issues/50), and
    * [Clixon does not switch to chunked framing after NETCONF 1.1 is negotiated](https://github.com/clicon/clixon/issues/314)
* C:
  * Moved netconf framing code from netconf application to clixon lib
* Test:
  * New expecteof_netconf and adjusted other expect scripts to handle NETCONF 1.1 framing
This commit is contained in:
Olof hagsand 2022-03-27 17:39:24 +02:00
parent bf983d7ca4
commit c038c9a27f
95 changed files with 1758 additions and 1208 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/netconf/netconf_rpc.c
View file

@ -70,8 +70,6 @@
/* clicon */
#include <clixon/clixon.h>
#include "clixon_netconf.h"
#include "netconf_lib.h"
#include "netconf_filter.h"
#include "netconf_rpc.h"
@ -486,15 +484,18 @@ netconf_notification_cb(int s,
if (clicon_xml2cbuf(cb, xn, 0, 0, -1) < 0)
goto done;
/* Send it to listening client on stdout */
if (netconf_output_encap(1, cb, "notification") < 0){
if (netconf_output_encap(clicon_option_int(h, "netconf-framing"), cb) < 0){
cbuf_free(cb);
goto done;
}
if (netconf_output(1, cb, "notification") < 0)
goto done;
fflush(stdout);
cbuf_free(cb);
ok:
retval = 0;
done:
clicon_debug(1, "%s %d", __FUNCTION__, retval);
if (nsc)
xml_nsctx_free(nsc);
if (xt != NULL)
@ -680,13 +681,15 @@ netconf_application_rpc(clicon_handle h,
* @param[in] h clicon handle
* @param[in] xn Sub-tree (under xorig) at <rpc>...</rpc> level.
* @param[out] xret Return XML, error or OK
* @param[out] eof Set to 1 if pending close socket
* @retval 0 OK, can also be netconf error
* @retval -1 Error, fatal
*/
int
netconf_rpc_dispatch(clicon_handle h,
cxobj *xn,
cxobj **xret)
cxobj **xret,
int *eof)
{
int retval = -1;
cxobj *xe;
@ -735,7 +738,7 @@ netconf_rpc_dispatch(clicon_handle h,
goto done;
}
else if (strcmp(xml_name(xe), "close-session") == 0){
cc_closed++;
*eof = 1; /* Pending close */
if (clicon_rpc_netconf_xml(h, xml_parent(xe), xret, NULL) < 0)
goto done;
}