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

Internal framing: fcgi error

Browse source 
CLI continue error
enable msg recv interrupt
This commit is contained in:
Olof hagsand 2024-02-28 14:21:34 +01:00
parent 520f8a9a42
commit 4138f390d4
7 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/backend/backend_client.c
View file

@ -1860,7 +1860,7 @@ from_client(int s,
}
if (ce_client_descr(ce, &cbce) < 0)
goto done;
if (clixon_msg_rcv11(s, NULL, &cb, &eof) < 0)
if (clixon_msg_rcv11(s, NULL, 0, &cb, &eof) < 0)
goto done;
if (eof){
backend_client_rm(h, ce);

2
apps/cli/cli_common.c
View file

@ -1408,7 +1408,7 @@ cli_notification_cb(int s,
enum format_enum format = (enum format_enum)(uintptr_t)arg;
cbuf *cb = NULL;
if (clixon_msg_rcv11(s, NULL, &cb, &eof) < 0)
if (clixon_msg_rcv11(s, NULL, 0, &cb, &eof) < 0)
goto done;
if (eof){
clixon_err(OE_PROTO, ESHUTDOWN, "Socket unexpected close");

2
apps/netconf/netconf_rpc.c
View file

@ -461,7 +461,7 @@ netconf_notification_cb(int s,
clixon_debug(CLIXON_DBG_NETCONF, "");
yspec = clicon_dbspec_yang(h);
if (clixon_msg_rcv11(s, NULL, &cbmsg, &eof) < 0)
if (clixon_msg_rcv11(s, NULL, 0, &cbmsg, &eof) < 0)
goto done;
/* handle close from remote end: this will exit the client */
if (eof){

9
apps/restconf/restconf_stream_fcgi.c
View file

@ -211,14 +211,13 @@ restconf_stream_cb(int s,
cxobj *xtop = NULL; /* top xml */
cxobj *xn; /* notification xml */
cbuf *cb = NULL;
int pretty = 0; /* XXX should be via arg */
cbuf *cbmsg = NULL;
int pretty = 0; /* XXX should be via arg */
int ret;
clixon_debug(CLIXON_DBG_STREAM, "");
if (clixon_msg_rcv11(s, NULL, &cbmsg, &eof) < 0)
if (clixon_msg_rcv11(s, NULL, 0, &cbmsg, &eof) < 0)
goto done;
clixon_debug(CLIXON_DBG_STREAM, "msg: %s", reply?reply->op_body:"null");
/* handle close from remote end: this will exit the client */
if (eof){
clixon_debug(CLIXON_DBG_STREAM, "eof");
@ -230,7 +229,7 @@ restconf_stream_cb(int s,
clixon_exit_set(1);
goto done;
}
if ((ret = clixon_xml_parse_string(cbuf_get(cbmsg), YB_NONE, NULL, &xt, NULL)) < 0)
if ((ret = clixon_xml_parse_string(cbuf_get(cbmsg), YB_NONE, NULL, &xtop, NULL)) < 0)
goto done;
if (ret == 0){
clixon_err(OE_XML, EFAULT, "Invalid notification");
@ -266,8 +265,6 @@ restconf_stream_cb(int s,
clixon_debug(CLIXON_DBG_STREAM, "retval: %d", retval);
if (xtop != NULL)
xml_free(xtop);
if (reply)
free(reply);
if (cbmsg)
cbuf_free(cbmsg);
if (cb)