aboutsummaryrefslogtreecommitdiffstats
path: root/peer.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-01-31 07:56:32 +0800
committerobscuren <geffobscura@gmail.com>2014-01-31 07:56:32 +0800
commit7f100e96101a057cba7b2d5c58c12d2f7accf381 (patch)
treee6401cf299f5d88d542af0b2a70831a116791b15 /peer.go
parent7ccf51fd3035aaba8ed3eda0ca8e3b01edaaa2cf (diff)
downloadgo-tangerine-7f100e96101a057cba7b2d5c58c12d2f7accf381.tar
go-tangerine-7f100e96101a057cba7b2d5c58c12d2f7accf381.tar.gz
go-tangerine-7f100e96101a057cba7b2d5c58c12d2f7accf381.tar.bz2
go-tangerine-7f100e96101a057cba7b2d5c58c12d2f7accf381.tar.lz
go-tangerine-7f100e96101a057cba7b2d5c58c12d2f7accf381.tar.xz
go-tangerine-7f100e96101a057cba7b2d5c58c12d2f7accf381.tar.zst
go-tangerine-7f100e96101a057cba7b2d5c58c12d2f7accf381.zip
Self connect detect
Diffstat (limited to 'peer.go')
-rw-r--r--peer.go54
1 files changed, 42 insertions, 12 deletions
diff --git a/peer.go b/peer.go
index 627e57b05..bd75a0039 100644
--- a/peer.go
+++ b/peer.go
@@ -178,6 +178,8 @@ out:
case ethwire.MsgHandshakeTy:
// Version message
p.handleHandshake(msg)
+
+ p.QueueMessage(ethwire.NewMessage(ethwire.MsgGetPeersTy, ""))
case ethwire.MsgDiscTy:
p.Stop()
case ethwire.MsgPingTy:
@@ -216,12 +218,12 @@ out:
// Received a list of peers (probably because MsgGetPeersTy was send)
// Only act on message if we actually requested for a peers list
if p.requestedPeerList {
- data := ethutil.Conv(msg.Data)
+ data := msg.Data
// Create new list of possible peers for the ethereum to process
peers := make([]string, data.Length())
// Parse each possible peer
for i := 0; i < data.Length(); i++ {
- peers[i] = data.Get(i).AsString() + strconv.Itoa(int(data.Get(i).AsUint()))
+ peers[i] = data.Get(i).Get(0).AsString() + ":" + strconv.Itoa(int(data.Get(i).Get(1).AsUint()))
}
// Connect to the list of peers
@@ -278,14 +280,27 @@ out:
func (p *Peer) Start(seed bool) {
p.seed = seed
- if !p.inbound {
- err := p.pushHandshake()
- if err != nil {
- log.Printf("Peer can't send outbound version ack", err)
+ peerHost, _, _ := net.SplitHostPort(p.conn.LocalAddr().String())
+ servHost, _, _ := net.SplitHostPort(p.conn.RemoteAddr().String())
+ log.Println(peerHost, servHost)
+ if peerHost == servHost {
+ log.Println("Connected to self")
- p.Stop()
- }
+ p.Stop()
+
+ return
+ }
+
+ //if !p.inbound {
+ err := p.pushHandshake()
+ if err != nil {
+ log.Printf("Peer can't send outbound version ack", err)
+
+ p.Stop()
+
+ return
}
+ //}
// Run the outbound handler in a new goroutine
go p.HandleOutbound()
@@ -320,11 +335,10 @@ func (p *Peer) pushHandshake() error {
// Pushes the list of outbound peers to the client when requested
func (p *Peer) pushPeers() {
-
outPeers := make([]interface{}, len(p.ethereum.OutboundPeers()))
// Serialise each peer
for i, peer := range p.ethereum.OutboundPeers() {
- outPeers[i] = peer.RlpEncode()
+ outPeers[i] = peer.RlpData()
}
// Send message to the peer with the known list of connected clients
@@ -351,8 +365,8 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
*/
istr = "inbound"
} else {
- msg := ethwire.NewMessage(ethwire.MsgGetChainTy, []interface{}{p.ethereum.BlockManager.BlockChain().CurrentBlock.Hash(), uint64(100)})
- p.QueueMessage(msg)
+ //msg := ethwire.NewMessage(ethwire.MsgGetChainTy, []interface{}{p.ethereum.BlockManager.BlockChain().CurrentBlock.Hash(), uint64(100)})
+ //p.QueueMessage(msg)
istr = "outbound"
}
@@ -360,6 +374,22 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
log.Printf("peer connect (%s) %v %s\n", istr, p.conn.RemoteAddr(), c.Get(2).AsString())
}
+func (p *Peer) RlpData() []interface{} {
+ host, prt, err := net.SplitHostPort(p.conn.RemoteAddr().String())
+ if err != nil {
+ return nil
+ }
+
+ port, err := strconv.Atoi(prt)
+ if err != nil {
+ return nil
+ }
+
+ //port := ethutil.NumberToBytes(uint16(i), 16)
+
+ return []interface{}{host, port}
+}
+
func (p *Peer) RlpEncode() []byte {
host, prt, err := net.SplitHostPort(p.conn.RemoteAddr().String())
if err != nil {