From 9c8cec0736e672ba0024938c5e940c8f709d7ee2 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 27 Jul 2016 23:47:22 +0200 Subject: Update PeerID --- cmd/btcheck/main.go | 3 +-- peer/id.go | 13 ++++++------- peer/id_test.go | 7 ++----- peer/port.go | 15 --------------- peer/port_test.go | 8 -------- 5 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 peer/port.go delete mode 100644 peer/port_test.go diff --git a/cmd/btcheck/main.go b/cmd/btcheck/main.go index 6d79e8b..6b83704 100644 --- a/cmd/btcheck/main.go +++ b/cmd/btcheck/main.go @@ -28,10 +28,9 @@ func main() { fmt.Printf("%d %d %d %x %v\n", i, off, n, p, p.Check(buf[:n])) } - id, _ := peer.NewID() req := tracker.Request{ InfoHash: tor.Info.Hash(), - PeerID: []byte(id), + PeerID: peer.NewID(), Compact: true, Port: 6881, } diff --git a/peer/id.go b/peer/id.go index dd0ff1d..fa8c6a9 100644 --- a/peer/id.go +++ b/peer/id.go @@ -5,11 +5,10 @@ import ( "encoding/hex" ) -func NewID() (string, error) { - r := make([]byte, 10) - _, err := rand.Read(r) - if err != nil { - return "", err - } - return hex.EncodeToString(r), nil +func NewID() []byte { + src := make([]byte, 10) + dst := make([]byte, hex.EncodedLen(len(src))) + rand.Read(src) + hex.Encode(dst, src) + return dst } diff --git a/peer/id_test.go b/peer/id_test.go index da80656..95297e1 100644 --- a/peer/id_test.go +++ b/peer/id_test.go @@ -3,12 +3,9 @@ package peer import "testing" func TestID(t *testing.T) { - id, err := NewID() - if err != nil { - t.Error(err) - } + id := NewID() if len(id) != 20 { t.Error("wrong length") } - t.Log(id) + t.Log(string(id)) } diff --git a/peer/port.go b/peer/port.go deleted file mode 100644 index 7aa1ed4..0000000 --- a/peer/port.go +++ /dev/null @@ -1,15 +0,0 @@ -package peer - -const ( - minPort = 6881 - maxPort = 6889 -) - -func PortRange() []int { - n := maxPort - minPort + 1 - r := make([]int, n) - for i := 0; i < n; i++ { - r[i] = minPort + i - } - return r -} diff --git a/peer/port_test.go b/peer/port_test.go deleted file mode 100644 index ed849e2..0000000 --- a/peer/port_test.go +++ /dev/null @@ -1,8 +0,0 @@ -package peer - -import "testing" - -func TestPortRange(t *testing.T) { - r := PortRange() - t.Log(r) -} -- cgit v1.2.3