Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-06-17 09:59:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

(minor) Merge commits 7a4c2ee..77b3bf9 from https://github.com/jzelinskie/chihaya

Browse Source
This commit is contained in:
Lawrence, Rendall
2022-04-16 21:22:41 +03:00
parent 01064fd21a
commit 7716aa828a
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/mochi/e2e.go
+2 -3
View File
@@ -9,7 +9,6 @@ import (
"time"
"github.com/anacrolix/torrent/tracker"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/sot-tech/mochi/bittorrent"
@@ -97,7 +96,7 @@ func testWithInfohash(infoHash bittorrent.InfoHash, url string, delay time.Durat
UserAgent: "mochi-e2e",
}.Do()
if err != nil {
return errors.Wrap(err, "announce failed")
return fmt.Errorf("announce failed: %w", err)
}
if len(resp.Peers) != 1 {
@@ -125,7 +124,7 @@ func testWithInfohash(infoHash bittorrent.InfoHash, url string, delay time.Durat
UserAgent: "mochi-e2e",
}.Do()
if err != nil {
return errors.Wrap(err, "announce failed")
return fmt.Errorf("announce failed: %w", err)
}
if len(resp.Peers) != 1 {
frontend/http/writer.go
+10 -9
View File
@@ -2,6 +2,7 @@ package http
import (
"errors"
"net"
"net/http"
"time"
@@ -49,26 +50,26 @@ func WriteAnnounceResponse(w http.ResponseWriter, resp *bittorrent.AnnounceRespo
// Add the peers to the dictionary in the compact format.
if resp.Compact {
var IPv4CompactDict, IPv6CompactDict []byte
// Add the IPv4 peers to the dictionary.
ipv4CompactDict := make([]byte, 0, (net.IPv4len+2)*len(resp.IPv4Peers))
for _, peer := range resp.IPv4Peers {
IPv4CompactDict = append(IPv4CompactDict, compact4(peer)...)
ipv4CompactDict = append(ipv4CompactDict, compact4(peer)...)
}
if len(IPv4CompactDict) > 0 {
bdict["peers"] = IPv4CompactDict
if len(ipv4CompactDict) > 0 {
bdict["peers"] = ipv4CompactDict
}
// Add the IPv6 peers to the dictionary.
ipv6CompactDict := make([]byte, 0, (net.IPv6len+2)*len(resp.IPv6Peers)) // IP + port
for _, peer := range resp.IPv6Peers {
IPv6CompactDict = append(IPv6CompactDict, compact6(peer)...)
ipv6CompactDict = append(ipv6CompactDict, compact6(peer)...)
}
if len(IPv6CompactDict) > 0 {
bdict["peers6"] = IPv6CompactDict
if len(ipv6CompactDict) > 0 {
bdict["peers6"] = ipv6CompactDict
}
} else {
// Add the peers to the dictionary.
peers := make([]map[string]any, 0, len(resp.IPv4Peers)+len(resp.IPv6Peers))
peers := make([]map[string]any, 0, len(resp.IPv4Peers)+len(resp.IPv6Peers)) // IP + port
for _, peer := range resp.IPv4Peers {
peers = append(peers, dict(peer))
}