/*
tincctl.c -- Controlling a running tincd
- Copyright (C) 2007-2012 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
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
#include "control_common.h"
#include "ecdsagen.h"
#include "info.h"
+#include "names.h"
#include "rsagen.h"
#include "utils.h"
#include "tincctl.h"
#define mkdir(a, b) mkdir(a)
#endif
-
-/* The name this program was run with. */
-static char *program_name = NULL;
-
static char **orig_argv;
static int orig_argc;
static bool show_version = false;
static char *name = NULL;
-static char *identname = NULL; /* program name for syslog */
-static char *pidfilename = NULL; /* pid file location */
-static char *confdir = NULL;
static char controlcookie[1025];
-char *netname = NULL;
-char *confbase = NULL;
static char *tinc_conf = NULL;
static char *hosts_dir = NULL;
struct timeval now;
}
static void usage(bool status) {
- if(status)
- fprintf(stderr, "Try `%s --help\' for more information.\n",
- program_name);
- else {
+ if(status) {
+ fprintf(stderr, "Try `%s --help\' for more information.\n", program_name);
+ } else {
printf("Usage: %s [options] command\n\n", program_name);
printf("Valid options are:\n"
" -c, --config=DIR Read configuration options from DIR.\n"
" export Export host configuration of local node to standard output\n"
" export-all Export all host configuration files to standard output\n"
" import [--force] Import host configuration file(s) from standard input\n"
+ " exchange [--force] Same as export followed by import\n"
+ " exchange-all [--force] Same as export-all followed by import\n"
"\n");
printf("Report bugs to tinc@tinc-vpn.org.\n");
}
return true;
}
-/*
- Set all files and paths according to netname
-*/
-static void make_names(void) {
-#ifdef HAVE_MINGW
- HKEY key;
- char installdir[1024] = "";
- long len = sizeof installdir;
-#endif
-
- if(netname)
- xasprintf(&identname, "tinc.%s", netname);
- else
- identname = xstrdup("tinc");
-
-#ifdef HAVE_MINGW
- if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
- if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
- if(!confbase) {
- if(netname)
- xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
- else
- xasprintf(&confbase, "%s", installdir);
- }
- }
- if(!pidfilename)
- xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
- RegCloseKey(key);
- }
-
- if(!*installdir) {
-#endif
- confdir = xstrdup(CONFDIR);
-
- if(!pidfilename)
- xasprintf(&pidfilename, "%s" SLASH "run" SLASH "%s.pid", LOCALSTATEDIR, identname);
-
- if(netname) {
- if(!confbase)
- xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
- else
- fprintf(stderr, "Both netname and configuration directory given, using the latter...\n");
- } else {
- if(!confbase)
- xasprintf(&confbase, CONFDIR SLASH "tinc");
- }
-
-#ifdef HAVE_MINGW
- } else
- confdir = xstrdup(installdir);
-#endif
-
- xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
- xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
-}
-
static char buffer[4096];
static size_t blen = 0;
}
#endif
+#ifndef HAVE_MINGW
+ struct sockaddr_un sa;
+ sa.sun_family = AF_UNIX;
+ strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path);
+
+ fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if(fd < 0) {
+ if(verbose)
+ fprintf(stderr, "Cannot create UNIX socket: %s\n", sockstrerror(sockerrno));
+ return false;
+ }
+
+ if(connect(fd, (struct sockaddr *)&sa, sizeof sa) < 0) {
+ if(verbose)
+ fprintf(stderr, "Cannot connect to UNIX socket %s: %s\n", unixsocketname, sockstrerror(sockerrno));
+ close(fd);
+ fd = -1;
+ return false;
+ }
+#else
struct addrinfo hints = {
.ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM,
}
freeaddrinfo(res);
+#endif
char data[4096];
int version;
if(!name)
return 1;
- return export(name, stdout);
+ int result = export(name, stdout);
+ if(!tty)
+ fclose(stdout);
+ return result;
}
static int cmd_export_all(int argc, char *argv[]) {
}
closedir(dir);
+ if(!tty)
+ fclose(stdout);
return result;
}
char buf[4096];
char name[4096];
- char *filename;
+ char *filename = NULL;
int count = 0;
bool firstline = true;
}
}
+static int cmd_exchange(int argc, char *argv[]) {
+ return cmd_export(argc, argv) ?: cmd_import(argc, argv);
+}
+
+static int cmd_exchange_all(int argc, char *argv[]) {
+ return cmd_export_all(argc, argv) ?: cmd_import(argc, argv);
+}
+
static const struct {
const char *command;
int (*function)(int argc, char *argv[]);
{"export", cmd_export},
{"export-all", cmd_export_all},
{"import", cmd_import},
+ {"exchange", cmd_exchange},
+ {"exchange-all", cmd_exchange_all},
{NULL, NULL},
};
return 1;
make_names();
+ xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+ xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
if(show_version) {
version();