lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-25 12:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

announce not compact also return ipv6

Browse Source
This commit is contained in:
xiaomlove
2022-08-05 17:01:13 +08:00
parent 60013897ab
commit 283f19a70c
1 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/announce.php
+38 -11
View File
@@ -198,7 +198,7 @@ if ($newnumpeers > $rsize)
else $limit = ""; else $limit = "";
$announce_wait = \App\Repositories\TrackerRepository::MIN_ANNOUNCE_WAIT_SECOND; $announce_wait = \App\Repositories\TrackerRepository::MIN_ANNOUNCE_WAIT_SECOND;
$fields = "seeder, peer_id, ip, port, uploaded, downloaded, (".TIMENOW." - UNIX_TIMESTAMP(last_action)) AS announcetime, UNIX_TIMESTAMP(prev_action) AS prevts"; $fields = "seeder, peer_id, ip, ipv4, ipv6, port, uploaded, downloaded, (".TIMENOW." - UNIX_TIMESTAMP(last_action)) AS announcetime, UNIX_TIMESTAMP(prev_action) AS prevts";
//$peerlistsql = "SELECT ".$fields." FROM peers WHERE torrent = ".$torrentid." AND connectable = 'yes' ".$only_leech_query.$limit; //$peerlistsql = "SELECT ".$fields." FROM peers WHERE torrent = ".$torrentid." AND connectable = 'yes' ".$only_leech_query.$limit;
/** /**
* return all peers,include connectable no * return all peers,include connectable no
@@ -218,7 +218,8 @@ $rep_dict = [
"min interval" => (int)$announce_wait, "min interval" => (int)$announce_wait,
"complete" => (int)$torrent["seeders"], "complete" => (int)$torrent["seeders"],
"incomplete" => (int)$torrent["leechers"], "incomplete" => (int)$torrent["leechers"],
"peers" => [] // By default it is a array object, only when `&compact=1` then it should be a string "peers" => [], // By default it is a array object, only when `&compact=1` then it should be a string
"peers6" => [],
]; ];
if ($compact == 1) { if ($compact == 1) {
@@ -255,16 +256,42 @@ if (isset($event) && $event == "stopped") {
} }
if ($compact == 1) { if ($compact == 1) {
$peerField = filter_var($row['ip'],FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ? 'peers6' : 'peers'; // $peerField = filter_var($row['ip'],FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ? 'peers6' : 'peers';
$rep_dict[$peerField] .= inet_pton($row["ip"]) . pack("n", $row["port"]); // $rep_dict[$peerField] .= inet_pton($row["ip"]) . pack("n", $row["port"]);
if (!empty($row['ipv4'])) {
$rep_dict['peers'] .= inet_pton($row["ipv4"]) . pack("n", $row["port"]);
}
if (!empty($row['ipv6'])) {
$rep_dict['peers6'] .= inet_pton($row["ipv6"]) . pack("n", $row["port"]);
}
} else { } else {
$peer = [ // $peer = [
'ip' => $row["ip"], // 'ip' => $row["ip"],
'port' => (int) $row["port"] // 'port' => (int) $row["port"]
]; // ];
//
if ($no_peer_id == 1) $peer['peer id'] = $row["peer_id"]; // if ($no_peer_id == 1) {
$rep_dict['peers'][] = $peer; // $peer['peer id'] = $row["peer_id"];
// }
// $rep_dict['peers'][] = $peer;
if (!empty($row['ipv4'])) {
$peer = [
'peer_id' => $row['peer_id'],
'ip' => $row['ipv4'],
'port' => (int)$row['port'],
];
if ($no_peer_id) unset($peer['peer_id']);
$rep_dict['peers'][] = $peer;
}
if (!empty($row['ipv6'])) {
$peer = [
'peer_id' => $row['peer_id'],
'ip' => $row['ipv6'],
'port' => (int)$row['port'],
];
if ($no_peer_id) unset($peer['peer_id']);
$rep_dict['peers6'][] = $peer;
}
} }
} }
} }