Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing error in closing peer #116

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixing error in closing peer #116

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0274f1c
fixing error in closing peer
liangmingyuanneo Jul 8, 2016
725edf8
fix error in downloading pieces continue
liangmingyuanneo Jul 8, 2016
a572352
fixing error in generating random piece
liangmingyuanneo Jul 8, 2016
977dcd9
fix error in downloading pieces continue
liangmingyuanneo Jul 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions torrent/torrent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ type TorrentSession struct {
chokePolicy ChokePolicy
chokePolicyHeartbeat <-chan time.Time
execOnSeedingDone bool
rand *rand.Rand
}

func NewTorrentSession(flags *TorrentFlags, torrent string, listenPort uint16) (t *TorrentSession, err error) {
Expand All @@ -158,6 +159,7 @@ func NewTorrentSession(flags *TorrentFlags, torrent string, listenPort uint16) (
chokePolicy: &ClassicChokePolicy{},
chokePolicyHeartbeat: time.Tick(10 * time.Second),
execOnSeedingDone: len(flags.ExecOnSeeding) == 0,
rand: rand.New(rand.NewSource(time.Now().UnixNano() + int64(listenPort))),
}
fromMagnet := strings.HasPrefix(torrent, "magnet:")
ts.M, err = GetMetaInfo(flags.Dial, torrent)
Expand Down Expand Up @@ -670,8 +672,9 @@ func (ts *TorrentSession) DoTorrent() {
if err2 != nil {
if err2 != io.EOF {
log.Println("[", ts.M.Info.Name, "] Closing peer", peer.address, "because", err2)
ts.ClosePeer(peer)
}
ts.ClosePeer(peer)

}
case <-heartbeatChan:
if ts.flags.UseDeadlockDetector {
Expand Down Expand Up @@ -755,8 +758,9 @@ func (ts *TorrentSession) chokePeers() (err error) {
if peer, ok := c.(*peerState); ok {
if shouldChoke != peer.am_choking {
// log.Printf("[ %s ] Changing choke status %v -> %v", ts.M.Info.Name, peer.address, shouldChoke)
peer.SetChoke(shouldChoke)
}
peer.am_choking = true
peer.SetChoke(shouldChoke)
}
}
return
Expand Down Expand Up @@ -806,7 +810,7 @@ func (ts *TorrentSession) RequestBlock(p *peerState) (error) {

func (ts *TorrentSession) ChoosePiece(p *peerState) (piece int) {
n := ts.totalPieces
start := rand.Intn(n)
start := ts.rand.Intn(n)
piece = ts.checkRange(p, start, n)
if piece == -1 {
piece = ts.checkRange(p, 0, start)
Expand Down