aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-07-18 14:04:41 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-07-18 14:04:41 +0200
commit2c70638e8c963b50d4cba63411beac1f76b4170f (patch)
tree34725e24dd940bf0a930eef4bae47e4c28d83f26
parenta1e318739c4b9f70a71ee24c414d0ea7dfc59730 (diff)
Cleanup
-rw-r--r--cmd/btcheck/main.go4
-rw-r--r--tracker/messages.go22
-rw-r--r--tracker/peer.go23
3 files changed, 25 insertions, 24 deletions
diff --git a/cmd/btcheck/main.go b/cmd/btcheck/main.go
index 468d110..d4c30b0 100644
--- a/cmd/btcheck/main.go
+++ b/cmd/btcheck/main.go
@@ -32,8 +32,8 @@ func main() {
req := tracker.Request{
InfoHash: tor.Info.Hash(),
PeerID: []byte(id),
- //Compact: true,
- Port: 6881,
+ Compact: true,
+ Port: 6881,
}
resp, err := req.Get(tor.Announce)
if err != nil {
diff --git a/tracker/messages.go b/tracker/messages.go
index 76b9232..750774a 100644
--- a/tracker/messages.go
+++ b/tracker/messages.go
@@ -1,9 +1,7 @@
package tracker
import (
- "bytes"
"crypto/sha1"
- "encoding/binary"
"io/ioutil"
"net"
"net/http"
@@ -77,23 +75,3 @@ func (r Request) Get(announce string) (Response, error) {
}
return res, nil
}
-
-func peerAddr(b []byte) ([]*net.TCPAddr, error) {
- n := len(b) / 6
- a := make([]*net.TCPAddr, n)
-
- var port uint16
- for i := 0; i < n; i++ {
- off := i * 6
- buf := bytes.NewReader(b[off+4 : off+6])
- err := binary.Read(buf, binary.BigEndian, &port)
- if err != nil {
- return nil, err
- }
- a[i] = &net.TCPAddr{
- IP: net.IP(b[off : off+4]),
- Port: int(port),
- }
- }
- return a, nil
-}
diff --git a/tracker/peer.go b/tracker/peer.go
index 11fd748..99ad3a1 100644
--- a/tracker/peer.go
+++ b/tracker/peer.go
@@ -1,7 +1,10 @@
package tracker
import (
+ "bytes"
+ "encoding/binary"
"fmt"
+ "net"
"dim13.org/btget/bencode"
)
@@ -39,3 +42,23 @@ func (p *Peers) UnmarshalBencode(b []byte) (int, error) {
return n, err
}
}
+
+func peerAddr(b []byte) ([]*net.TCPAddr, error) {
+ n := len(b) / 6
+ a := make([]*net.TCPAddr, n)
+
+ var port uint16
+ for i := 0; i < n; i++ {
+ off := i * 6
+ buf := bytes.NewReader(b[off+4 : off+6])
+ err := binary.Read(buf, binary.BigEndian, &port)
+ if err != nil {
+ return nil, err
+ }
+ a[i] = &net.TCPAddr{
+ IP: net.IP(b[off : off+4]),
+ Port: int(port),
+ }
+ }
+ return a, nil
+}