Merge pull request #1264 from pi-hole/new/telnet-dns-port

Return DNS port on ">dns-port" telnet command

src/api/api.c

@@ -1473,3 +1473,9 @@ void delete_lease(const char *client_message, const int *sock)
 	if(config.debug & DEBUG_API)
 		logg("...done");
 }
+
+void getDNSport(const int *sock)
+{
+	// Return DNS port used by FTL
+	ssend(*sock, "%d\n", config.dns_port);
+}

src/api/api.h

@@ -30,6 +30,7 @@ void getUnknownQueries(const int *sock);
 
 // DNS resolver methods (dnsmasq_interface.c)
 void getCacheInformation(const int *sock);
+void getDNSport(const int *sock);
 
 // MessagePack serialization helpers
 void pack_eom(const int sock);

src/api/request.c

@@ -164,6 +164,11 @@ void process_request(const char *client_message, int *sock)
 		processed = true;
 		delete_lease(client_message, sock);
 	}
+	else if(command(client_message, ">dns-port"))
+	{
+		processed = true;
+		getDNSport(sock);
+	}
 
 	// Test only at the end if we want to quit or kill
 	// so things can be processed before

test/test_suite.bats

@@ -11,6 +11,13 @@
   [[ ${lines[6]} == "" ]]
 }
 
+@test "DNS server port is reported" {
+  run bash -c 'echo ">dns-port >quit" | nc -v 127.0.0.1 4711'
+  printf "%s\n" "${lines[@]}"
+  [[ ${lines[1]} == "53" ]]
+  [[ ${lines[2]} == "" ]]
+}
+
 @test "Running a second instance is detected and prevented" {
   run bash -c 'su pihole -s /bin/sh -c "/home/pihole/pihole-FTL -f"'
   printf "%s\n" "${lines[@]}"