From 1fafa13c95f82a5ad292800988fef51b5fafb9c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Adamski?= Date: Tue, 8 Dec 2020 14:29:56 +0100 Subject: [PATCH] peers rename --- main.go | 6 +++--- storage.go | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 5653362..c2111fa 100644 --- a/main.go +++ b/main.go @@ -57,7 +57,7 @@ func announce(c *gin.Context) { default: PutPeer(c.Param("room"), req.InfoHash, req.IP, req.Port, req.IsSeeding()) } - peersv4, peersv6, numSeeders, numLeechers := GetPeers(c.Param("room"), req.InfoHash, req.IP, req.Port, req.IsSeeding(), req.Numwant) + peersIPv4, peersIPv6, numSeeders, numLeechers := GetPeers(c.Param("room"), req.InfoHash, req.IP, req.Port, req.IsSeeding(), req.Numwant) interval := 120 if numSeeders == 0 { interval /= 2 @@ -68,8 +68,8 @@ func announce(c *gin.Context) { Interval: interval, Complete: numSeeders, Incomplete: numLeechers, - Peers: string(peersv4), - PeersIPv6: string(peersv6), + Peers: string(peersIPv4), + PeersIPv6: string(peersIPv6), } if err := bencode.Marshal(c.Writer, resp); err != nil { c.Error(err) diff --git a/storage.go b/storage.go index d799c64..62a0231 100644 --- a/storage.go +++ b/storage.go @@ -91,7 +91,7 @@ func GraduateLeecher(room, infoHash, ip string, port uint16) { shard.Unlock() } -func GetPeers(room, infoHash, ip string, port uint16, seeding bool, numWant uint) (peersv4, peersv6 []byte, numSeeders, numLeechers int) { +func GetPeers(room, infoHash, ip string, port uint16, seeding bool, numWant uint) (peersIPv4, peersIPv6 []byte, numSeeders, numLeechers int) { h := sha1.Sum([]byte(room + infoHash)) shard := shards[shardIndex(h)] shard.RLock() @@ -103,9 +103,9 @@ func GetPeers(room, infoHash, ip string, port uint16, seeding bool, numWant uint break } if bytes.HasPrefix([]byte(peer), v4InV6Prefix) { - peersv4 = append(peersv4, peer[12:]...) + peersIPv4 = append(peersIPv4, peer[12:]...) } else { - peersv6 = append(peersv6, peer...) + peersIPv6 = append(peersIPv6, peer...) } numWant-- } @@ -118,9 +118,9 @@ func GetPeers(room, infoHash, ip string, port uint16, seeding bool, numWant uint break } if bytes.HasPrefix([]byte(peer), v4InV6Prefix) { - peersv4 = append(peersv4, peer[12:]...) + peersIPv4 = append(peersIPv4, peer[12:]...) } else { - peersv6 = append(peersv6, peer...) + peersIPv6 = append(peersIPv6, peer...) } numWant-- }