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 *identname = NULL; /* program name for syslog */
+static char *pidfilename = NULL; /* pid file location */
static char *confdir = NULL;
-static char controlcookie[1024];
+static char controlcookie[1025];
char *netname = NULL;
char *confbase = NULL;
static char *tinc_conf = NULL;
static char *hosts_dir = NULL;
+struct timeval now;
// Horrible global variables...
static int pid = 0;
" 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"
- " nodes - all known nodes in the VPN\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"
while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
switch (r) {
- case 0: /* long option */
+ case 0: /* long option */
break;
- case 'c': /* config file */
+ case 'c': /* config file */
confbase = xstrdup(optarg);
break;
- case 'n': /* net name given */
+ case 'n': /* net name given */
netname = xstrdup(optarg);
break;
- case 1: /* show help */
+ case 1: /* show help */
show_help = true;
break;
- case 2: /* show version */
+ case 2: /* show version */
show_version = true;
break;
- case 5: /* open control socket here */
+ case 5: /* open control socket here */
pidfilename = xstrdup(optarg);
break;
- case 6:
+ case 6: /* force */
force = true;
break;
- case '?':
+ case '?': /* wrong options */
usage(true);
return false;
}
}
- if(!netname && (netname = getenv("NETNAME")))
- netname = xstrdup(netname);
+ if(!netname && (netname = getenv("NETNAME")))
+ netname = xstrdup(netname);
- /* netname "." is special: a "top-level name" */
+ /* netname "." is special: a "top-level name" */
- if(netname && (!*netname || !strcmp(netname, "."))) {
- free(netname);
- netname = NULL;
- }
+ if(netname && (!*netname || !strcmp(netname, "."))) {
+ free(netname);
+ netname = NULL;
+ }
if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
fprintf(stderr, "Invalid character in netname!\n");
filename = buf2;
}
- umask(0077); /* Disallow everything for group and other */
+ umask(0077); /* Disallow everything for group and other */
disable_old_keys(filename, what);
static bool ecdsa_keygen(bool ask) {
ecdsa_t key;
FILE *f;
- char *filename;
+ char *pubname, *privname;
fprintf(stderr, "Generating ECDSA keypair:\n");
} else
fprintf(stderr, "Done.\n");
- xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
- f = ask_and_open(filename, "private ECDSA key", "a", ask);
+ xasprintf(&privname, "%s" SLASH "ecdsa_key.priv", confbase);
+ f = ask_and_open(privname, "private ECDSA key", "a", ask);
+ free(privname);
if(!f)
return false;
-
+
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
fchmod(fileno(f), 0600);
#endif
-
+
ecdsa_write_pem_private_key(&key, f);
fclose(f);
- free(filename);
if(name)
- xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
else
- xasprintf(&filename, "%s" SLASH "ecdsa_key.pub", confbase);
+ xasprintf(&pubname, "%s" SLASH "ecdsa_key.pub", confbase);
- f = ask_and_open(filename, "public ECDSA key", "a", ask);
+ f = ask_and_open(pubname, "public ECDSA key", "a", ask);
+ free(pubname);
if(!f)
return false;
free(pubkey);
fclose(f);
- free(filename);
return true;
}
static bool rsa_keygen(int bits, bool ask) {
rsa_t key;
FILE *f;
- char *filename;
+ char *pubname, *privname;
fprintf(stderr, "Generating %d bits keys:\n", bits);
} else
fprintf(stderr, "Done.\n");
- xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
- f = ask_and_open(filename, "private RSA key", "a", ask);
+ xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
+ f = ask_and_open(privname, "private RSA key", "a", ask);
+ free(privname);
if(!f)
return false;
-
+
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
fchmod(fileno(f), 0600);
#endif
-
+
rsa_write_pem_private_key(&key, f);
fclose(f);
- free(filename);
if(name)
- xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
else
- xasprintf(&filename, "%s" SLASH "rsa_key.pub", confbase);
+ xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
- f = ask_and_open(filename, "public RSA key", "a", ask);
+ f = ask_and_open(pubname, "public RSA key", "a", ask);
+ free(pubname);
if(!f)
return false;
rsa_write_pem_public_key(&key, f);
fclose(f);
- free(filename);
return true;
}
blen -= result;
}
- return true;
+ return true;
}
static void pcap(int fd, FILE *out, int snaplen) {
return false;
}
- char host[128];
- char port[128];
+ char host[129];
+ char port[129];
if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) {
if(verbose)
}
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)
fprintf(stderr, "Could not fully establish control socket connection\n");
pid_t pid = fork();
if(pid == -1) {
fprintf(stderr, "Could not fork: %s\n", strerror(errno));
+ free(nargv);
return 1;
}
if(!pid)
exit(execvp(c, nargv));
-
+
+ free(nargv);
+
int status = -1;
if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
fprintf(stderr, "Error starting %s\n", c);
}
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) {
fprintf(stderr, "Invalid number of arguments.\n");
usage(true);
if(n < 2)
break;
- if(!do_graph) {
- char node[4096];
- char from[4096];
- char to[4096];
- char subnet[4096];
- char host[4096];
- char port[4096];
- char via[4096];
- char nexthop[4096];
- int cipher, digest, maclength, compression, distance, socket, weight;
- short int pmtu, minmtu, maxmtu;
- unsigned int options, status;
- 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, 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;
- }
+ char node[4096];
+ char from[4096];
+ char to[4096];
+ char subnet[4096];
+ char host[4096];
+ char port[4096];
+ char via[4096];
+ char nexthop[4096];
+ int cipher, digest, maclength, compression, distance, socket, weight;
+ short int pmtu, minmtu, maxmtu;
+ unsigned int options, status_int;
+ node_status_t status;
+ 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;
+ }
+
+ 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";
+ 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, nexthop, via, distance, pmtu, minmtu, maxmtu);
- } 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;
- }
+ node, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
+ }
+ } 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;
+ }
+
+ 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;
-
- 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_CONNECTIONS: {
- int n = sscanf(line, "%*d %*d %s %s port %s %x %d %x", node, host, port, &options, &socket, &status);
- 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);
- } break;
-
- default:
- fprintf(stderr, "Unable to parse dump from tincd.\n");
+ }
+ } 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;
- }
- } else {
- if(req == REQ_DUMP_NODES)
- printf(" %s [label = \"%s\"];\n", node1, node1);
- else {
- if(do_graph == 1 && strcmp(node1, node2) > 0)
- printf(" %s -- %s;\n", node1, node2);
- else if(do_graph == 2)
- printf(" %s -> %s;\n", node1, node2);
- }
+ }
+ printf("%s owner %s\n", strip_weight(subnet), node);
+ } break;
+
+ 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;
+ }
+ 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;
}
}
} const variables[] = {
/* Server configuration */
{"AddressFamily", VAR_SERVER},
+ {"AutoConnect", VAR_SERVER},
{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
{"BindToInterface", VAR_SERVER},
{"Broadcast", VAR_SERVER},
{"ECDSAPrivateKeyFile", VAR_SERVER},
{"ExperimentalProtocol", VAR_SERVER},
{"Forwarding", VAR_SERVER},
- {"GraphDumpFile", VAR_SERVER},
+ {"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
{"Hostnames", VAR_SERVER},
{"IffOneQueue", VAR_SERVER},
{"Interface", VAR_SERVER},
{"ProcessPriority", VAR_SERVER},
{"Proxy", VAR_SERVER},
{"ReplayWindow", VAR_SERVER},
+ {"ScriptsExtension", VAR_SERVER},
+ {"ScriptsInterpreter", VAR_SERVER},
{"StrictSubnets", VAR_SERVER},
{"TunnelServer", VAR_SERVER},
{"UDPRcvBuf", VAR_SERVER},
char *value;
int len;
- len = strcspn(line, "\t =");
- value = line + len;
- value += strspn(value, "\t ");
- if(*value == '=') {
- value++;
- value += strspn(value, "\t ");
- }
- line[len] = '\0';
+ 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;
}
static char *complete_dump(const char *text, int state) {
- const char *matches[] = {"nodes", "edges", "subnets", "connections", "graph", NULL};
+ const char *matches[] = {"reachable", "nodes", "edges", "subnets", "connections", "graph", NULL};
static int i;
if(!state)
}
}
+ free(nargv);
+
if(tty)
printf("\n");
return result;
if(!parse_options(argc, argv))
return 1;
-
+
make_names();
if(show_version) {