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

(tested) fix static check warnings

Browse Source 
* UDP writer: defer buffer close
* HTTP writer: remove duplicated compact4/6
This commit is contained in:
Lawrence, Rendall
2022-04-25 16:05:19 +03:00
parent 72a03db654
commit 081d3752d8
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/http/writer.go
+13 -22
View File
@@ -25,7 +25,7 @@ func WriteError(w http.ResponseWriter, err error) {
if err = bencode.NewEncoder(w).Encode(map[string]any{
"failure reason": message,
}); err != nil {
log.Error("unable to encode string", log.Err(err))
log.Error("unable to encode message", log.Err(err))
}
}
@@ -50,21 +50,21 @@ func WriteAnnounceResponse(w http.ResponseWriter, resp *bittorrent.AnnounceRespo
// Add the peers to the dictionary in the compact format.
if resp.Compact {
// Add the IPv4 peers to the dictionary.
ipv4CompactDict := make([]byte, 0, (net.IPv4len+2)*len(resp.IPv4Peers))
compactAddresses := make([]byte, 0, (net.IPv4len+2)*len(resp.IPv4Peers))
for _, peer := range resp.IPv4Peers {
ipv4CompactDict = append(ipv4CompactDict, compact4(peer)...)
compactAddresses = append(compactAddresses, compactAddress(peer)...)
}
if len(ipv4CompactDict) > 0 {
bdict["peers"] = ipv4CompactDict
if len(compactAddresses) > 0 {
bdict["peers"] = compactAddresses
}
// Add the IPv6 peers to the dictionary.
ipv6CompactDict := make([]byte, 0, (net.IPv6len+2)*len(resp.IPv6Peers)) // IP + port
compactAddresses = make([]byte, 0, (net.IPv6len+2)*len(resp.IPv6Peers)) // IP + port
for _, peer := range resp.IPv6Peers {
ipv6CompactDict = append(ipv6CompactDict, compact6(peer)...)
compactAddresses = append(compactAddresses, compactAddress(peer)...)
}
if len(ipv6CompactDict) > 0 {
bdict["peers6"] = ipv6CompactDict
if len(compactAddresses) > 0 {
bdict["peers6"] = compactAddresses
}
} else {
// Add the peers to the dictionary.
@@ -97,25 +97,16 @@ func WriteScrapeResponse(w http.ResponseWriter, resp *bittorrent.ScrapeResponse)
})
}
func compact4(peer bittorrent.Peer) (buf []byte) {
ip := peer.Addr().As4()
buf = append(buf, ip[:]...)
func compactAddress(peer bittorrent.Peer) (buf []byte) {
buf = append(buf, peer.Addr().AsSlice()...)
port := peer.Port()
buf = append(buf, byte(port>>8), byte(port&0xff))
return
}
func compact6(peer bittorrent.Peer) (buf []byte) {
ip := peer.Addr().As16()
buf = append(buf, ip[:]...)
port := peer.Port()
buf = append(buf, byte(port>>8), byte(port&0xff))
buf = append(buf, byte(port>>8), byte(port))
return
}
func dict(peer bittorrent.Peer) map[string]any {
return map[string]any{
"peer id": string(peer.ID[:]),
"peer id": peer.ID.RawString(),
"ip": peer.Addr(),
"port": peer.Port(),
}