j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

New '-o' option to configure server or hosts from command line

Browse source 
Options given on the command line have precedence over configuration from files.

This can be useful, for example, for a roaming node, for which 'ConnectTo' and
<host>.Address depends on its location.
This commit is contained in:
Julien Muchembled 2010-09-03 13:34:22 +02:00 • committed by Guus Sliepen
parent 4b6a9f1c1f
commit 8c3105283a
4 changed files with 92 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tincd.c
View file

@ -136,6 +136,7 @@ static void usage(bool status) {
" -L, --mlock Lock tinc into main memory.\n"
" --logfile[=FILENAME] Write log entries to a logfile.\n"
" --pidfile=FILENAME Write PID to FILENAME.\n"
" -o [HOST.]KEY=VALUE Set global/host configuration value.\n"
" -R, --chroot chroot to NET dir at startup.\n"
" -U, --user=USER setuid to given USER at startup.\n"
" --help Display this help and exit.\n"
@ -145,10 +146,14 @@ static void usage(bool status) {
}
static bool parse_options(int argc, char **argv) {
config_t *cfg;
int r;
int option_index = 0;
int lineno = 0;
while((r = getopt_long(argc, argv, "c:DLd::k::n:K::RU:", long_options, &option_index)) != EOF) {
cmdline_conf = list_alloc((list_action_t)free_config);
while((r = getopt_long(argc, argv, "c:DLd::k::n:o:K::RU:", long_options, &option_index)) != EOF) {
switch (r) {
case 0: /* long option */
break;
@ -217,6 +222,13 @@ static bool parse_options(int argc, char **argv) {
netname = xstrdup(optarg);
break;
case 'o': /* option */
cfg = parse_config_line(optarg, NULL, ++lineno);
if (!cfg)
return false;
list_insert_tail(cmdline_conf, cfg);
break;
case 'K': /* generate public/private keypair */
if(optarg) {
generate_keys = atoi(optarg);