Removed argc/argv parameters from ca_start plugin API function. You may need to change signatures of your startup in your plugins
This commit is contained in:
parent
cdbce7645e
commit
60cb87f998
12 changed files with 72 additions and 96 deletions
|
|
@ -496,21 +496,12 @@ example_reset(clicon_handle h,
|
|||
|
||||
/*! Plugin start.
|
||||
* @param[in] h Clicon handle
|
||||
* @param[in] argc Argument vector length (args after -- to backend_main)
|
||||
* @param[in] argv Argument vector
|
||||
*
|
||||
* plugin_start is called once everything has been initialized, right before
|
||||
* the main event loop is entered.
|
||||
* From the cli/backend, command line options can be passed to the
|
||||
* plugins by using "-- <args>" where <args> is any choice of
|
||||
* options specific to the application. These options are passed to the
|
||||
* plugin_start function via the argc and argv arguments which
|
||||
* can be processed with the standard getopt(3).
|
||||
*/
|
||||
int
|
||||
example_start(clicon_handle h,
|
||||
int argc,
|
||||
char **argv)
|
||||
example_start(clicon_handle h)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -555,6 +546,7 @@ clixon_plugin_init(clicon_handle h)
|
|||
|
||||
clicon_debug(1, "%s backend", __FUNCTION__);
|
||||
|
||||
/* Get user command-line options (after --) */
|
||||
if (clicon_argv_get(h, &argc, &argv) < 0)
|
||||
goto done;
|
||||
opterr = 0;
|
||||
|
|
|
|||
|
|
@ -89,9 +89,7 @@ nacm_statedata(clicon_handle h,
|
|||
}
|
||||
|
||||
int
|
||||
plugin_start(clicon_handle h,
|
||||
int argc,
|
||||
char **argv)
|
||||
plugin_start(clicon_handle h)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
* the main event loop is entered.
|
||||
*/
|
||||
int
|
||||
plugin_start(clicon_handle h, int argc, char **argv)
|
||||
plugin_start(clicon_handle h)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ static const char Base64[] =
|
|||
static const char Pad64 = '=';
|
||||
|
||||
/* Use http basic auth. Set by starting restonf with:
|
||||
clixon_restconf ... -- -a
|
||||
*/
|
||||
* clixon_restconf ... -- -a
|
||||
*/
|
||||
static int basic_auth = 0;
|
||||
|
||||
/* skips all whitespace anywhere.
|
||||
|
|
@ -298,29 +298,11 @@ restconf_client_rpc(clicon_handle h,
|
|||
}
|
||||
|
||||
/*! Start example restonf plugin. Set authentication method
|
||||
* Arguments are argc/argv after --
|
||||
* Currently defined: -a enable http basic authentication
|
||||
* @note There are three hardwired users andy, wilma and guest from RFC8341 A.1
|
||||
*/
|
||||
int
|
||||
example_restconf_start(clicon_handle h,
|
||||
int argc,
|
||||
char **argv)
|
||||
example_restconf_start(clicon_handle h)
|
||||
{
|
||||
int c;
|
||||
|
||||
clicon_debug(1, "%s argc:%d", __FUNCTION__, argc);
|
||||
optind = 1;
|
||||
opterr = 0;
|
||||
while ((c = getopt(argc, argv, "a")) != -1){
|
||||
switch (c) {
|
||||
case 'a':
|
||||
basic_auth = 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
clicon_debug(1, "%s", __FUNCTION__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -338,11 +320,31 @@ static clixon_plugin_api api = {
|
|||
* @param[in] h Clixon handle
|
||||
* @retval NULL Error with clicon_err set
|
||||
* @retval api Pointer to API struct
|
||||
* Arguments are argc/argv after --
|
||||
* Currently defined: -a enable http basic authentication
|
||||
* @note There are three hardwired users andy, wilma and guest from RFC8341 A.1
|
||||
*/
|
||||
clixon_plugin_api *
|
||||
clixon_plugin_init(clicon_handle h)
|
||||
{
|
||||
int argc; /* command-line options (after --) */
|
||||
char **argv = NULL;
|
||||
char c;
|
||||
|
||||
clicon_debug(1, "%s restconf", __FUNCTION__);
|
||||
/* Get user command-line options (after --) */
|
||||
if (clicon_argv_get(h, &argc, &argv) < 0)
|
||||
return NULL;
|
||||
opterr = 0;
|
||||
optind = 1;
|
||||
while ((c = getopt(argc, argv, "a")) != -1)
|
||||
switch (c) {
|
||||
case 'a':
|
||||
basic_auth = 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
/* Register local netconf rpc client (note not backend rpc client) */
|
||||
if (rpc_callback_register(h, restconf_client_rpc, NULL, "urn:example:clixon", "client-rpc") < 0)
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue