mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-20 21:53:12 +00:00
92fa6c196a
Rename the logging primitive functions and utility functions, prefixing all with 'serval_log', eg: logMessage() -> serval_logf() etc. Add an XPRINTF xhexdump() function and use it to implement the serval_log_hexdump() utility, renamed from dump(). Add macros WHY_dump(), WARN_dump(), HINT_dump() and DEBUG_dump(), and use them everywhere. Remove the 'log.console.dump_config' and 'log.file.dump_config' configuration options; configuration is now dumped in every log prolog. The logging system now constructs the log prolog by invoking the new 'log_prolog' trigger, so that it no longer depends on the version string and configuration system. Any system that wants to present a message in the log prolog can define its own trigger, which calls standard log primitives to print the message. Split the logging system into a front-end (log.c) that provides the logging primitives and is independent of the configuration system, and a set of back-end "outputters" (log_output_console.c, log_output_file.c, log_output_android.c) that may depend on the configuration system and are decoupled from the front-end using the 'logoutput' link section. These log outputters are explicitly linked into executables by the Makefile rules, but could also be linked in using USE_FEATURE(). The USE_FEATURE() calls have _not_ been added to servald_features.c, so that different daemon executables can be built with the same feature set but different log outputs.
56 lines
2.1 KiB
C
56 lines
2.1 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.
|
|
*/
|
|
|
|
#ifndef __SERVAL_DNA__COMMANDLINE_H
|
|
#define __SERVAL_DNA__COMMANDLINE_H
|
|
|
|
#include <stdio.h> // for FILE
|
|
#include "lang.h" // for _APPEND() macro
|
|
#include "section.h"
|
|
#include "trigger.h"
|
|
#include "cli.h"
|
|
|
|
#define KEYRING_PIN_OPTION ,"[--keyring-pin=<pin>]"
|
|
#define KEYRING_ENTRY_PIN_OPTION ,"[--entry-pin=<pin>]"
|
|
#define KEYRING_PIN_OPTIONS KEYRING_PIN_OPTION KEYRING_ENTRY_PIN_OPTION "..."
|
|
|
|
#define DEFINE_CMD(FUNC, FLAGS, HELP, WORD1, ...) \
|
|
static int FUNC(const struct cli_parsed *parsed, struct cli_context *context); \
|
|
static struct cli_schema _APPEND(FUNC, __LINE__) IN_SECTION(commands) = {\
|
|
.function = FUNC, \
|
|
.words = {WORD1, ##__VA_ARGS__, NULL}, \
|
|
.flags = FLAGS, \
|
|
.description = HELP \
|
|
}
|
|
|
|
DECLARE_SECTION(struct cli_schema, commands);
|
|
|
|
#define CMD_COUNT (SECTION_START(commands) - SECTION_END(commands))
|
|
|
|
int commandline_main(struct cli_context *context, const char *argv0, int argc, const char *const *args);
|
|
int commandline_main_stdio(FILE *output, const char *argv0, int argc, const char *const *args);
|
|
|
|
// Trigger that is called after every command has finished. Different
|
|
// sub-systems (eg, keyring, Rhizome) use this to reset their global state
|
|
// ready for the next command.
|
|
DECLARE_TRIGGER(cmd_cleanup, struct cli_context *context);
|
|
|
|
#endif // __SERVAL_DNA__COMMANDLINE_H
|