# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1649871986 -3600
# Node ID ccbdebb43e23eec4b5b4ece41cc593c9388248bc
# Parent  4a087713cffe631ebaa8bdad6fc5eabaa1920b8c# Parent  9ee41552bca0f1b237b1a1b185f0c42a048fb839
Merge 0.12->trunk

diff -r 4a087713cffe -r ccbdebb43e23 util/prosodyctl/check.lua
--- a/util/prosodyctl/check.lua	Wed Apr 13 16:53:19 2022 +0200
+++ b/util/prosodyctl/check.lua	Wed Apr 13 18:46:26 2022 +0100
@@ -153,7 +153,7 @@
 	local alloc_response, err = receive_packet();
 	if not alloc_response then
 		result.error = "TURN server did not response to allocation request: "..err;
-		return;
+		return result;
 	elseif alloc_response:is_err_resp() then
 		result.error = ("TURN allocation failed: %d (%s)"):format(alloc_response:get_error());
 		return result;
@@ -245,7 +245,7 @@
 	local pong_data = ping_response:get_attribute("data");
 	if not pong_data then
 		result.error = "No data relayed from remote server";
-		return;
+		return result;
 	end
 	local pong = stun.new_packet():deserialize(pong_data);