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

* clicon_msg_rcv: Added intr parameter for interrupting on ^C (default 0)

Browse source 
* Internal NETCONF (client <-> backend)
  * Ensure message-id increments
  * Separated rpc from notification socket in same session
* Removed coverage icon from homepage since it stopped working some time ago
This commit is contained in:
Olof hagsand 2023-03-08 21:14:38 +01:00
parent 453e97ef6b
commit 5822c1a72a
21 changed files with 140 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/backend/backend_client.c
View file

@ -1554,14 +1554,6 @@ from_client_msg(clicon_handle h,
goto done;
goto reply;
}
/* Sanity check:
* op_id from internal message can be out-of-sync from client's sessions-id for the following reasons:
* 1. Its a hello when the client starts with op_id=0 to get its proper id on hello reply
* 2. The backend has restarted and the client uses an old op_id
*/
if (op_id != 0 && ce->ce_id != op_id){
clicon_debug(1, "%s Warning: incoming session-id:%u does not match socket ce_id:%u", __FUNCTION__, op_id, ce->ce_id);
}
/* Check for empty frame (no mesaages), return empty message, not clear from RFC what to do */
if (xml_child_nr_type(xt, CX_ELMNT) == 0){
if (netconf_malformed_message(cbret, "Empty message in netconf rpc frame")< 0)
@ -1580,6 +1572,15 @@ from_client_msg(clicon_handle h,
}
rpcname = xml_name(x);
rpcprefix = xml_prefix(x);
/* Sanity check:
* op_id from internal message can be out-of-sync from client's sessions-id for the following reasons:
* 1. Its a hello when the client starts with op_id=0 to get its proper id on hello reply
* 2. The backend has restarted and the client uses an old op_id
* 3. Its a create-subsciption message that uses a separate socket(=client)
*/
if (op_id != 0 && ce->ce_id != op_id && strcmp(rpcname, "create-subscription")){
clicon_debug(1, "%s Warning: incoming session-id:%u does not match ce_id:%u on socket: %d", __FUNCTION__, op_id, ce->ce_id, ce->ce_s);
}
/* Note that this validation is also made in xml_yang_validate_rpc, but not for hello
*/
if (xml2ns(x, rpcprefix, &namespace) < 0)
@ -1786,7 +1787,7 @@ from_client(int s,
clicon_err(OE_NETCONF, EINVAL, "Internal error: s != ce->ce_s");
goto done;
}
if (clicon_msg_rcv(ce->ce_s, &msg, &eof) < 0)
if (clicon_msg_rcv(ce->ce_s, 0, &msg, &eof) < 0)
goto done;
if (eof){
backend_client_rm(h, ce);

5
apps/backend/clixon_backend_client.h
View file

@ -48,6 +48,11 @@
/* Backend client entry.
* Keep state about every connected client.
* References from RFC 6022, ietf-netconf-monitoring.yang sessions container
* @note that there is a discrepancy here between a client and a session
* A session may have multiple client endpoints, most notably a regular
* client socket and a separate notification client socket.
* But they are the same session.
* But the clixon client-entry do not differentiate
*/
struct client_entry{
struct client_entry *ce_next; /* The clients linked list */