aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-06-19 16:04:42 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-06-19 16:04:42 +0200
commitd21245eff317d8d2eaec873b7c7590f4bc3412f4 (patch)
tree3fc3be361ae314a81b9e78e31ce98929ebff026d
parent81168ca0e8dbd75a31e675e164a0aadc1b401caf (diff)
fix bugs
-rw-r--r--peer/peer.go10
-rw-r--r--peer/port.go15
-rw-r--r--peer/port_test.go8
3 files changed, 28 insertions, 5 deletions
diff --git a/peer/peer.go b/peer/peer.go
index 3d7c936..440b10a 100644
--- a/peer/peer.go
+++ b/peer/peer.go
@@ -1,4 +1,4 @@
-package Peer
+package peer
import (
"bytes"
@@ -8,14 +8,14 @@ import (
const (
Idle = iota
Connecting
- Handshake
+ InHandshake
Connected
Failed
)
type Peer struct {
conn net.Conn
- Addr net.TCPAddr
+ Addr *net.TCPAddr
ID []byte
Valid bool
Choked bool // remote
@@ -27,9 +27,9 @@ type Peer struct {
}
func NewPeer(addr string) (Peer, error) {
- a, err := net.ResolveTCPAddr(addr)
+ a, err := net.ResolveTCPAddr("tcp", addr)
if err != nil {
return Peer{}, err
}
- return Peer{Addr: a, Choked: true, Choking: true}
+ return Peer{Addr: a, Choked: true, Choking: true}, nil
}
diff --git a/peer/port.go b/peer/port.go
new file mode 100644
index 0000000..7aa1ed4
--- /dev/null
+++ b/peer/port.go
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000..ed849e2
--- /dev/null
+++ b/peer/port_test.go
@@ -0,0 +1,8 @@
+package peer
+
+import "testing"
+
+func TestPortRange(t *testing.T) {
+ r := PortRange()
+ t.Log(r)
+}