From 6a007023da92384bfb91a824ce7b970533308e46 Mon Sep 17 00:00:00 2001 From: Constantine Kovalensky <45331093+kovalensky@users.noreply.github.com> Date: Sat, 30 Sep 2023 13:20:55 +0400 Subject: [PATCH] Announcer support for responding to stopped events (#918) * Announcer support for answering stopped events --- bt/announce.php | 8 ++++---- bt/includes/init_tr.php | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bt/announce.php b/bt/announce.php index bc0fe67aa..93f60fd66 100644 --- a/bt/announce.php +++ b/bt/announce.php @@ -46,14 +46,14 @@ $input_vars_num = ['port', 'uploaded', 'downloaded', 'left', 'numwant', 'compact // Init received data // String foreach ($input_vars_str as $var_name) { - ${$var_name} = isset($_GET[$var_name]) ? (string)$_GET[$var_name] : null; + $$var_name = isset($_GET[$var_name]) ? (string)$_GET[$var_name] : null; } // Numeric foreach ($input_vars_num as $var_name) { - ${$var_name} = isset($_GET[$var_name]) ? (float)$_GET[$var_name] : null; + $$var_name = isset($_GET[$var_name]) ? (float)$_GET[$var_name] : null; } // Passkey -$passkey = ${$passkey_key} ?? null; +$passkey = $$passkey_key ?? null; // Verify request // Required params (info_hash, peer_id, port, uploaded, downloaded, left, passkey) @@ -339,7 +339,7 @@ if (($is_hybrid && $hybrid_tor_update) || !$is_hybrid) { // Update statistics on // Exit if stopped if ($stopped) { - silent_exit(); + silent_exit('Cache will be reset within 30 seconds'); } // Store peer info in cache diff --git a/bt/includes/init_tr.php b/bt/includes/init_tr.php index e05dfab01..fbf7a1d24 100644 --- a/bt/includes/init_tr.php +++ b/bt/includes/init_tr.php @@ -21,17 +21,15 @@ if ($bb_cfg['tracker']['bt_off']) { // // Functions // -function silent_exit() +function silent_exit($msg = '') { - ob_end_clean(); + echo \SandFox\Bencode\Bencode::encode(['warning message' => str_compact($msg)]); exit; } function error_exit($msg = '') { - silent_exit(); - echo \SandFox\Bencode\Bencode::encode(['failure reason' => str_compact($msg)]); exit;