X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=2fdab2a66a12a723096f361ad37ca52a28055ead;hb=a6448291834ca7419553a807ee367c719c2956d0;hp=af54aefb8af953697f99bf6b47bd0016b85a280e;hpb=72136f8418bc7e8a0a5bf3c11215aa49dc679659;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index af54aefb..2fdab2a6 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -355,6 +355,8 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 	char buf[PATH_MAX];
 	char buf2[PATH_MAX];
 
+ask_filename:
+
 	/* Check stdin and stdout */
 	if(ask && tty) {
 		/* Ask for a file and/or directory name. */
@@ -385,7 +387,17 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 #endif
 		/* The directory is a relative path or a filename. */
 		getcwd(directory, sizeof(directory));
-		snprintf(buf2, sizeof(buf2), "%s" SLASH "%s", directory, filename);
+
+		if(snprintf(buf2, sizeof(buf2), "%s" SLASH "%s", directory, filename) >= sizeof(buf2)) {
+			fprintf(stderr, "Filename too long: %s" SLASH "%s\n", directory, filename);
+
+			if(ask && tty) {
+				goto ask_filename;
+			} else {
+				return NULL;
+			}
+		}
+
 		filename = buf2;
 	}
 
@@ -825,6 +837,8 @@ bool connect_tincd(bool verbose) {
 
 	strncpy(sa.sun_path, unixsocketname, sizeof(sa.sun_path));
 
+	sa.sun_path[sizeof(sa.sun_path) - 1] = 0;
+
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 
 	if(fd < 0) {
@@ -902,6 +916,8 @@ bool connect_tincd(bool verbose) {
 	setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&one, sizeof(one));
 #endif
 
+	sendline(fd, "%d ^%s %d", ID, controlcookie, TINC_CTL_VERSION_CURRENT);
+
 	char data[4096];
 	int version;
 
@@ -915,8 +931,6 @@ bool connect_tincd(bool verbose) {
 		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) {
 			fprintf(stderr, "Could not fully establish control socket connection\n");
@@ -1161,7 +1175,12 @@ static int dump_invitations(void) {
 		}
 
 		char fname[PATH_MAX];
-		snprintf(fname, sizeof(fname), "%s" SLASH "%s", dname, ent->d_name);
+
+		if(snprintf(fname, sizeof(fname), "%s" SLASH "%s", dname, ent->d_name) >= sizeof(fname)) {
+			fprintf(stderr, "Filename too long: %s" SLASH "%s\n", dname, ent->d_name);
+			continue;
+		}
+
 		FILE *f = fopen(fname, "r");
 
 		if(!f) {
@@ -1298,12 +1317,12 @@ static int cmd_dump(int argc, char *argv[]) {
 		unsigned int options, status_int;
 		node_status_t status;
 		long int last_state_change;
-		long int udp_ping_rtt;
+		int udp_ping_rtt;
 		uint64_t in_packets, in_bytes, out_packets, out_bytes;
 
 		switch(req) {
 		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 %ld %lu %lu %lu %lu", node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes);
+			int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %d %d %d %d %x %x %4095s %4095s %d %hd %hd %hd %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes);
 
 			if(n != 22) {
 				fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
@@ -1333,10 +1352,13 @@ static int cmd_dump(int argc, char *argv[]) {
 					continue;
 				}
 
-				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) rx %lu %lu tx %lu %lu",
+				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) rx %"PRIu64" %"PRIu64" tx %"PRIu64" %"PRIu64,
 				       node, id, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu, in_packets, in_bytes, out_packets, out_bytes);
-				if (udp_ping_rtt != -1)
-					printf(" rtt %ld.%03ld", udp_ping_rtt/1000, udp_ping_rtt%1000);
+
+				if(udp_ping_rtt != -1) {
+					printf(" rtt %d.%03d", udp_ping_rtt / 1000, udp_ping_rtt % 1000);
+				}
+
 				printf("\n");
 			}
 		}
@@ -1927,7 +1949,11 @@ static int cmd_config(int argc, char *argv[]) {
 	FILE *tf = NULL;
 
 	if(action >= -1) {
-		snprintf(tmpfile, sizeof(tmpfile), "%s.config.tmp", filename);
+		if(snprintf(tmpfile, sizeof(tmpfile), "%s.config.tmp", filename) >= sizeof(tmpfile)) {
+			fprintf(stderr, "Filename too long: %s.config.tmp\n", filename);
+			return 1;
+		}
+
 		tf = fopen(tmpfile, "w");
 
 		if(!tf) {
@@ -2534,7 +2560,10 @@ static int cmd_import(int argc, char *argv[]) {
 				fclose(out);
 			}
 
-			snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, name);
+			if(snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, name) >= sizeof(filename)) {
+				fprintf(stderr, "Filename too long: %s" SLASH "%s\n", hosts_dir, name);
+				return 1;
+			}
 
 			if(!force && !access(filename, F_OK)) {
 				fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
@@ -3261,7 +3290,7 @@ int main(int argc, char *argv[]) {
 	static struct WSAData wsa_state;
 
 	if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
-		fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+		fprintf(stderr, "System call `%s' failed: %s\n", "WSAStartup", winerror(GetLastError()));
 		return false;
 	}