/*
tincctl.c -- Controlling a running tincd
- Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-2018 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 "crypto.h"
#include "ecdsagen.h"
+#include "fsck.h"
#include "info.h"
#include "invitation.h"
#include "names.h"
#include "utils.h"
#include "tincctl.h"
#include "top.h"
+#include "version.h"
-#ifdef HAVE_MINGW
-#define SCRIPTEXTENSION ".bat"
-#else
-#define SCRIPTEXTENSION ""
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
#endif
static char **orig_argv;
static int code;
static int req;
static int result;
-static bool force = false;
+bool force = false;
bool tty = true;
bool confbasegiven = false;
bool netnamegiven = false;
-
-#ifdef HAVE_MINGW
-static struct WSAData wsa_state;
-#endif
+char *scriptinterpreter = NULL;
+char *scriptextension = "";
+static char *prompt;
+char *device = NULL;
+char *iface = NULL;
+int debug_level = -1;
static struct option const long_options[] = {
+ {"batch", no_argument, NULL, 'b'},
{"config", required_argument, NULL, 'c'},
{"net", required_argument, NULL, 'n'},
{"help", no_argument, NULL, 1},
static void version(void) {
printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
- VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
- printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
- "See the AUTHORS file for a complete list.\n\n"
- "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
- "and you are welcome to redistribute it under certain conditions;\n"
- "see the file COPYING for details.\n");
+ BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+ printf("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n"
+ "See the AUTHORS file for a complete list.\n\n"
+ "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
+ "and you are welcome to redistribute it under certain conditions;\n"
+ "see the file COPYING for details.\n");
}
static void usage(bool status) {
} else {
printf("Usage: %s [options] command\n\n", program_name);
printf("Valid options are:\n"
- " -c, --config=DIR Read configuration options from DIR.\n"
- " -n, --net=NETNAME Connect to net NETNAME.\n"
- " --pidfile=FILENAME Read control cookie from FILENAME.\n"
- " --help Display this help and exit.\n"
- " --version Output version information and exit.\n"
- "\n"
- "Valid commands are:\n"
- " init [name] Create initial configuration files.\n"
- " get VARIABLE Print current value of VARIABLE\n"
- " set VARIABLE VALUE Set VARIABLE to VALUE\n"
- " add VARIABLE VALUE Add VARIABLE with the given VALUE\n"
- " del VARIABLE [VALUE] Remove VARIABLE [only ones with watching VALUE]\n"
- " start [tincd options] Start tincd.\n"
- " stop Stop tincd.\n"
- " restart [tincd options] Restart tincd.\n"
- " reload Partially reload configuration of running tincd.\n"
- " pid Show PID of currently running tincd.\n"
- " generate-keys [bits] Generate new RSA and ECDSA public/private keypairs.\n"
- " generate-rsa-keys [bits] Generate a new RSA public/private keypair.\n"
- " generate-ecdsa-keys Generate a new ECDSA public/private keypair.\n"
- " dump Dump a list of one of the following things:\n"
- " [reachable] nodes - all known nodes in the VPN\n"
- " edges - all known connections in the VPN\n"
- " subnets - all known subnets in the VPN\n"
- " connections - all meta connections with ourself\n"
- " [di]graph - graph of the VPN in dotty format\n"
- " info NODE|SUBNET|ADDRESS Give information about a particular NODE, SUBNET or ADDRESS.\n"
- " purge Purge unreachable nodes\n"
- " debug N Set debug level\n"
- " retry Retry all outgoing connections\n"
- " disconnect NODE Close meta connection with NODE\n"
+ " -b, --batch Don't ask for anything (non-interactive mode).\n"
+ " -c, --config=DIR Read configuration options from DIR.\n"
+ " -n, --net=NETNAME Connect to net NETNAME.\n"
+ " --pidfile=FILENAME Read control cookie from FILENAME.\n"
+ " --force Force some commands to work despite warnings.\n"
+ " --help Display this help and exit.\n"
+ " --version Output version information and exit.\n"
+ "\n"
+ "Valid commands are:\n"
+ " init [name] Create initial configuration files.\n"
+ " get VARIABLE Print current value of VARIABLE\n"
+ " set VARIABLE VALUE Set VARIABLE to VALUE\n"
+ " add VARIABLE VALUE Add VARIABLE with the given VALUE\n"
+ " del VARIABLE [VALUE] Remove VARIABLE [only ones with watching VALUE]\n"
+ " start [tincd options] Start tincd.\n"
+ " stop Stop tincd.\n"
+ " restart [tincd options] Restart tincd.\n"
+ " reload Partially reload configuration of running tincd.\n"
+ " pid Show PID of currently running tincd.\n"
+#ifdef DISABLE_LEGACY
+ " generate-keys Generate a new Ed25519 public/private keypair.\n"
+#else
+ " generate-keys [bits] Generate new RSA and Ed25519 public/private keypairs.\n"
+ " generate-rsa-keys [bits] Generate a new RSA public/private keypair.\n"
+#endif
+ " generate-ed25519-keys Generate a new Ed25519 public/private keypair.\n"
+ " dump Dump a list of one of the following things:\n"
+ " [reachable] nodes - all known nodes in the VPN\n"
+ " edges - all known connections in the VPN\n"
+ " subnets - all known subnets in the VPN\n"
+ " connections - all meta connections with ourself\n"
+ " [di]graph - graph of the VPN in dotty format\n"
+ " invitations - outstanding invitations\n"
+ " info NODE|SUBNET|ADDRESS Give information about a particular NODE, SUBNET or ADDRESS.\n"
+ " purge Purge unreachable nodes\n"
+ " debug N Set debug level\n"
+ " retry Retry all outgoing connections\n"
+ " disconnect NODE Close meta connection with NODE\n"
#ifdef HAVE_CURSES
- " top Show real-time statistics\n"
+ " top Show real-time statistics\n"
#endif
- " pcap [snaplen] Dump traffic in pcap format [up to snaplen bytes per packet]\n"
- " log [level] Dump log output [up to the specified level]\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"
- " invite NODE [...] Generate an invitation for NODE\n"
- " join INVITATION Join a VPN using an INVITIATION\n"
- "\n");
+ " pcap [snaplen] Dump traffic in pcap format [up to snaplen bytes per packet]\n"
+ " log [level] Dump log output [up to the specified level]\n"
+ " export Export host configuration of local node to standard output\n"
+ " export-all Export all host configuration files to standard output\n"
+ " import Import host configuration file(s) from standard input\n"
+ " exchange Same as export followed by import\n"
+ " exchange-all Same as export-all followed by import\n"
+ " invite NODE [...] Generate an invitation for NODE\n"
+ " join INVITATION Join a VPN using an INVITATION\n"
+ " network [NETNAME] List all known networks, or switch to the one named NETNAME.\n"
+ " fsck Check the configuration files for problems.\n"
+ " sign [FILE] Generate a signed version of a file.\n"
+ " verify NODE [FILE] Verify that a file was signed by the given NODE.\n"
+ "\n");
printf("Report bugs to tinc@tinc-vpn.org.\n");
}
}
int r;
int option_index = 0;
- while((r = getopt_long(argc, argv, "+c:n:", long_options, &option_index)) != EOF) {
- switch (r) {
- case 0: /* long option */
- break;
+ while((r = getopt_long(argc, argv, "+bc:n:", long_options, &option_index)) != EOF) {
+ switch(r) {
+ case 0: /* long option */
+ break;
- case 'c': /* config file */
- confbase = xstrdup(optarg);
- confbasegiven = true;
- break;
+ case 'b':
+ tty = false;
+ break;
- case 'n': /* net name given */
- netname = xstrdup(optarg);
- break;
+ case 'c': /* config file */
+ confbase = xstrdup(optarg);
+ confbasegiven = true;
+ break;
- case 1: /* show help */
- show_help = true;
- break;
+ case 'n': /* net name given */
+ netname = xstrdup(optarg);
+ break;
- case 2: /* show version */
- show_version = true;
- break;
+ case 1: /* show help */
+ show_help = true;
+ break;
- case 3: /* open control socket here */
- pidfilename = xstrdup(optarg);
- break;
+ case 2: /* show version */
+ show_version = true;
+ break;
- case 4: /* force */
- force = true;
- break;
+ case 3: /* open control socket here */
+ pidfilename = xstrdup(optarg);
+ break;
- case '?': /* wrong options */
- usage(true);
- return false;
+ case 4: /* force */
+ force = true;
+ break;
- default:
- break;
+ case '?': /* wrong options */
+ usage(true);
+ return false;
+
+ default:
+ break;
}
}
- if(!netname && (netname = getenv("NETNAME")))
+ if(!netname && (netname = getenv("NETNAME"))) {
netname = xstrdup(netname);
+ }
/* netname "." is special: a "top-level name" */
return true;
}
+/* Open a file with the desired permissions, minus the umask.
+ Also, if we want to create an executable file, we call fchmod()
+ to set the executable bits. */
+
+FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
+ mode_t mask = umask(0);
+ perms &= ~mask;
+ umask(~perms);
+ FILE *f = fopen(filename, mode);
+
+ if(!f) {
+ fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ return NULL;
+ }
+
+#ifdef HAVE_FCHMOD
+
+ if((perms & 0444) && f) {
+ fchmod(fileno(f), perms);
+ }
+
+#endif
+ umask(mask);
+ return f;
+}
+
static void disable_old_keys(const char *filename, const char *what) {
char tmpfile[PATH_MAX] = "";
char buf[1024];
FILE *r, *w;
r = fopen(filename, "r");
- if(!r)
- return;
- snprintf(tmpfile, sizeof tmpfile, "%s.tmp", filename);
-
- w = fopen(tmpfile, "w");
+ if(!r) {
+ return;
+ }
-#ifdef HAVE_FCHMOD
- /* Let the temporary file have the same permissions as the original. */
+ snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
- if(w) {
- struct stat st = {.st_mode = 0600};
- fstat(fileno(r), &st);
- fchmod(fileno(w), st.st_mode);
- }
-#endif
+ struct stat st = {.st_mode = 0600};
+ fstat(fileno(r), &st);
+ w = fopenmask(tmpfile, "w", st.st_mode);
- while(fgets(buf, sizeof buf, r)) {
+ while(fgets(buf, sizeof(buf), r)) {
if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
- if((strstr(buf, " EC ") && strstr(what, "ECDSA")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
+ if((strstr(buf, " ED25519 ") && strstr(what, "Ed25519")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
disabled = true;
block = true;
}
}
- bool ecdsapubkey = !strncasecmp(buf, "ECDSAPublicKey", 14) && strchr(" \t=", buf[14]) && strstr(what, "ECDSA");
+ bool ed25519pubkey = !strncasecmp(buf, "Ed25519PublicKey", 16) && strchr(" \t=", buf[16]) && strstr(what, "Ed25519");
- if(ecdsapubkey)
+ if(ed25519pubkey) {
disabled = true;
+ }
if(w) {
- if(block || ecdsapubkey)
+ if(block || ed25519pubkey) {
fputc('#', w);
+ }
+
if(fputs(buf, w) < 0) {
error = true;
break;
}
}
- if(block && !strncmp(buf, "-----END ", 9))
+ if(block && !strncmp(buf, "-----END ", 9)) {
block = false;
+ }
}
if(w)
- if(fclose(w) < 0)
+ if(fclose(w) < 0) {
error = true;
- if(ferror(r) || fclose(r) < 0)
+ }
+
+ if(ferror(r) || fclose(r) < 0) {
error = true;
+ }
if(disabled) {
if(!w || error) {
fprintf(stderr, "Warning: old key(s) found, remove them by hand!\n");
- if(w)
+
+ if(w) {
unlink(tmpfile);
+ }
+
return;
}
#ifdef HAVE_MINGW
// We cannot atomically replace files on Windows.
char bakfile[PATH_MAX] = "";
- snprintf(bakfile, sizeof bakfile, "%s.bak", filename);
+ snprintf(bakfile, sizeof(bakfile), "%s.bak", filename);
+
if(rename(filename, bakfile) || rename(tmpfile, filename)) {
rename(bakfile, filename);
#else
+
if(rename(tmpfile, filename)) {
#endif
fprintf(stderr, "Warning: old key(s) found, remove them by hand!\n");
unlink(tmpfile);
}
-static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask) {
+static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask, mode_t perms) {
FILE *r;
- char *directory;
+ char directory[PATH_MAX] = ".";
char buf[PATH_MAX];
char buf2[PATH_MAX];
/* Check stdin and stdout */
if(ask && tty) {
/* Ask for a file and/or directory name. */
- fprintf(stdout, "Please enter a file to save %s to [%s]: ", what, filename);
- fflush(stdout);
+ fprintf(stderr, "Please enter a file to save %s to [%s]: ", what, filename);
- if(fgets(buf, sizeof buf, stdin) == NULL) {
+ if(fgets(buf, sizeof(buf), stdin) == NULL) {
fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
return NULL;
}
size_t len = strlen(buf);
- if(len)
+
+ if(len) {
buf[--len] = 0;
+ }
- if(len)
+ if(len) {
filename = buf;
+ }
}
#ifdef HAVE_MINGW
+
if(filename[0] != '\\' && filename[0] != '/' && !strchr(filename, ':')) {
#else
+
if(filename[0] != '/') {
#endif
/* The directory is a relative path or a filename. */
- directory = get_current_dir_name();
- snprintf(buf2, sizeof buf2, "%s" SLASH "%s", directory, filename);
+ getcwd(directory, sizeof(directory));
+ snprintf(buf2, sizeof(buf2), "%s" SLASH "%s", directory, filename);
filename = buf2;
}
/* Open it first to keep the inode busy */
- r = fopen(filename, mode);
+ r = fopenmask(filename, mode, perms);
if(!r) {
fprintf(stderr, "Error opening file `%s': %s\n", filename, strerror(errno));
}
/*
- Generate a public/private ECDSA keypair, and ask for a file to store
+ Generate a public/private Ed25519 keypair, and ask for a file to store
them in.
*/
-static bool ecdsa_keygen(bool ask) {
+static bool ed25519_keygen(bool ask) {
ecdsa_t *key;
FILE *f;
- char *pubname, *privname;
+ char fname[PATH_MAX];
- fprintf(stderr, "Generating ECDSA keypair:\n");
+ fprintf(stderr, "Generating Ed25519 keypair:\n");
if(!(key = ecdsa_generate())) {
fprintf(stderr, "Error during key generation!\n");
return false;
- } else
+ } else {
fprintf(stderr, "Done.\n");
+ }
- xasprintf(&privname, "%s" SLASH "ecdsa_key.priv", confbase);
- f = ask_and_open(privname, "private ECDSA key", "a", ask);
- free(privname);
-
- if(!f)
- return false;
+ snprintf(fname, sizeof(fname), "%s" SLASH "ed25519_key.priv", confbase);
+ f = ask_and_open(fname, "private Ed25519 key", "a", ask, 0600);
-#ifdef HAVE_FCHMOD
- /* Make it unreadable for others. */
- fchmod(fileno(f), 0600);
-#endif
+ if(!f) {
+ goto error;
+ }
if(!ecdsa_write_pem_private_key(key, f)) {
fprintf(stderr, "Error writing private key!\n");
- ecdsa_free(key);
- fclose(f);
- return false;
+ goto error;
}
fclose(f);
- if(name)
- xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
- else
- xasprintf(&pubname, "%s" SLASH "ecdsa_key.pub", confbase);
+ if(name) {
+ snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ } else {
+ snprintf(fname, sizeof(fname), "%s" SLASH "ed25519_key.pub", confbase);
+ }
- f = ask_and_open(pubname, "public ECDSA key", "a", ask);
- free(pubname);
+ f = ask_and_open(fname, "public Ed25519 key", "a", ask, 0666);
- if(!f)
+ if(!f) {
return false;
+ }
char *pubkey = ecdsa_get_base64_public_key(key);
- fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
+ fprintf(f, "Ed25519PublicKey = %s\n", pubkey);
free(pubkey);
fclose(f);
ecdsa_free(key);
return true;
+
+error:
+
+ if(f) {
+ fclose(f);
+ }
+
+ ecdsa_free(key);
+ return false;
}
+#ifndef DISABLE_LEGACY
/*
Generate a public/private RSA keypair, and ask for a file to store
them in.
static bool rsa_keygen(int bits, bool ask) {
rsa_t *key;
FILE *f;
- char *pubname, *privname;
+ char fname[PATH_MAX];
+
+ // Make sure the key size is a multiple of 8 bits.
+ bits &= ~0x7;
+
+ // Make sure that a valid key size is used.
+ if(bits < 1024 || bits > 8192) {
+ fprintf(stderr, "Invalid key size %d specified! It should be between 1024 and 8192 bits.\n", bits);
+ return false;
+ } else if(bits < 2048) {
+ fprintf(stderr, "WARNING: generating a weak %d bits RSA key! 2048 or more bits are recommended.\n", bits);
+ }
fprintf(stderr, "Generating %d bits keys:\n", bits);
if(!(key = rsa_generate(bits, 0x10001))) {
fprintf(stderr, "Error during key generation!\n");
return false;
- } else
+ } else {
fprintf(stderr, "Done.\n");
+ }
- xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
- f = ask_and_open(privname, "private RSA key", "a", ask);
- free(privname);
-
- if(!f)
- return false;
+ snprintf(fname, sizeof(fname), "%s" SLASH "rsa_key.priv", confbase);
+ f = ask_and_open(fname, "private RSA key", "a", ask, 0600);
-#ifdef HAVE_FCHMOD
- /* Make it unreadable for others. */
- fchmod(fileno(f), 0600);
-#endif
+ if(!f) {
+ goto error;
+ }
if(!rsa_write_pem_private_key(key, f)) {
fprintf(stderr, "Error writing private key!\n");
- fclose(f);
- rsa_free(key);
- return false;
+ goto error;
}
fclose(f);
- if(name)
- xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
- else
- xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
+ if(name) {
+ snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ } else {
+ snprintf(fname, sizeof(fname), "%s" SLASH "rsa_key.pub", confbase);
+ }
- f = ask_and_open(pubname, "public RSA key", "a", ask);
- free(pubname);
+ f = ask_and_open(fname, "public RSA key", "a", ask, 0666);
- if(!f)
- return false;
+ if(!f) {
+ goto error;
+ }
if(!rsa_write_pem_public_key(key, f)) {
fprintf(stderr, "Error writing public key!\n");
- fclose(f);
- rsa_free(key);
- return false;
+ goto error;
}
fclose(f);
rsa_free(key);
return true;
+
+error:
+
+ if(f) {
+ fclose(f);
+ }
+
+ rsa_free(key);
+ return false;
}
+#endif
char buffer[4096];
size_t blen = 0;
bool recvline(int fd, char *line, size_t len) {
char *newline = NULL;
- if(!fd)
- abort();
+ if(!fd) {
+ return false;
+ }
while(!(newline = memchr(buffer, '\n', blen))) {
- int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
- if(result == -1 && errno == EINTR)
+ int result = recv(fd, buffer + blen, sizeof(buffer) - blen, 0);
+
+ if(result == -1 && sockerrno == EINTR) {
continue;
- else if(result <= 0)
+ } else if(result <= 0) {
return false;
+ }
+
blen += result;
}
- if(newline - buffer >= len)
+ if(newline - buffer >= len) {
return false;
+ }
len = newline - buffer;
}
bool recvdata(int fd, char *data, size_t len) {
- if(len == -1)
+ if(len == -1) {
len = blen;
+ }
while(blen < len) {
- int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
- if(result == -1 && errno == EINTR)
+ int result = recv(fd, buffer + blen, sizeof(buffer) - blen, 0);
+
+ if(result == -1 && sockerrno == EINTR) {
continue;
- else if(result <= 0)
+ } else if(result <= 0) {
return false;
+ }
+
blen += result;
}
va_list ap;
va_start(ap, format);
- blen = vsnprintf(buffer, sizeof buffer, format, ap);
+ blen = vsnprintf(buffer, sizeof(buffer), format, ap);
+ buffer[sizeof(buffer) - 1] = 0;
va_end(ap);
- if(blen < 1 || blen >= sizeof buffer)
+ if(blen < 1 || blen >= sizeof(buffer)) {
return false;
+ }
buffer[blen] = '\n';
blen++;
while(blen) {
- int result = send(fd, p, blen, 0);
- if(result == -1 && errno == EINTR)
+ int result = send(fd, p, blen, MSG_NOSIGNAL);
+
+ if(result == -1 && sockerrno == EINTR) {
continue;
- else if(result <= 0)
+ } else if(result <= 0) {
return false;
+ }
+
p += result;
blen -= result;
}
0xa1b2c3d4,
2, 4,
0, 0,
- snaplen ?: sizeof data,
+ snaplen ? : sizeof(data),
1,
};
struct timeval tv;
- fwrite(&header, sizeof header, 1, out);
+ fwrite(&header, sizeof(header), 1, out);
fflush(out);
char line[32];
- while(recvline(fd, line, sizeof line)) {
+
+ while(recvline(fd, line, sizeof(line))) {
int code, req, len;
int n = sscanf(line, "%d %d %d", &code, &req, &len);
gettimeofday(&tv, NULL);
- if(n != 3 || code != CONTROL || req != REQ_PCAP || len < 0 || len > sizeof data)
+
+ if(n != 3 || code != CONTROL || req != REQ_PCAP || len < 0 || len > sizeof(data)) {
break;
- if(!recvdata(fd, data, len))
+ }
+
+ if(!recvdata(fd, data, len)) {
break;
+ }
+
packet.tv_sec = tv.tv_sec;
packet.tv_usec = tv.tv_usec;
packet.len = len;
packet.origlen = len;
- fwrite(&packet, sizeof packet, 1, out);
+ fwrite(&packet, sizeof(packet), 1, out);
fwrite(data, len, 1, out);
fflush(out);
}
char data[1024];
char line[32];
- while(recvline(fd, line, sizeof line)) {
+ while(recvline(fd, line, sizeof(line))) {
int code, req, len;
int n = sscanf(line, "%d %d %d", &code, &req, &len);
- if(n != 3 || code != CONTROL || req != REQ_LOG || len < 0 || len > sizeof data)
+
+ if(n != 3 || code != CONTROL || req != REQ_LOG || len < 0 || len > sizeof(data)) {
break;
- if(!recvdata(fd, data, len))
+ }
+
+ if(!recvdata(fd, data, len)) {
break;
+ }
+
fwrite(data, len, 1, out);
fputc('\n', out);
fflush(out);
SC_HANDLE manager = NULL;
SC_HANDLE service = NULL;
SERVICE_STATUS status = {0};
+ bool success = false;
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+
if(!manager) {
fprintf(stderr, "Could not open service manager: %s\n", winerror(GetLastError()));
- return false;
+ goto exit;
}
service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
if(!service) {
fprintf(stderr, "Could not open %s service: %s\n", identname, winerror(GetLastError()));
- return false;
+ goto exit;
}
- if(!ControlService(service, SERVICE_CONTROL_STOP, &status))
+ if(!ControlService(service, SERVICE_CONTROL_STOP, &status)) {
fprintf(stderr, "Could not stop %s service: %s\n", identname, winerror(GetLastError()));
- else
+ } else {
fprintf(stderr, "%s service stopped\n", identname);
+ }
if(!DeleteService(service)) {
fprintf(stderr, "Could not remove %s service: %s\n", identname, winerror(GetLastError()));
- return false;
+ goto exit;
}
- fprintf(stderr, "%s service removed\n", identname);
+ success = true;
- return true;
+exit:
+
+ if(service) {
+ CloseServiceHandle(service);
+ }
+
+ if(manager) {
+ CloseServiceHandle(manager);
+ }
+
+ if(success) {
+ fprintf(stderr, "%s service removed\n", identname);
+ }
+
+ return success;
}
#endif
FD_ZERO(&r);
FD_SET(fd, &r);
struct timeval tv = {0, 0};
+
if(select(fd + 1, &r, NULL, NULL, &tv)) {
fprintf(stderr, "Previous connection to tincd lost, reconnecting.\n");
close(fd);
}
FILE *f = fopen(pidfilename, "r");
+
if(!f) {
- if(verbose)
+ if(verbose) {
fprintf(stderr, "Could not open pid file %s: %s\n", pidfilename, strerror(errno));
+ }
+
return false;
}
char port[129];
if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) {
- if(verbose)
+ if(verbose) {
fprintf(stderr, "Could not parse pid file %s\n", pidfilename);
+ }
+
fclose(f);
return false;
}
fclose(f);
-#ifdef HAVE_MINGW
- if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
- if(verbose)
- fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+#ifndef HAVE_MINGW
+
+ if((pid == 0) || (kill(pid, 0) && (errno == ESRCH))) {
+ fprintf(stderr, "Could not find tincd running at pid %d\n", pid);
+ /* clean up the stale socket and pid file */
+ unlink(pidfilename);
+ unlink(unixsocketname);
return false;
}
-#endif
-#ifndef HAVE_MINGW
struct sockaddr_un sa;
+
sa.sun_family = AF_UNIX;
- strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path);
+
+ strncpy(sa.sun_path, unixsocketname, sizeof(sa.sun_path));
fd = socket(AF_UNIX, SOCK_STREAM, 0);
+
if(fd < 0) {
- if(verbose)
+ 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)
+ 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,
struct addrinfo *res = NULL;
if(getaddrinfo(host, port, &hints, &res) || !res) {
- if(verbose)
- fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, strerror(errno));
+ if(verbose) {
+ fprintf(stderr, "Cannot resolve %s port %s: %s\n", host, port, sockstrerror(sockerrno));
+ }
+
return false;
}
fd = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP);
+
if(fd < 0) {
- if(verbose)
+ if(verbose) {
fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno));
+ }
+
return false;
}
unsigned long arg = 0;
if(ioctlsocket(fd, FIONBIO, &arg) != 0) {
- if(verbose)
- fprintf(stderr, "ioctlsocket failed: %s", sockstrerror(sockerrno));
+ if(verbose) {
+ fprintf(stderr, "System call `%s' failed: %s\n", "ioctlsocket", sockstrerror(sockerrno));
+ }
}
+
#endif
if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
- if(verbose)
+ if(verbose) {
fprintf(stderr, "Cannot connect to %s port %s: %s\n", host, port, sockstrerror(sockerrno));
+ }
+
close(fd);
fd = -1;
return false;
freeaddrinfo(res);
#endif
+#ifdef SO_NOSIGPIPE
+ static const int one = 1;
+ setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&one, sizeof(one));
+#endif
+
char data[4096];
int version;
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %s %d", &code, data, &version) != 3 || code != 0) {
- if(verbose)
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %4095s %d", &code, data, &version) != 3 || code != 0) {
+ if(verbose) {
fprintf(stderr, "Cannot read greeting from control socket: %s\n", sockstrerror(sockerrno));
+ }
+
close(fd);
fd = -1;
return false;
sendline(fd, "%d ^%s %d", ID, controlcookie, TINC_CTL_VERSION_CURRENT);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) {
- if(verbose)
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) {
+ if(verbose) {
fprintf(stderr, "Could not fully establish control socket connection\n");
+ }
+
close(fd);
fd = -1;
return false;
static int cmd_start(int argc, char *argv[]) {
if(connect_tincd(false)) {
- if(netname)
+ if(netname) {
fprintf(stderr, "A tincd is already running for net `%s' with pid %d.\n", netname, pid);
- else
+ } else {
fprintf(stderr, "A tincd is already running with pid %d.\n", pid);
+ }
+
return 0;
}
char *slash = strrchr(program_name, '/');
#ifdef HAVE_MINGW
- if ((c = strrchr(program_name, '\\')) > slash)
+
+ if((c = strrchr(program_name, '\\')) > slash) {
slash = c;
+ }
+
#endif
- if (slash++)
+ if(slash++) {
xasprintf(&c, "%.*stincd", (int)(slash - program_name), program_name);
- else
+ } else {
c = "tincd";
+ }
int nargc = 0;
- char **nargv = xzalloc((optind + argc) * sizeof *nargv);
+ char **nargv = xzalloc((optind + argc) * sizeof(*nargv));
+
+ char *arg0 = c;
+#ifdef HAVE_MINGW
+ /*
+ Windows has no real concept of an "argv array". A command line is just one string.
+ The CRT of the new process will decode the command line string to generate argv before calling main(), and (by convention)
+ it uses quotes to handle spaces in arguments.
+ Therefore we need to quote all arguments that might contain spaces. No, execvp() won't do that for us (see MSDN).
+ If we don't do that, then execvp() will run fine but any spaces in the filename contained in arg0 will bleed
+ into the next arguments when the spawned process' CRT parses its command line, resulting in chaos.
+ */
+ xasprintf(&arg0, "\"%s\"", arg0);
+#endif
+ nargv[nargc++] = arg0;
- nargv[nargc++] = c;
- for(int i = 1; i < optind; i++)
+ for(int i = 1; i < optind; i++) {
nargv[nargc++] = orig_argv[i];
- for(int i = 1; i < argc; i++)
+ }
+
+ for(int i = 1; i < argc; i++) {
nargv[nargc++] = argv[i];
+ }
#ifdef HAVE_MINGW
- execvp(c, nargv);
- fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
- return 1;
+ int status = spawnvp(_P_WAIT, c, nargv);
+
+ if(status == -1) {
+ fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
+ return 1;
+ }
+
+ return status;
#else
+ int pfd[2] = {-1, -1};
+
+ if(socketpair(AF_UNIX, SOCK_STREAM, 0, pfd)) {
+ fprintf(stderr, "Could not create umbilical socket: %s\n", strerror(errno));
+ free(nargv);
+ return 1;
+ }
+
pid_t pid = fork();
+
if(pid == -1) {
fprintf(stderr, "Could not fork: %s\n", strerror(errno));
free(nargv);
return 1;
}
- if(!pid)
+ if(!pid) {
+ close(pfd[0]);
+ char buf[100];
+ snprintf(buf, sizeof(buf), "%d", pfd[1]);
+ setenv("TINC_UMBILICAL", buf, true);
exit(execvp(c, nargv));
+ } else {
+ close(pfd[1]);
+ }
free(nargv);
- int status = -1;
- if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+ int status = -1, result;
+#ifdef SIGINT
+ signal(SIGINT, SIG_IGN);
+#endif
+
+ // Pass all log messages from the umbilical to stderr.
+ // A nul-byte right before closure means tincd started successfully.
+ bool failure = true;
+ char buf[1024];
+ ssize_t len;
+
+ while((len = read(pfd[0], buf, sizeof(buf))) > 0) {
+ failure = buf[len - 1];
+
+ if(!failure) {
+ len--;
+ }
+
+ write(2, buf, len);
+ }
+
+ if(len) {
+ failure = true;
+ }
+
+ close(pfd[0]);
+
+ // Make sure the child process is really gone.
+ result = waitpid(pid, &status, 0);
+
+#ifdef SIGINT
+ signal(SIGINT, SIG_DFL);
+#endif
+
+ if(failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
fprintf(stderr, "Error starting %s\n", c);
return 1;
}
}
#ifndef HAVE_MINGW
+
if(!connect_tincd(true)) {
if(pid) {
if(kill(pid, SIGTERM)) {
- fprintf(stderr, "Could not send TERM signal to process with PID %u: %s\n", pid, strerror(errno));
+ fprintf(stderr, "Could not send TERM signal to process with PID %d: %s\n", pid, strerror(errno));
return 1;
}
- fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid);
+ fprintf(stderr, "Sent TERM signal to process with PID %d.\n", pid);
waitpid(pid, NULL, 0);
return 0;
}
sendline(fd, "%d %d", CONTROL, REQ_STOP);
- while(recvline(fd, line, sizeof line)) {
+ while(recvline(fd, line, sizeof(line))) {
// Wait for tincd to close the connection...
}
+
#else
- if(!remove_service())
+
+ if(!remove_service()) {
return 1;
+ }
+
#endif
close(fd);
pid = 0;
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RELOAD || result) {
+
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RELOAD || result) {
fprintf(stderr, "Could not reload configuration.\n");
return 1;
}
}
-static int cmd_dump(int argc, char *argv[]) {
- bool only_reachable = false;
+static int dump_invitations(void) {
+ char dname[PATH_MAX];
+ snprintf(dname, sizeof(dname), "%s" SLASH "invitations", confbase);
+ DIR *dir = opendir(dname);
- if(argc > 2 && !strcasecmp(argv[1], "reachable")) {
- if(strcasecmp(argv[2], "nodes")) {
- fprintf(stderr, "`reachable' only supported for nodes.\n");
- usage(true);
- return 1;
+ if(!dir) {
+ if(errno == ENOENT) {
+ fprintf(stderr, "No outstanding invitations.\n");
+ return 0;
}
- only_reachable = true;
- argv++;
- argc--;
+
+ fprintf(stderr, "Cannot not read directory %s: %s\n", dname, strerror(errno));
+ return 1;
+ }
+
+ struct dirent *ent;
+
+ bool found = false;
+
+ while((ent = readdir(dir))) {
+ char buf[MAX_STRING_SIZE];
+
+ if(b64decode(ent->d_name, buf, 24) != 18) {
+ continue;
+ }
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof(fname), "%s" SLASH "%s", dname, ent->d_name);
+ FILE *f = fopen(fname, "r");
+
+ if(!f) {
+ fprintf(stderr, "Cannot open %s: %s\n", fname, strerror(errno));
+ continue;
+ }
+
+ buf[0] = 0;
+
+ if(!fgets(buf, sizeof(buf), f)) {
+ fprintf(stderr, "Invalid invitation file %s\n", fname);
+ fclose(f);
+ continue;
+ }
+
+ fclose(f);
+
+ char *eol = buf + strlen(buf);
+
+ while(strchr("\t \r\n", *--eol)) {
+ *eol = 0;
+ }
+
+ if(strncmp(buf, "Name = ", 7) || !check_id(buf + 7)) {
+ fprintf(stderr, "Invalid invitation file %s\n", fname);
+ continue;
+ }
+
+ found = true;
+ printf("%s %s\n", ent->d_name, buf + 7);
+ }
+
+ closedir(dir);
+
+ if(!found) {
+ fprintf(stderr, "No outstanding invitations.\n");
+ }
+
+ return 0;
+}
+
+static int cmd_dump(int argc, char *argv[]) {
+ bool only_reachable = false;
+
+ if(argc > 2 && !strcasecmp(argv[1], "reachable")) {
+ if(strcasecmp(argv[2], "nodes")) {
+ fprintf(stderr, "`reachable' only supported for nodes.\n");
+ usage(true);
+ return 1;
+ }
+
+ only_reachable = true;
+ argv++;
+ argc--;
}
if(argc != 2) {
return 1;
}
- if(!connect_tincd(true))
+ if(!strcasecmp(argv[1], "invitations")) {
+ return dump_invitations();
+ }
+
+ if(!connect_tincd(true)) {
return 1;
+ }
int do_graph = 0;
- if(!strcasecmp(argv[1], "nodes"))
+ if(!strcasecmp(argv[1], "nodes")) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
- else if(!strcasecmp(argv[1], "edges"))
+ } else if(!strcasecmp(argv[1], "edges")) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
- else if(!strcasecmp(argv[1], "subnets"))
+ } else if(!strcasecmp(argv[1], "subnets")) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
- else if(!strcasecmp(argv[1], "connections"))
+ } else if(!strcasecmp(argv[1], "connections")) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
- else if(!strcasecmp(argv[1], "graph")) {
+ } else if(!strcasecmp(argv[1], "graph")) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
do_graph = 1;
return 1;
}
- if(do_graph == 1)
+ if(do_graph == 1) {
printf("graph {\n");
- else if(do_graph == 2)
+ } else if(do_graph == 2) {
printf("digraph {\n");
+ }
- while(recvline(fd, line, sizeof line)) {
+ while(recvline(fd, line, sizeof(line))) {
char node1[4096], node2[4096];
- int n = sscanf(line, "%d %d %s %s", &code, &req, node1, node2);
+ int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, node1, node2);
+
if(n == 2) {
- if(do_graph && req == REQ_DUMP_NODES)
+ if(do_graph && req == REQ_DUMP_NODES) {
continue;
- else {
- if(do_graph)
+ } else {
+ if(do_graph) {
printf("}\n");
+ }
+
return 0;
}
}
- if(n < 2)
+
+ if(n < 2) {
break;
+ }
char node[4096];
+ char id[4096];
char from[4096];
char to[4096];
char subnet[4096];
char host[4096];
char port[4096];
+ char local_host[4096];
+ char local_port[4096];
char via[4096];
char nexthop[4096];
int cipher, digest, maclength, compression, distance, socket, weight;
long int last_state_change;
switch(req) {
- case REQ_DUMP_NODES: {
- int n = sscanf(line, "%*d %*d %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
- if(n != 16) {
- fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
- return 1;
- }
+ case REQ_DUMP_NODES: {
+ int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %d %d %d %d %x %x %4095s %4095s %d %hd %hd %hd %ld", node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
- memcpy(&status, &status_int, sizeof status);
+ if(n != 17) {
+ fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
+ return 1;
+ }
- if(do_graph) {
- const char *color = "black";
- if(!strcmp(host, "MYSELF"))
- color = "green";
- else if(!status.reachable)
- color = "red";
- else if(strcmp(via, node))
- color = "orange";
- else if(!status.validkey)
- color = "black";
- else if(minmtu > 0)
- color = "green";
- printf(" %s [label = \"%s\", color = \"%s\"%s];\n", node, node, color, strcmp(host, "MYSELF") ? "" : ", style = \"filled\"");
- } else {
- if(only_reachable && !status.reachable)
- continue;
- printf("%s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n",
- node, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
+ memcpy(&status, &status_int, sizeof(status));
+
+ if(do_graph) {
+ const char *color = "black";
+
+ if(!strcmp(host, "MYSELF")) {
+ color = "green";
+ } else if(!status.reachable) {
+ color = "red";
+ } else if(strcmp(via, node)) {
+ color = "orange";
+ } else if(!status.validkey) {
+ color = "black";
+ } else if(minmtu > 0) {
+ color = "green";
}
- } break;
- case REQ_DUMP_EDGES: {
- int n = sscanf(line, "%*d %*d %s %s %s port %s %x %d", from, to, host, port, &options, &weight);
- if(n != 6) {
- fprintf(stderr, "Unable to parse edge dump from tincd.\n");
- return 1;
+ printf(" %s [label = \"%s\", color = \"%s\"%s];\n", node, node, color, strcmp(host, "MYSELF") ? "" : ", style = \"filled\"");
+ } else {
+ if(only_reachable && !status.reachable) {
+ continue;
}
- if(do_graph) {
- float w = 1 + 65536.0 / weight;
- if(do_graph == 1 && strcmp(node1, node2) > 0)
- printf(" %s -- %s [w = %f, weight = %f];\n", node1, node2, w, w);
- else if(do_graph == 2)
- printf(" %s -> %s [w = %f, weight = %f];\n", node1, node2, w, w);
- } else {
- printf("%s to %s at %s port %s options %x weight %d\n", from, to, host, port, options, weight);
- }
- } break;
+ printf("%s id %s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n",
+ node, id, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
+ }
+ }
+ break;
- case REQ_DUMP_SUBNETS: {
- int n = sscanf(line, "%*d %*d %s %s", subnet, node);
- if(n != 2) {
- fprintf(stderr, "Unable to parse subnet dump from tincd.\n");
- return 1;
- }
- printf("%s owner %s\n", strip_weight(subnet), node);
- } break;
+ case REQ_DUMP_EDGES: {
+ int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %4095s port %4095s %x %d", from, to, host, port, local_host, local_port, &options, &weight);
- case REQ_DUMP_CONNECTIONS: {
- int n = sscanf(line, "%*d %*d %s %s port %s %x %d %x", node, host, port, &options, &socket, &status_int);
- if(n != 6) {
- fprintf(stderr, "Unable to parse connection dump from tincd.\n");
- return 1;
+ if(n != 8) {
+ fprintf(stderr, "Unable to parse edge dump from tincd.\n");
+ return 1;
+ }
+
+ if(do_graph) {
+ float w = 1 + 65536.0 / weight;
+
+ if(do_graph == 1 && strcmp(node1, node2) > 0) {
+ printf(" %s -- %s [w = %f, weight = %f];\n", node1, node2, w, w);
+ } else if(do_graph == 2) {
+ printf(" %s -> %s [w = %f, weight = %f];\n", node1, node2, w, w);
}
- printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status_int);
- } break;
+ } else {
+ printf("%s to %s at %s port %s local %s port %s options %x weight %d\n", from, to, host, port, local_host, local_port, options, weight);
+ }
+ }
+ break;
+
+ case REQ_DUMP_SUBNETS: {
+ int n = sscanf(line, "%*d %*d %4095s %4095s", subnet, node);
+
+ if(n != 2) {
+ fprintf(stderr, "Unable to parse subnet dump from tincd.\n");
+ return 1;
+ }
+
+ printf("%s owner %s\n", strip_weight(subnet), node);
+ }
+ break;
- default:
- fprintf(stderr, "Unable to parse dump from tincd.\n");
+ case REQ_DUMP_CONNECTIONS: {
+ int n = sscanf(line, "%*d %*d %4095s %4095s port %4095s %x %d %x", node, host, port, &options, &socket, &status_int);
+
+ if(n != 6) {
+ fprintf(stderr, "Unable to parse connection dump from tincd.\n");
return 1;
+ }
+
+ printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status_int);
+ }
+ break;
+
+ default:
+ fprintf(stderr, "Unable to parse dump from tincd.\n");
+ return 1;
}
}
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
sendline(fd, "%d %d", CONTROL, REQ_PURGE);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_PURGE || result) {
+
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_PURGE || result) {
fprintf(stderr, "Could not purge old information.\n");
return 1;
}
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
int debuglevel = atoi(argv[1]);
int origlevel;
sendline(fd, "%d %d %d", CONTROL, REQ_SET_DEBUG, debuglevel);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &origlevel) != 3 || code != CONTROL || req != REQ_SET_DEBUG) {
+
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &origlevel) != 3 || code != CONTROL || req != REQ_SET_DEBUG) {
fprintf(stderr, "Could not set debug level.\n");
return 1;
}
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
sendline(fd, "%d %d", CONTROL, REQ_RETRY);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RETRY || result) {
+
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RETRY || result) {
fprintf(stderr, "Could not retry outgoing connections.\n");
return 1;
}
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
sendline(fd, "%d %d %s", CONTROL, REQ_CONNECT, argv[1]);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_CONNECT || result) {
+
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_CONNECT || result) {
fprintf(stderr, "Could not connect to %s.\n", argv[1]);
return 1;
}
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
sendline(fd, "%d %d %s", CONTROL, REQ_DISCONNECT, argv[1]);
- if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_DISCONNECT || result) {
+
+ if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_DISCONNECT || result) {
fprintf(stderr, "Could not disconnect %s.\n", argv[1]);
return 1;
}
}
#ifdef HAVE_CURSES
- if(!connect_tincd(true))
+
+ if(!connect_tincd(true)) {
return 1;
+ }
top(fd);
return 0;
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
pcap(fd, stdout, argc > 1 ? atoi(argv[1]) : 0);
return 0;
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
#ifdef SIGINT
signal(SIGINT, sigint_handler);
return 1;
}
- if(!connect_tincd(true) && !pid)
+ if(!connect_tincd(true) || !pid) {
return 1;
+ }
printf("%d\n", pid);
return 0;
int rstrip(char *value) {
int len = strlen(value);
- while(len && strchr("\t\r\n ", value[len - 1]))
+
+ while(len && strchr("\t\r\n ", value[len - 1])) {
value[--len] = 0;
+ }
+
return len;
}
char *get_my_name(bool verbose) {
FILE *f = fopen(tinc_conf, "r");
+
if(!f) {
- if(verbose)
+ if(verbose) {
fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+ }
+
return NULL;
}
char buf[4096];
char *value;
- while(fgets(buf, sizeof buf, f)) {
+
+ while(fgets(buf, sizeof(buf), f)) {
int len = strcspn(buf, "\t =");
value = buf + len;
value += strspn(value, "\t ");
+
if(*value == '=') {
value++;
value += strspn(value, "\t ");
}
- if(!rstrip(value))
+
+ if(!rstrip(value)) {
continue;
+ }
+
buf[len] = 0;
- if(strcasecmp(buf, "Name"))
+
+ if(strcasecmp(buf, "Name")) {
continue;
+ }
+
if(*value) {
fclose(f);
- return strdup(value);
+ return replace_name(value);
}
}
fclose(f);
- if(verbose)
+
+ if(verbose) {
fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+ }
+
+ return NULL;
+}
+
+ecdsa_t *get_pubkey(FILE *f) {
+ char buf[4096];
+ char *value;
+
+ while(fgets(buf, sizeof(buf), f)) {
+ int len = strcspn(buf, "\t =");
+ value = buf + len;
+ value += strspn(value, "\t ");
+
+ if(*value == '=') {
+ value++;
+ value += strspn(value, "\t ");
+ }
+
+ if(!rstrip(value)) {
+ continue;
+ }
+
+ buf[len] = 0;
+
+ if(strcasecmp(buf, "Ed25519PublicKey")) {
+ continue;
+ }
+
+ if(*value) {
+ return ecdsa_set_base64_public_key(value);
+ }
+ }
+
return NULL;
}
{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
{"BindToInterface", VAR_SERVER},
{"Broadcast", VAR_SERVER | VAR_SAFE},
+ {"BroadcastSubnet", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
{"ConnectTo", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
{"DecrementTTL", VAR_SERVER},
{"Device", VAR_SERVER},
+ {"DeviceStandby", VAR_SERVER},
{"DeviceType", VAR_SERVER},
{"DirectOnly", VAR_SERVER},
- {"ECDSAPrivateKeyFile", VAR_SERVER},
+ {"Ed25519PrivateKeyFile", VAR_SERVER},
{"ExperimentalProtocol", VAR_SERVER},
{"Forwarding", VAR_SERVER},
+ {"FWMark", VAR_SERVER},
{"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
{"Hostnames", VAR_SERVER},
{"IffOneQueue", VAR_SERVER},
{"Interface", VAR_SERVER},
+ {"InvitationExpire", VAR_SERVER},
{"KeyExpire", VAR_SERVER},
+ {"ListenAddress", VAR_SERVER | VAR_MULTIPLE},
{"LocalDiscovery", VAR_SERVER},
+ {"LogLevel", VAR_SERVER},
{"MACExpire", VAR_SERVER},
{"MaxConnectionBurst", VAR_SERVER},
{"MaxOutputBufferSize", VAR_SERVER},
{"ScriptsInterpreter", VAR_SERVER},
{"StrictSubnets", VAR_SERVER},
{"TunnelServer", VAR_SERVER},
+ {"UDPDiscovery", VAR_SERVER},
+ {"UDPDiscoveryKeepaliveInterval", VAR_SERVER},
+ {"UDPDiscoveryInterval", VAR_SERVER},
+ {"UDPDiscoveryTimeout", VAR_SERVER},
+ {"MTUInfoInterval", VAR_SERVER},
+ {"UDPInfoInterval", VAR_SERVER},
{"UDPRcvBuf", VAR_SERVER},
{"UDPSndBuf", VAR_SERVER},
+ {"UPnP", VAR_SERVER},
+ {"UPnPDiscoverWait", VAR_SERVER},
+ {"UPnPRefreshPeriod", VAR_SERVER},
{"VDEGroup", VAR_SERVER},
{"VDEPort", VAR_SERVER},
/* Host configuration */
{"ClampMSS", VAR_SERVER | VAR_HOST},
{"Compression", VAR_SERVER | VAR_HOST},
{"Digest", VAR_SERVER | VAR_HOST},
- {"ECDSAPublicKey", VAR_HOST},
- {"ECDSAPublicKeyFile", VAR_SERVER | VAR_HOST},
+ {"Ed25519PublicKey", VAR_HOST},
+ {"Ed25519PublicKeyFile", VAR_SERVER | VAR_HOST},
{"IndirectData", VAR_SERVER | VAR_HOST},
{"MACLength", VAR_SERVER | VAR_HOST},
{"PMTU", VAR_SERVER | VAR_HOST},
return 1;
}
- if(strcasecmp(argv[0], "config"))
+ if(strcasecmp(argv[0], "config")) {
argv--, argc++;
+ }
int action = -2;
+
if(!strcasecmp(argv[1], "get")) {
argv++, argc--;
} else if(!strcasecmp(argv[1], "add")) {
}
// Concatenate the rest of the command line
- strncpy(line, argv[1], sizeof line - 1);
+ strncpy(line, argv[1], sizeof(line) - 1);
+
for(int i = 2; i < argc; i++) {
- strncat(line, " ", sizeof line - 1 - strlen(line));
- strncat(line, argv[i], sizeof line - 1 - strlen(line));
+ strncat(line, " ", sizeof(line) - 1 - strlen(line));
+ strncat(line, argv[i], sizeof(line) - 1 - strlen(line));
}
// Liberal parsing into node name, variable name and value.
len = strcspn(line, "\t =");
value = line + len;
value += strspn(value, "\t ");
+
if(*value == '=') {
value++;
value += strspn(value, "\t ");
}
+
line[len] = '\0';
variable = strchr(line, '.');
+
if(variable) {
node = line;
*variable++ = 0;
return 1;
}
- if(action < -1 && *value)
+ if(action < -1 && *value) {
action = 0;
+ }
/* Some simple checks. */
bool found = false;
+ bool warnonremove = false;
for(int i = 0; variables[i].name; i++) {
- if(strcasecmp(variables[i].name, variable))
+ if(strcasecmp(variables[i].name, variable)) {
continue;
+ }
found = true;
variable = (char *)variables[i].name;
if(!node && !(variables[i].type & VAR_SERVER)) {
node = get_my_name(true);
- if(!node)
+
+ if(!node) {
return 1;
+ }
+ }
+
+ /* Change "add" into "set" for variables that do not allow multiple occurrences.
+ Turn on warnings when it seems variables might be removed unintentionally. */
+
+ if(action == 1 && !(variables[i].type & VAR_MULTIPLE)) {
+ warnonremove = true;
+ action = 0;
+ } else if(action == 0 && (variables[i].type & VAR_MULTIPLE)) {
+ warnonremove = true;
}
break;
}
// Open the right configuration file.
- char *filename;
- if(node)
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, node);
- else
- filename = tinc_conf;
+ char filename[PATH_MAX];
+
+ if(node) {
+ snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, node);
+ } else {
+ snprintf(filename, sizeof(filename), "%s", tinc_conf);
+ }
FILE *f = fopen(filename, "r");
+
if(!f) {
fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
return 1;
}
- char *tmpfile = NULL;
+ char tmpfile[PATH_MAX];
FILE *tf = NULL;
if(action >= -1) {
- xasprintf(&tmpfile, "%s.config.tmp", filename);
+ snprintf(tmpfile, sizeof(tmpfile), "%s.config.tmp", filename);
tf = fopen(tmpfile, "w");
+
if(!tf) {
fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno));
fclose(f);
bool removed = false;
found = false;
- while(fgets(buf1, sizeof buf1, f)) {
- buf1[sizeof buf1 - 1] = 0;
- strncpy(buf2, buf1, sizeof buf2);
+ while(fgets(buf1, sizeof(buf1), f)) {
+ buf1[sizeof(buf1) - 1] = 0;
+ strncpy(buf2, buf1, sizeof(buf2));
// Parse line in a simple way
char *bvalue;
len = strcspn(buf2, "\t =");
bvalue = buf2 + len;
bvalue += strspn(bvalue, "\t ");
+
if(*bvalue == '=') {
bvalue++;
bvalue += strspn(bvalue, "\t ");
}
+
rstrip(bvalue);
buf2[len] = '\0';
if(action < -1) {
found = true;
printf("%s\n", bvalue);
- // Del
+ // Del
} else if(action == -1) {
if(!*value || !strcasecmp(bvalue, value)) {
removed = true;
continue;
}
- // Set
+
+ // Set
} else if(action == 0) {
+ // Warn if "set" was used for variables that can occur multiple times
+ if(warnonremove && strcasecmp(bvalue, value)) {
+ fprintf(stderr, "Warning: removing %s = %s\n", variable, bvalue);
+ }
+
// Already set? Delete the rest...
- if(set)
+ if(set) {
continue;
+ }
+
// Otherwise, replace.
if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
return 1;
}
+
set = true;
continue;
+ // Add
+ } else if(action > 0) {
+ // Check if we've already seen this variable with the same value
+ if(!strcasecmp(bvalue, value)) {
+ found = true;
+ }
}
}
}
// Add new variable if necessary.
- if(action > 0 || (action == 0 && !set)) {
+ if((action > 0 && !found) || (action == 0 && !set)) {
if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
return 1;
}
if(action < -1) {
- if(!found)
+ if(found) {
+ return 0;
+ } else {
fprintf(stderr, "No matching configuration variables found.\n");
- return 0;
+ return 1;
+ }
}
// Make sure we wrote everything...
if(action < 0 && !removed) {
remove(tmpfile);
fprintf(stderr, "No configuration variables deleted.\n");
- return *value;
+ return 1;
}
// Replace the configuration file with the new one
#ifdef HAVE_MINGW
+
if(remove(filename)) {
fprintf(stderr, "Error replacing file %s: %s\n", filename, strerror(errno));
return 1;
}
+
#endif
+
if(rename(tmpfile, filename)) {
fprintf(stderr, "Error renaming temporary file %s to configuration file %s: %s\n", tmpfile, filename, strerror(errno));
return 1;
}
// Silently try notifying a running tincd of changes.
- if(connect_tincd(false))
+ if(connect_tincd(false)) {
sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+ }
return 0;
}
-bool check_id(const char *name) {
- if(!name || !*name)
+static bool try_bind(int port) {
+ struct addrinfo *ai = NULL, *aip;
+ struct addrinfo hint = {
+ .ai_flags = AI_PASSIVE,
+ .ai_family = AF_UNSPEC,
+ .ai_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
+ };
+
+ bool success = true;
+ char portstr[16];
+ snprintf(portstr, sizeof(portstr), "%d", port);
+
+ if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai) {
return false;
+ }
- for(int i = 0; i < strlen(name); i++) {
- if(!isalnum(name[i]) && name[i] != '_')
- return false;
+ for(aip = ai; aip; aip = aip->ai_next) {
+ int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+
+ if(!fd) {
+ success = false;
+ break;
+ }
+
+ int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
+ closesocket(fd);
+
+ if(result) {
+ success = false;
+ break;
+ }
}
- return true;
+ freeaddrinfo(ai);
+ return success;
+}
+
+int check_port(char *name) {
+ if(try_bind(655)) {
+ return 655;
+ }
+
+ fprintf(stderr, "Warning: could not bind to port 655. ");
+
+ for(int i = 0; i < 100; i++) {
+ int port = 0x1000 + (rand() & 0x7fff);
+
+ if(try_bind(port)) {
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ FILE *f = fopen(filename, "a");
+
+ if(!f) {
+ fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ fprintf(stderr, "Please change tinc's Port manually.\n");
+ return 0;
+ }
+
+ fprintf(f, "Port = %d\n", port);
+ fclose(f);
+ fprintf(stderr, "Tinc will instead listen on port %d.\n", port);
+ return port;
+ }
+ }
+
+ fprintf(stderr, "Please change tinc's Port manually.\n");
+ return 0;
}
static int cmd_init(int argc, char *argv[]) {
} else if(argc < 2) {
if(tty) {
char buf[1024];
- fprintf(stdout, "Enter the Name you want your tinc node to have: ");
- fflush(stdout);
- if(!fgets(buf, sizeof buf, stdin)) {
+ fprintf(stderr, "Enter the Name you want your tinc node to have: ");
+
+ if(!fgets(buf, sizeof(buf), stdin)) {
fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
return 1;
}
+
int len = rstrip(buf);
+
if(!len) {
fprintf(stderr, "No name given!\n");
return 1;
}
+
name = strdup(buf);
} else {
fprintf(stderr, "No Name given!\n");
}
} else {
name = strdup(argv[1]);
+
if(!*name) {
fprintf(stderr, "No Name given!\n");
return 1;
return 1;
}
- if(mkdir(confdir, 0755) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
+ if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
+ fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
return 1;
}
- if(mkdir(confbase, 0755) && errno != EEXIST) {
+ if(mkdir(confbase, 0777) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
return 1;
}
- if(mkdir(hosts_dir, 0755) && errno != EEXIST) {
+ if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
return 1;
}
FILE *f = fopen(tinc_conf, "w");
+
if(!f) {
fprintf(stderr, "Could not create file %s: %s\n", tinc_conf, strerror(errno));
return 1;
fprintf(f, "Name = %s\n", name);
fclose(f);
- if(!rsa_keygen(2048, false) || !ecdsa_keygen(false))
+#ifndef DISABLE_LEGACY
+
+ if(!rsa_keygen(2048, false)) {
+ return 1;
+ }
+
+#endif
+
+ if(!ed25519_keygen(false)) {
return 1;
+ }
+
+ check_port(name);
#ifndef HAVE_MINGW
- char *filename;
- xasprintf(&filename, "%s" SLASH "tinc-up", confbase);
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof(filename), "%s" SLASH "tinc-up", confbase);
+
if(access(filename, F_OK)) {
- FILE *f = fopen(filename, "w");
+ FILE *f = fopenmask(filename, "w", 0777);
+
if(!f) {
fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
return 1;
}
- mode_t mask = umask(0);
- umask(mask);
- fchmod(fileno(f), 0755 & ~mask);
- fprintf(f, "#!/bin/sh\n\necho 'Unconfigured tinc-up script, please edit!'\n\n#ifconfig $INTERFACE <your vpn IP address> netmask <netmask of whole VPN>\n");
+
+ fprintf(f, "#!/bin/sh\n\necho 'Unconfigured tinc-up script, please edit '$0'!'\n\n#ifconfig $INTERFACE <your vpn IP address> netmask <netmask of whole VPN>\n");
fclose(f);
}
+
#endif
return 0;
}
static int cmd_generate_keys(int argc, char *argv[]) {
+#ifdef DISABLE_LEGACY
+
+ if(argc > 1) {
+#else
+
if(argc > 2) {
+#endif
fprintf(stderr, "Too many arguments!\n");
return 1;
}
- if(!name)
+ if(!name) {
name = get_my_name(false);
+ }
+
+#ifndef DISABLE_LEGACY
- return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true) && ecdsa_keygen(true));
+ if(!rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true)) {
+ return 1;
+ }
+
+#endif
+
+ if(!ed25519_keygen(true)) {
+ return 1;
+ }
+
+ return 0;
}
+#ifndef DISABLE_LEGACY
static int cmd_generate_rsa_keys(int argc, char *argv[]) {
if(argc > 2) {
fprintf(stderr, "Too many arguments!\n");
return 1;
}
- if(!name)
+ if(!name) {
name = get_my_name(false);
+ }
return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true);
}
+#endif
-static int cmd_generate_ecdsa_keys(int argc, char *argv[]) {
+static int cmd_generate_ed25519_keys(int argc, char *argv[]) {
if(argc > 1) {
fprintf(stderr, "Too many arguments!\n");
return 1;
}
- if(!name)
+ if(!name) {
name = get_my_name(false);
+ }
- return !ecdsa_keygen(true);
+ return !ed25519_keygen(true);
}
static int cmd_help(int argc, char *argv[]) {
return 1;
}
- if(!connect_tincd(true))
+ if(!connect_tincd(true)) {
return 1;
+ }
return info(fd, argv[1]);
}
return 1;
}
- char *filename = NULL;
+ char filename[PATH_MAX] = "";
if(strncmp(argv[1], "hosts" SLASH, 6)) {
for(int i = 0; conffiles[i]; i++) {
if(!strcmp(argv[1], conffiles[i])) {
- xasprintf(&filename, "%s" SLASH "%s", confbase, argv[1]);
+ snprintf(filename, sizeof(filename), "%s" SLASH "%s", confbase, argv[1]);
break;
}
}
argv[1] += 6;
}
- if(!filename) {
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, argv[1]);
+ if(!*filename) {
+ snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, argv[1]);
char *dash = strchr(argv[1], '-');
+
if(dash) {
*dash++ = 0;
+
if((strcmp(dash, "up") && strcmp(dash, "down")) || !check_id(argv[1])) {
fprintf(stderr, "Invalid configuration filename.\n");
return 1;
char *command;
#ifndef HAVE_MINGW
- xasprintf(&command, "\"%s\" \"%s\"", getenv("VISUAL") ?: getenv("EDITOR") ?: "vi", filename);
+ xasprintf(&command, "\"%s\" \"%s\"", getenv("VISUAL") ? : getenv("EDITOR") ? : "vi", filename);
#else
xasprintf(&command, "edit \"%s\"", filename);
#endif
int result = system(command);
- if(result)
+ free(command);
+
+ if(result) {
return result;
+ }
// Silently try notifying a running tincd of changes.
- if(connect_tincd(false))
+ if(connect_tincd(false)) {
sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+ }
return 0;
}
static int export(const char *name, FILE *out) {
- char *filename;
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, name);
FILE *in = fopen(filename, "r");
+
if(!in) {
fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
return 1;
fprintf(out, "Name = %s\n", name);
char buf[4096];
- while(fgets(buf, sizeof buf, in)) {
- if(strcspn(buf, "\t =") != 4 || strncasecmp(buf, "Name", 4))
+
+ while(fgets(buf, sizeof(buf), in)) {
+ if(strcspn(buf, "\t =") != 4 || strncasecmp(buf, "Name", 4)) {
fputs(buf, out);
+ }
}
if(ferror(in)) {
}
char *name = get_my_name(true);
- if(!name)
+
+ if(!name) {
return 1;
+ }
int result = export(name, stdout);
- if(!tty)
+
+ if(!tty) {
fclose(stdout);
+ }
free(name);
return result;
}
DIR *dir = opendir(hosts_dir);
+
if(!dir) {
fprintf(stderr, "Could not open host configuration directory %s: %s\n", hosts_dir, strerror(errno));
return 1;
struct dirent *ent;
while((ent = readdir(dir))) {
- if(!check_id(ent->d_name))
+ if(!check_id(ent->d_name)) {
continue;
+ }
- if(first)
+ if(first) {
first = false;
- else
+ } else {
printf("#---------------------------------------------------------------#\n");
+ }
result |= export(ent->d_name, stdout);
}
closedir(dir);
- if(!tty)
+
+ if(!tty) {
fclose(stdout);
+ }
+
return result;
}
char buf[4096];
char name[4096];
- char *filename = NULL;
+ char filename[PATH_MAX] = "";
int count = 0;
bool firstline = true;
- while(fgets(buf, sizeof buf, in)) {
- if(sscanf(buf, "Name = %s", name) == 1) {
+ while(fgets(buf, sizeof(buf), in)) {
+ if(sscanf(buf, "Name = %4095s", name) == 1) {
firstline = false;
if(!check_id(name)) {
return 1;
}
- if(out)
+ if(out) {
fclose(out);
+ }
- free(filename);
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+ snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, name);
if(!force && !access(filename, F_OK)) {
fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
}
out = fopen(filename, "w");
+
if(!out) {
fprintf(stderr, "Error creating configuration file %s: %s\n", filename, strerror(errno));
return 1;
}
- if(!strcmp(buf, "#---------------------------------------------------------------#\n"))
+ if(!strcmp(buf, "#---------------------------------------------------------------#\n")) {
continue;
+ }
if(out) {
if(fputs(buf, out) < 0) {
}
}
- if(out)
+ if(out) {
fclose(out);
+ }
if(count) {
fprintf(stderr, "Imported %d host configuration files.\n", count);
}
static int cmd_exchange(int argc, char *argv[]) {
- return cmd_export(argc, argv) ?: cmd_import(argc, 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);
+ return cmd_export_all(argc, argv) ? : cmd_import(argc, argv);
+}
+
+static int switch_network(char *name) {
+ if(strcmp(name, ".")) {
+ if(!check_netname(name, false)) {
+ fprintf(stderr, "Invalid character in netname!\n");
+ return 1;
+ }
+
+ if(!check_netname(name, true)) {
+ fprintf(stderr, "Warning: unsafe character in netname!\n");
+ }
+ }
+
+ if(fd >= 0) {
+ close(fd);
+ fd = -1;
+ }
+
+ free_names();
+ netname = strcmp(name, ".") ? xstrdup(name) : NULL;
+ make_names(false);
+
+ free(tinc_conf);
+ free(hosts_dir);
+ free(prompt);
+
+ xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+ xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
+ xasprintf(&prompt, "%s> ", identname);
+
+ return 0;
+}
+
+static int cmd_network(int argc, char *argv[]) {
+ if(argc > 2) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ if(argc == 2) {
+ return switch_network(argv[1]);
+ }
+
+ DIR *dir = opendir(confdir);
+
+ if(!dir) {
+ fprintf(stderr, "Could not read directory %s: %s\n", confdir, strerror(errno));
+ return 1;
+ }
+
+ struct dirent *ent;
+
+ while((ent = readdir(dir))) {
+ if(*ent->d_name == '.') {
+ continue;
+ }
+
+ if(!strcmp(ent->d_name, "tinc.conf")) {
+ printf(".\n");
+ continue;
+ }
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof(fname), "%s/%s/tinc.conf", confdir, ent->d_name);
+
+ if(!access(fname, R_OK)) {
+ printf("%s\n", ent->d_name);
+ }
+ }
+
+ closedir(dir);
+
+ return 0;
+}
+
+static int cmd_fsck(int argc, char *argv[]) {
+ if(argc > 1) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ return fsck(orig_argv[0]);
+}
+
+static void *readfile(FILE *in, size_t *len) {
+ size_t count = 0;
+ size_t alloced = 4096;
+ char *buf = xmalloc(alloced);
+
+ while(!feof(in)) {
+ size_t read = fread(buf + count, 1, alloced - count, in);
+
+ if(!read) {
+ break;
+ }
+
+ count += read;
+
+ if(count >= alloced) {
+ alloced *= 2;
+ buf = xrealloc(buf, alloced);
+ }
+ }
+
+ if(len) {
+ *len = count;
+ }
+
+ return buf;
+}
+
+static int cmd_sign(int argc, char *argv[]) {
+ if(argc > 2) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ if(!name) {
+ name = get_my_name(true);
+
+ if(!name) {
+ return 1;
+ }
+ }
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof(fname), "%s" SLASH "ed25519_key.priv", confbase);
+ FILE *fp = fopen(fname, "r");
+
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno));
+ return 1;
+ }
+
+ ecdsa_t *key = ecdsa_read_pem_private_key(fp);
+
+ if(!key) {
+ fprintf(stderr, "Could not read private key from %s\n", fname);
+ fclose(fp);
+ return 1;
+ }
+
+ fclose(fp);
+
+ FILE *in;
+
+ if(argc == 2) {
+ in = fopen(argv[1], "rb");
+
+ if(!in) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[1], strerror(errno));
+ ecdsa_free(key);
+ return 1;
+ }
+ } else {
+ in = stdin;
+ }
+
+ size_t len;
+ char *data = readfile(in, &len);
+
+ if(in != stdin) {
+ fclose(in);
+ }
+
+ if(!data) {
+ fprintf(stderr, "Error reading %s: %s\n", argv[1], strerror(errno));
+ ecdsa_free(key);
+ return 1;
+ }
+
+ // Ensure we sign our name and current time as well
+ long t = time(NULL);
+ char *trailer;
+ xasprintf(&trailer, " %s %ld", name, t);
+ int trailer_len = strlen(trailer);
+
+ data = xrealloc(data, len + trailer_len);
+ memcpy(data + len, trailer, trailer_len);
+ free(trailer);
+
+ char sig[87];
+
+ if(!ecdsa_sign(key, data, len + trailer_len, sig)) {
+ fprintf(stderr, "Error generating signature\n");
+ free(data);
+ ecdsa_free(key);
+ return 1;
+ }
+
+ b64encode(sig, sig, 64);
+ ecdsa_free(key);
+
+ fprintf(stdout, "Signature = %s %ld %s\n", name, t, sig);
+ fwrite(data, len, 1, stdout);
+
+ free(data);
+ return 0;
+}
+
+static int cmd_verify(int argc, char *argv[]) {
+ if(argc < 2) {
+ fprintf(stderr, "Not enough arguments!\n");
+ return 1;
+ }
+
+ if(argc > 3) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ char *node = argv[1];
+
+ if(!strcmp(node, ".")) {
+ if(!name) {
+ name = get_my_name(true);
+
+ if(!name) {
+ return 1;
+ }
+ }
+
+ node = name;
+ } else if(!strcmp(node, "*")) {
+ node = NULL;
+ } else {
+ if(!check_id(node)) {
+ fprintf(stderr, "Invalid node name\n");
+ return 1;
+ }
+ }
+
+ FILE *in;
+
+ if(argc == 3) {
+ in = fopen(argv[2], "rb");
+
+ if(!in) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+ return 1;
+ }
+ } else {
+ in = stdin;
+ }
+
+ size_t len;
+ char *data = readfile(in, &len);
+
+ if(in != stdin) {
+ fclose(in);
+ }
+
+ if(!data) {
+ fprintf(stderr, "Error reading %s: %s\n", argv[1], strerror(errno));
+ return 1;
+ }
+
+ char *newline = memchr(data, '\n', len);
+
+ if(!newline || (newline - data > MAX_STRING_SIZE - 1)) {
+ fprintf(stderr, "Invalid input\n");
+ free(data);
+ return 1;
+ }
+
+ *newline++ = '\0';
+ size_t skip = newline - data;
+
+ char signer[MAX_STRING_SIZE] = "";
+ char sig[MAX_STRING_SIZE] = "";
+ long t = 0;
+
+ if(sscanf(data, "Signature = %s %ld %s", signer, &t, sig) != 3 || strlen(sig) != 86 || !t || !check_id(signer)) {
+ fprintf(stderr, "Invalid input\n");
+ free(data);
+ return 1;
+ }
+
+ if(node && strcmp(node, signer)) {
+ fprintf(stderr, "Signature is not made by %s\n", node);
+ free(data);
+ return 1;
+ }
+
+ if(!node) {
+ node = signer;
+ }
+
+ char *trailer;
+ xasprintf(&trailer, " %s %ld", signer, t);
+ int trailer_len = strlen(trailer);
+
+ data = xrealloc(data, len + trailer_len);
+ memcpy(data + len, trailer, trailer_len);
+ free(trailer);
+
+ newline = data + skip;
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, node);
+ FILE *fp = fopen(fname, "r");
+
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno));
+ free(data);
+ return 1;
+ }
+
+ ecdsa_t *key = get_pubkey(fp);
+
+ if(!key) {
+ rewind(fp);
+ key = ecdsa_read_pem_public_key(fp);
+ }
+
+ if(!key) {
+ fprintf(stderr, "Could not read public key from %s\n", fname);
+ fclose(fp);
+ free(data);
+ return 1;
+ }
+
+ fclose(fp);
+
+ if(b64decode(sig, sig, 86) != 64 || !ecdsa_verify(key, newline, len + trailer_len - (newline - data), sig)) {
+ fprintf(stderr, "Invalid signature\n");
+ free(data);
+ ecdsa_free(key);
+ return 1;
+ }
+
+ ecdsa_free(key);
+
+ fwrite(newline, len - (newline - data), 1, stdout);
+
+ free(data);
+ return 0;
}
static const struct {
{"restart", cmd_restart},
{"reload", cmd_reload},
{"dump", cmd_dump},
+ {"list", cmd_dump},
{"purge", cmd_purge},
{"debug", cmd_debug},
{"retry", cmd_retry},
{"set", cmd_config},
{"init", cmd_init},
{"generate-keys", cmd_generate_keys},
+#ifndef DISABLE_LEGACY
{"generate-rsa-keys", cmd_generate_rsa_keys},
- {"generate-ecdsa-keys", cmd_generate_ecdsa_keys},
+#endif
+ {"generate-ed25519-keys", cmd_generate_ed25519_keys},
{"help", cmd_help},
{"version", cmd_version},
{"info", cmd_info},
{"exchange-all", cmd_exchange_all},
{"invite", cmd_invite},
{"join", cmd_join},
+ {"network", cmd_network},
+ {"fsck", cmd_fsck},
+ {"sign", cmd_sign},
+ {"verify", cmd_verify},
{NULL, NULL},
};
static char *complete_command(const char *text, int state) {
static int i;
- if(!state)
+ if(!state) {
i = 0;
- else
+ } else {
i++;
+ }
while(commands[i].command) {
- if(!commands[i].hidden && !strncasecmp(commands[i].command, text, strlen(text)))
+ if(!commands[i].hidden && !strncasecmp(commands[i].command, text, strlen(text))) {
return xstrdup(commands[i].command);
+ }
+
i++;
}
const char *matches[] = {"reachable", "nodes", "edges", "subnets", "connections", "graph", NULL};
static int i;
- if(!state)
+ if(!state) {
i = 0;
- else
+ } else {
i++;
+ }
while(matches[i]) {
- if(!strncasecmp(matches[i], text, strlen(text)))
+ if(!strncasecmp(matches[i], text, strlen(text))) {
return xstrdup(matches[i]);
+ }
+
i++;
}
static char *complete_config(const char *text, int state) {
static int i;
- if(!state)
+ if(!state) {
i = 0;
- else
+ } else {
i++;
+ }
while(variables[i].name) {
char *dot = strchr(text, '.');
+
if(dot) {
if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
char *match;
return match;
}
} else {
- if(!strncasecmp(variables[i].name, text, strlen(text)))
+ if(!strncasecmp(variables[i].name, text, strlen(text))) {
return xstrdup(variables[i].name);
+ }
}
+
i++;
}
static char *complete_info(const char *text, int state) {
static int i;
+
if(!state) {
i = 0;
- if(!connect_tincd(false))
+
+ if(!connect_tincd(false)) {
return NULL;
+ }
+
// Check the list of nodes
sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
sendline(fd, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
}
- while(recvline(fd, line, sizeof line)) {
+ while(recvline(fd, line, sizeof(line))) {
char item[4096];
- int n = sscanf(line, "%d %d %s", &code, &req, item);
+ int n = sscanf(line, "%d %d %4095s", &code, &req, item);
+
if(n == 2) {
i++;
- if(i >= 2)
+
+ if(i >= 2) {
break;
- else
+ } else {
continue;
+ }
}
if(n != 3) {
break;
}
- if(!strncmp(item, text, strlen(text)))
+ if(!strncmp(item, text, strlen(text))) {
return xstrdup(strip_weight(item));
+ }
}
return NULL;
return NULL;
}
-static char **completion (const char *text, int start, int end) {
+static char **completion(const char *text, int start, int end) {
char **matches = NULL;
- if(!start)
+ if(!start) {
matches = rl_completion_matches(text, complete_command);
- else if(!strncasecmp(rl_line_buffer, "dump ", 5))
+ } else if(!strncasecmp(rl_line_buffer, "dump ", 5)) {
matches = rl_completion_matches(text, complete_dump);
- else if(!strncasecmp(rl_line_buffer, "add ", 4))
+ } else if(!strncasecmp(rl_line_buffer, "add ", 4)) {
matches = rl_completion_matches(text, complete_config);
- else if(!strncasecmp(rl_line_buffer, "del ", 4))
+ } else if(!strncasecmp(rl_line_buffer, "del ", 4)) {
matches = rl_completion_matches(text, complete_config);
- else if(!strncasecmp(rl_line_buffer, "get ", 4))
+ } else if(!strncasecmp(rl_line_buffer, "get ", 4)) {
matches = rl_completion_matches(text, complete_config);
- else if(!strncasecmp(rl_line_buffer, "set ", 4))
+ } else if(!strncasecmp(rl_line_buffer, "set ", 4)) {
matches = rl_completion_matches(text, complete_config);
- else if(!strncasecmp(rl_line_buffer, "info ", 5))
+ } else if(!strncasecmp(rl_line_buffer, "info ", 5)) {
matches = rl_completion_matches(text, complete_info);
+ }
return matches;
}
#endif
static int cmd_shell(int argc, char *argv[]) {
- char *prompt;
xasprintf(&prompt, "%s> ", identname);
int result = 0;
char buf[4096];
char *line = NULL;
int maxargs = argc + 16;
- char **nargv = xmalloc(maxargs * sizeof *nargv);
+ char **nargv = xmalloc(maxargs * sizeof(*nargv));
- for(int i = 0; i < argc; i++)
+ for(int i = 0; i < argc; i++) {
nargv[i] = argv[i];
+ }
#ifdef HAVE_READLINE
rl_readline_name = "tinc";
while(true) {
#ifdef HAVE_READLINE
+
if(tty) {
free(copy);
free(line);
rl_basic_word_break_characters = "\t\n ";
line = readline(prompt);
- if(line)
+
+ if(line) {
copy = xstrdup(line);
+ }
} else {
- line = fgets(buf, sizeof buf, stdin);
+ line = fgets(buf, sizeof(buf), stdin);
}
+
#else
- if(tty)
+
+ if(tty) {
fputs(prompt, stdout);
+ }
- line = fgets(buf, sizeof buf, stdin);
+ line = fgets(buf, sizeof(buf), stdin);
#endif
- if(!line)
+ if(!line) {
break;
+ }
/* Ignore comments */
- if(*line == '#')
+ if(*line == '#') {
continue;
+ }
/* Split */
while(p && *p) {
if(nargc >= maxargs) {
- fprintf(stderr, "next %p '%s', p %p '%s'\n", next, next, p, p);
- abort();
maxargs *= 2;
- nargv = xrealloc(nargv, maxargs * sizeof *nargv);
+ nargv = xrealloc(nargv, maxargs * sizeof(*nargv));
}
nargv[nargc++] = p;
next = strtok(NULL, " \t\n");
}
- if(nargc == argc)
+ if(nargc == argc) {
continue;
+ }
- if(!strcasecmp(nargv[argc], "exit") || !strcasecmp(nargv[argc], "quit"))
+ if(!strcasecmp(nargv[argc], "exit") || !strcasecmp(nargv[argc], "quit")) {
+ free(nargv);
return result;
+ }
bool found = false;
}
#ifdef HAVE_READLINE
- if(tty && found)
+
+ if(tty && found) {
add_history(copy);
+ }
+
#endif
if(!found) {
free(nargv);
- if(tty)
+ if(tty) {
printf("\n");
+ }
+
return result;
}
program_name = argv[0];
orig_argv = argv;
orig_argc = argc;
+ tty = isatty(0) && isatty(1);
- if(!parse_options(argc, argv))
+ if(!parse_options(argc, argv)) {
return 1;
+ }
- make_names();
+ make_names(false);
xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
return 0;
}
- crypto_init();
+#ifdef HAVE_MINGW
+ static struct WSAData wsa_state;
- tty = isatty(0) && isatty(1);
+ if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+ fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+ return false;
+ }
+
+#endif
- if(optind >= argc)
+ srand(time(NULL));
+ crypto_init();
+
+ if(optind >= argc) {
return cmd_shell(argc, argv);
+ }
for(int i = 0; commands[i].command; i++) {
- if(!strcasecmp(argv[optind], commands[i].command))
+ if(!strcasecmp(argv[optind], commands[i].command)) {
return commands[i].function(argc - optind, argv + optind);
+ }
}
fprintf(stderr, "Unknown command `%s'.\n", argv[optind]);
projects / tinc / blobdiff