mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-21 06:03:12 +00:00
71cbe86566
This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
98 lines
3.0 KiB
C
98 lines
3.0 KiB
C
/*
|
|
Serval DNA command-line parsing
|
|
Copyright (C) 2014-2015 Serval Project Inc.
|
|
Copyright (C) 2016 Flinders University
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#include "commandline.h"
|
|
#include "conf.h"
|
|
#include "str.h"
|
|
#include "cli_stdio.h"
|
|
|
|
DEFINE_CMD(app_usage, CLIFLAG_PERMISSIVE_CONFIG,
|
|
"Display command usage.",
|
|
"help|-h|--help","...");
|
|
static int app_usage(const struct cli_parsed *parsed, struct cli_context *UNUSED(context))
|
|
{
|
|
return cli_usage_parsed(parsed, XPRINTF_STDIO(stdout));
|
|
}
|
|
|
|
/* Parse the command line and load the configuration. If a command was found then execute the
|
|
* parsed command and return its return value.
|
|
*
|
|
* 'context' controls the command output.
|
|
*
|
|
* 'argv0' must be NULL or be a nul-terminated string containing the name or path of the executable.
|
|
* It is used to emit diagnostic messages.
|
|
*
|
|
* 'argc' and 'args' must contain the command-line words to parse.
|
|
*/
|
|
int commandline_main(struct cli_context *context, const char *argv0, int argc, const char *const *args)
|
|
{
|
|
fd_clearstats();
|
|
IN();
|
|
|
|
cf_init();
|
|
|
|
struct cli_parsed parsed;
|
|
int result = cli_parse(argc, args, SECTION_START(commands), SECTION_END(commands), &parsed);
|
|
switch (result) {
|
|
case 0:
|
|
// Do not run the command if the configuration does not load ok.
|
|
if (((parsed.commands[parsed.cmdi].flags & CLIFLAG_PERMISSIVE_CONFIG) ? cf_reload_permissive() : cf_reload()) != -1)
|
|
result = cli_invoke(&parsed, context);
|
|
else {
|
|
strbuf b = strbuf_alloca(160);
|
|
strbuf_append_argv(b, argc, args);
|
|
result = WHYF("configuration defective, not running command: %s", strbuf_str(b));
|
|
}
|
|
break;
|
|
case 1:
|
|
case 2:
|
|
// Load configuration so that log messages can get out.
|
|
cf_reload_permissive();
|
|
NOWHENCE(HINTF("Run \"%s help\" for more information.", argv0 ? argv0 : "servald"));
|
|
result =-1;
|
|
break;
|
|
default:
|
|
// Load configuration so that log error messages can get out.
|
|
cf_reload_permissive();
|
|
break;
|
|
}
|
|
|
|
cli_cleanup();
|
|
|
|
OUT();
|
|
|
|
if (IF_DEBUG(timing))
|
|
fd_showstats();
|
|
return result;
|
|
}
|
|
|
|
int commandline_main_stdio(FILE *output, const char *argv0, int argc, const char *const *args)
|
|
{
|
|
struct cli_context_stdio cli_context_stdio = {
|
|
.fp = output
|
|
};
|
|
struct cli_context cli_context = {
|
|
.vtable = &cli_vtable_stdio,
|
|
.context = &cli_context_stdio
|
|
};
|
|
|
|
return commandline_main(&cli_context, argv0, argc, args);
|
|
}
|