aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2022-03-19 11:09:28 +0000
committerMatthew Wild <mwild1@gmail.com>2022-03-19 11:09:28 +0000
commit921fc00eb76fcf64dc460ad04595b84cac49b66e (patch)
tree28574c514f4d77d8bf91a42558779808a790d762
parent8633709b9f56c5a875bb7c47a4fa5669f438882f (diff)
parentafbef6406b00c91db1a79701d61786ba79f810b4 (diff)
downloadprosody-921fc00eb76fcf64dc460ad04595b84cac49b66e.tar.gz
prosody-921fc00eb76fcf64dc460ad04595b84cac49b66e.zip
Merge 0.12->trunk
-rw-r--r--util/prosodyctl/check.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua
index fc12caaa..e6b815f2 100644
--- a/util/prosodyctl/check.lua
+++ b/util/prosodyctl/check.lua
@@ -180,6 +180,12 @@ local function check_turn_service(turn_service, ping_service)
-- Only a hostname specified, use default STUN port
ping_host, ping_port = ping_service, 3478;
end
+
+ if ping_host == turn_service.host then
+ result.error = ("Unable to perform ping test: please supply an external STUN server address. See https://prosody.im/doc/turn#prosodyctl-check");
+ return result;
+ end
+
local ping_service_ip, err = socket.dns.toip(ping_host);
if not ping_service_ip then
result.error = "Unable to resolve ping service hostname: "..err;