package rename peer -> p2p

p2p/addrbook.go

@@ -2,7 +2,7 @@
 // Originally Copyright (c) 2013-2014 Conformal Systems LLC.
 // https://github.com/conformal/btcd/blob/master/LICENSE
 
-package peer
+package p2p
 
 import (
 	crand "crypto/rand" // for seeding

p2p/addrbook_test.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"fmt"

p2p/connection.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"bufio"

p2p/listener.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"net"

p2p/log.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"github.com/cihub/seelog"

p2p/msg.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	. "github.com/tendermint/tendermint/binary"

p2p/netaddress.go

@@ -2,7 +2,7 @@
 // Originally Copyright (c) 2013-2014 Conformal Systems LLC.
 // https://github.com/conformal/btcd/blob/master/LICENSE
 
-package peer
+package p2p
 
 import (
 	. "github.com/tendermint/tendermint/binary"

p2p/peer.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"fmt"

p2p/pex.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"bytes"
@@ -12,7 +12,12 @@ var pexErrInvalidMessage = errors.New("Invalid PEX message")
 
 const pexCh = "PEX"
 
-func peerExchangeHandler(s *Switch, addrBook *AddrBook) {
+/*
+The PexHandler routine should be started separately from the Switch.
+It handles basic PEX communciation.
+The application is responsible for sending out a PexRequestMessage.
+*/
+func PexHandler(s *Switch, addrBook *AddrBook) {
 
 	for {
 		inPkt := s.Receive(pexCh) // {Peer, Time, Packet}
@@ -25,7 +30,7 @@ func peerExchangeHandler(s *Switch, addrBook *AddrBook) {
 		msg := decodeMessage(inPkt.Bytes)
 
 		switch msg.(type) {
-		case *pexRequestMessage:
+		case *PexRequestMessage:
 			// inPkt.Peer requested some peers.
 			// TODO: prevent abuse.
 			addrs := addrBook.GetSelection()
@@ -65,7 +70,7 @@ const (
 func decodeMessage(bz ByteSlice) (msg Message) {
 	switch Byte(bz[0]) {
 	case pexTypeRequest:
-		return &pexRequestMessage{}
+		return &PexRequestMessage{}
 	case pexTypeResponse:
 		return readPexResponseMessage(bytes.NewReader(bz[1:]))
 	default:
@@ -76,10 +81,10 @@ func decodeMessage(bz ByteSlice) (msg Message) {
 /*
 A response with peer addresses
 */
-type pexRequestMessage struct {
+type PexRequestMessage struct {
 }
 
-func (m *pexRequestMessage) WriteTo(w io.Writer) (n int64, err error) {
+func (m *PexRequestMessage) WriteTo(w io.Writer) (n int64, err error) {
 	n, err = WriteOnto(pexTypeRequest, w, n, err)
 	return
 }

p2p/switch.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"errors"
@@ -49,18 +49,9 @@ func NewSwitch(channels []ChannelDescriptor) *Switch {
 		stopped:       0,
 	}
 
-	// automatically start
-	s.start()
-
 	return s
 }
 
-func (s *Switch) start() {
-	// Handle PEX messages
-	// TODO: hmm
-	// go peerExchangeHandler(c)
-}
-
 func (s *Switch) Stop() {
 	log.Infof("Stopping switch")
 	// lock

p2p/switch_test.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"testing"

p2p/util.go

@@ -1,4 +1,4 @@
-package peer
+package p2p
 
 import (
 	"crypto/sha256"