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

Introduce PeerKey

Browse Source 
PeerKeys are used to prevent overwriting of peers which want to announce
for both IPv4 and IPv6.
This commit is contained in:
Jimmy Zelinskie
2014-08-01 11:21:57 -04:00
parent c438b877ba
commit e52e4d5f1d
5 changed files with 107 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tracker/memory/conn.go
View File

@@ -93,7 +93,7 @@ func (c *Conn) TouchTorrent(infohash string) error {
return nil
}
func (c *Conn) AddLeecher(infohash string, p *models.Peer) error {
func (c *Conn) DeleteLeecher(infohash string, pk models.PeerKey) error {
c.torrentsM.Lock()
defer c.torrentsM.Unlock()
@@ -101,12 +101,12 @@ func (c *Conn) AddLeecher(infohash string, p *models.Peer) error {
if !ok {
return models.ErrTorrentDNE
}
t.Leechers[p.ID] = *p
delete(t.Leechers, pk)
return nil
}
func (c *Conn) AddSeeder(infohash string, p *models.Peer) error {
func (c *Conn) DeleteSeeder(infohash string, pk models.PeerKey) error {
c.torrentsM.Lock()
defer c.torrentsM.Unlock()
@@ -114,12 +114,12 @@ func (c *Conn) AddSeeder(infohash string, p *models.Peer) error {
if !ok {
return models.ErrTorrentDNE
}
t.Seeders[p.ID] = *p
delete(t.Seeders, pk)
return nil
}
func (c *Conn) DeleteLeecher(infohash, peerkey string) error {
func (c *Conn) PutLeecher(infohash, ipv string, p *models.Peer) error {
c.torrentsM.Lock()
defer c.torrentsM.Unlock()
@@ -127,12 +127,12 @@ func (c *Conn) DeleteLeecher(infohash, peerkey string) error {
if !ok {
return models.ErrTorrentDNE
}
delete(t.Leechers, peerkey)
t.Leechers[models.NewPeerKey(p.ID, ipv)] = *p
return nil
}
func (c *Conn) DeleteSeeder(infohash, peerkey string) error {
func (c *Conn) PutSeeder(infohash, ipv string, p *models.Peer) error {
c.torrentsM.Lock()
defer c.torrentsM.Unlock()
@@ -140,33 +140,7 @@ func (c *Conn) DeleteSeeder(infohash, peerkey string) error {
if !ok {
return models.ErrTorrentDNE
}
delete(t.Seeders, peerkey)
return nil
}
func (c *Conn) PutLeecher(infohash string, p *models.Peer) error {
c.torrentsM.Lock()
defer c.torrentsM.Unlock()
t, ok := c.torrents[infohash]
if !ok {
return models.ErrTorrentDNE
}
t.Leechers[p.ID] = *p
return nil
}
func (c *Conn) PutSeeder(infohash string, p *models.Peer) error {
c.torrentsM.Lock()
defer c.torrentsM.Unlock()
t, ok := c.torrents[infohash]
if !ok {
return models.ErrTorrentDNE
}
t.Seeders[p.ID] = *p
t.Seeders[models.NewPeerKey(p.ID, ipv)] = *p
return nil
}
@@ -270,14 +244,14 @@ func (c *Conn) PurgeInactivePeers(purgeEmptyTorrents bool, before time.Time) err
for key, peer := range torrent.Seeders {
if peer.LastAnnounce <= unixtime {
delete(torrent.Seeders, key)
stats.RecordPeerEvent(stats.ReapedSeed, peer.HasIPv6())
stats.RecordPeerEvent(stats.ReapedSeed, string(key[:4]))
}
}
for key, peer := range torrent.Leechers {
if peer.LastAnnounce <= unixtime {
delete(torrent.Leechers, key)
stats.RecordPeerEvent(stats.ReapedLeech, peer.HasIPv6())
stats.RecordPeerEvent(stats.ReapedLeech, string(key[:4]))
}
}