github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Переход на bencode с автозагрузки, удаление старой встроенной функции

Browse source
This commit is contained in:
Exile 2016-02-07 05:48:24 +03:00
commit 7f879c882a
5 changed files with 11 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bt/announce.php
View file

@ -171,13 +171,13 @@ function msg_die ($msg)
{
if (DBG_LOG) dbg_log(' ', '!die-'. clean_filename($msg));
$output = bencode(array(
$output = \Rych\Bencode\Bencode::encode([
# 'interval' => (int) 1800,
'min interval' => (int) 1800,
# 'peers' => (string) DUMMY_PEER,
'failure reason' => (string) $msg,
'warning message' => (string) $msg,
));
]);
die($output);
}
@ -502,7 +502,7 @@ if (!$output)
}
// Return data to client
echo bencode($output);
echo \Rych\Bencode\Bencode::encode($output);
tracker_exit();
exit;

2
bt/includes/init_tr.php
View file

@ -46,7 +46,7 @@ function error_exit ($msg = '')
silent_exit();
echo bencode(array('failure reason' => str_compact($msg)));
echo \Rych\Bencode\Bencode::encode(array('failure reason' => str_compact($msg)));
tracker_exit();
}

6
bt/scrape.php
View file

@ -23,11 +23,11 @@ function msg_die ($msg)
{
if (DBG_LOG) dbg_log(' ', '!die-'. clean_filename($msg));
$output = bencode(array(
$output = \Rych\Bencode\Bencode::encode([
'min interval' => (int) 1800,
'failure reason' => (string) $msg,
'warning message' => (string) $msg,
));
]);
die($output);
}
@ -51,7 +51,7 @@ $output['files'][$info_hash] = array(
'incomplete' => (int) $row['leechers'],
);
echo bencode($output);
echo \Rych\Bencode\Bencode::encode($output);
tracker_exit();
exit;

65
common.php
View file

@ -357,69 +357,6 @@ function make_rand_str ($len = 10)
return substr($str, 0, $len);
}
// bencode: based on OpenTracker
function bencode ($var)
{
if (is_string($var))
{
return strlen($var) .':'. $var;
}
else if (is_int($var))
{
return 'i'. $var .'e';
}
else if (is_float($var))
{
return 'i'. sprintf('%.0f', $var) .'e';
}
else if (is_array($var))
{
if (count($var) == 0)
{
return 'de';
}
else
{
$assoc = false;
foreach ($var as $key => $val)
{
if (!is_int($key))
{
$assoc = true;
break;
}
}
if ($assoc)
{
ksort($var, SORT_REGULAR);
$ret = 'd';
foreach ($var as $key => $val)
{
$ret .= bencode($key) . bencode($val);
}
return $ret .'e';
}
else
{
$ret = 'l';
foreach ($var as $val)
{
$ret .= bencode($val);
}
return $ret .'e';
}
}
}
else
{
trigger_error('bencode error: wrong data type', E_USER_ERROR);
}
}
function array_deep (&$var, $fn, $one_dimensional = false, $array_only = false)
{
if (is_array($var))
@ -535,7 +472,7 @@ else if (defined('IN_TRACKER'))
function dummy_exit ($interval = 1800)
{
$output = bencode(array(
$output = \Rych\Bencode\Bencode::encode(array(
'interval' => (int) $interval,
'min interval' => (int) $interval,
'peers' => (string) DUMMY_PEER,

6
library/includes/functions_torrent.php
View file

@ -169,7 +169,7 @@ function tracker_register ($topic_id, $mode = '', $tor_status = TOR_NOT_APPROVED
{
$tor_decoded['info']['private'] = (int) 1;
$fp = fopen($filename, 'w+');
fwrite($fp, bencode($tor_decoded));
fwrite($fp, \Rych\Bencode\Bencode::encode($tor_decoded));
fclose($fp);
}
@ -180,7 +180,7 @@ function tracker_register ($topic_id, $mode = '', $tor_status = TOR_NOT_APPROVED
return torrent_error_exit($lang['TORFILE_INVALID']);
}
$info_hash = pack('H*', sha1(bencode($info)));
$info_hash = pack('H*', sha1(\Rych\Bencode\Bencode::encode($info)));
$info_hash_sql = rtrim(DB()->escape($info_hash), ' ');
$info_hash_md5 = md5($info_hash);
@ -470,7 +470,7 @@ function send_torrent_with_passkey ($t_data)
unset($tor['comment.utf-8']);
// Send torrent
$output = bencode($tor);
$output = \Rych\Bencode\Bencode::encode($tor);
$dl_fname = '['.$bb_cfg['server_name'].'].t' . $topic_id . '.torrent';
if (!empty($_COOKIE['explain']))