From 61224f86c944a395dd9c15932a6daf28e236a833 Mon Sep 17 00:00:00 2001 From: Jae Kwon Date: Mon, 7 Jul 2014 20:03:50 -0700 Subject: [PATCH] package rename peer -> p2p --- {peer => p2p}/README.md | 0 {peer => p2p}/addrbook.go | 2 +- {peer => p2p}/addrbook_test.go | 2 +- {peer => p2p}/connection.go | 2 +- {peer => p2p}/listener.go | 2 +- {peer => p2p}/log.go | 2 +- {peer => p2p}/msg.go | 2 +- {peer => p2p}/netaddress.go | 2 +- {peer => p2p}/peer.go | 2 +- {peer => p2p}/pex.go | 17 +++++++++++------ {peer => p2p}/switch.go | 11 +---------- {peer => p2p}/switch_test.go | 2 +- {peer => p2p}/upnp/upnp.go | 0 {peer => p2p}/upnp/upnp_test.go | 0 {peer => p2p}/util.go | 2 +- 15 files changed, 22 insertions(+), 26 deletions(-) rename {peer => p2p}/README.md (100%) rename {peer => p2p}/addrbook.go (99%) rename {peer => p2p}/addrbook_test.go (99%) rename {peer => p2p}/connection.go (99%) rename {peer => p2p}/listener.go (99%) rename {peer => p2p}/log.go (97%) rename {peer => p2p}/msg.go (87%) rename {peer => p2p}/netaddress.go (99%) rename {peer => p2p}/peer.go (99%) rename {peer => p2p}/pex.go (84%) rename {peer => p2p}/switch.go (96%) rename {peer => p2p}/switch_test.go (99%) rename {peer => p2p}/upnp/upnp.go (100%) rename {peer => p2p}/upnp/upnp_test.go (100%) rename {peer => p2p}/util.go (95%) diff --git a/peer/README.md b/p2p/README.md similarity index 100% rename from peer/README.md rename to p2p/README.md diff --git a/peer/addrbook.go b/p2p/addrbook.go similarity index 99% rename from peer/addrbook.go rename to p2p/addrbook.go index 872b4a39b..1fc867c73 100644 --- a/peer/addrbook.go +++ b/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 diff --git a/peer/addrbook_test.go b/p2p/addrbook_test.go similarity index 99% rename from peer/addrbook_test.go rename to p2p/addrbook_test.go index a91410985..d60d2f249 100644 --- a/peer/addrbook_test.go +++ b/p2p/addrbook_test.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( "fmt" diff --git a/peer/connection.go b/p2p/connection.go similarity index 99% rename from peer/connection.go rename to p2p/connection.go index e743f757d..27ba7c3f8 100644 --- a/peer/connection.go +++ b/p2p/connection.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( "bufio" diff --git a/peer/listener.go b/p2p/listener.go similarity index 99% rename from peer/listener.go rename to p2p/listener.go index 0440a9383..a6fa7a1da 100644 --- a/peer/listener.go +++ b/p2p/listener.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( "net" diff --git a/peer/log.go b/p2p/log.go similarity index 97% rename from peer/log.go rename to p2p/log.go index 97fad0570..5cb2e230a 100644 --- a/peer/log.go +++ b/p2p/log.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( "github.com/cihub/seelog" diff --git a/peer/msg.go b/p2p/msg.go similarity index 87% rename from peer/msg.go rename to p2p/msg.go index df02a88b9..6901a801c 100644 --- a/peer/msg.go +++ b/p2p/msg.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( . "github.com/tendermint/tendermint/binary" diff --git a/peer/netaddress.go b/p2p/netaddress.go similarity index 99% rename from peer/netaddress.go rename to p2p/netaddress.go index df12c262f..9f47df59b 100644 --- a/peer/netaddress.go +++ b/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" diff --git a/peer/peer.go b/p2p/peer.go similarity index 99% rename from peer/peer.go rename to p2p/peer.go index 2dfed5962..e77765064 100644 --- a/peer/peer.go +++ b/p2p/peer.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( "fmt" diff --git a/peer/pex.go b/p2p/pex.go similarity index 84% rename from peer/pex.go rename to p2p/pex.go index b7507a0bd..a7986f7a8 100644 --- a/peer/pex.go +++ b/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 } diff --git a/peer/switch.go b/p2p/switch.go similarity index 96% rename from peer/switch.go rename to p2p/switch.go index d07b756fa..38f98b572 100644 --- a/peer/switch.go +++ b/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 diff --git a/peer/switch_test.go b/p2p/switch_test.go similarity index 99% rename from peer/switch_test.go rename to p2p/switch_test.go index f2faa6bfe..57933dded 100644 --- a/peer/switch_test.go +++ b/p2p/switch_test.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( "testing" diff --git a/peer/upnp/upnp.go b/p2p/upnp/upnp.go similarity index 100% rename from peer/upnp/upnp.go rename to p2p/upnp/upnp.go diff --git a/peer/upnp/upnp_test.go b/p2p/upnp/upnp_test.go similarity index 100% rename from peer/upnp/upnp_test.go rename to p2p/upnp/upnp_test.go diff --git a/peer/util.go b/p2p/util.go similarity index 95% rename from peer/util.go rename to p2p/util.go index e9c1a6dfa..eeb0020d7 100644 --- a/peer/util.go +++ b/p2p/util.go @@ -1,4 +1,4 @@ -package peer +package p2p import ( "crypto/sha256"