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

Fixed: kill-session cleanup when client none existant, and for all db:s

Browse source 
Added cli_kill_session callback
This commit is contained in:
Olof hagsand 2023-12-22 22:27:54 +01:00
parent 558a0df1f3
commit 7b58c1c562
4 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/backend/backend_client.c
View file

@ -173,7 +173,6 @@ ce_event_cb(clixon_handle h,
return retval;
}
/*! Unlock all db:s of a client and call user unlock calback
*
* @see xmldb_unlock_all unlocks, but does not call user callbacks which is a backend thing
@ -1015,7 +1014,6 @@ from_client_kill_session(clixon_handle h,
uint32_t id; /* session id */
char *str = NULL;
struct client_entry *ce;
char *db = "running"; /* XXX */
cxobj *x;
int ret;
char *reason = NULL;
@ -1032,16 +1030,10 @@ from_client_kill_session(clixon_handle h,
goto ok;
/* may or may not be in active client list, probably not */
if ((ce = ce_find_byid(backend_client_list(h), id)) != NULL){
if (release_all_dbs(h, id) < 0)
goto done;
backend_client_rm(h, ce); /* Removes client struct */
}
if (xmldb_islocked(h, db) == id){
xmldb_unlock(h, db);
/* user callback */
if (clixon_plugin_lockdb_all(h, db, 0, id) < 0)
goto done;
}
if (release_all_dbs(h, id) < 0)
goto done;
cprintf(cbret, "<rpc-reply xmlns=\"%s\"><ok/></rpc-reply>", NETCONF_BASE_NAMESPACE);
ok:
retval = 0;