roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

tmp

Browse Source
This commit is contained in:
obscuren 2014-09-14 13:42:02 +02:00
parent 954ba211bf
commit f63cb27803
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
peer.go
View File

@ -182,6 +182,7 @@ func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer {
inbound: false, inbound: false,
connected: 0, connected: 0,
disconnect: 0, disconnect: 0,
port: 30303,
caps: caps, caps: caps,
version: ethereum.ClientIdentity().String(), version: ethereum.ClientIdentity().String(),
} }
@ -629,17 +630,6 @@ func (p *Peer) pushPeers() {
p.QueueMessage(p.peersMessage()) p.QueueMessage(p.peersMessage())
} }
func (p *Peer) pushHandshake() error {
pubkey := p.ethereum.KeyManager().PublicKey()
msg := ethwire.NewMessage(ethwire.MsgHandshakeTy, []interface{}{
uint32(0), []byte(p.version), []string{"eth"}, p.port, pubkey[1:],
})
p.QueueMessage(msg)
return nil
}
func (self *Peer) pushStatus() { func (self *Peer) pushStatus() {
const netVersion = 0 const netVersion = 0
msg := ethwire.NewMessage(ethwire.MsgStatusTy, []interface{}{ msg := ethwire.NewMessage(ethwire.MsgStatusTy, []interface{}{
@ -673,8 +663,21 @@ func (self *Peer) handleStatus(msg *ethwire.Msg) {
ethlogger.Infof("Peer is [ETH] capable. (TD = %v ~ %x", self.td, self.bestHash) ethlogger.Infof("Peer is [ETH] capable. (TD = %v ~ %x", self.td, self.bestHash)
} }
func (p *Peer) pushHandshake() error {
pubkey := p.ethereum.KeyManager().PublicKey()
fmt.Println("pubkey", pubkey)
msg := ethwire.NewMessage(ethwire.MsgHandshakeTy, []interface{}{
uint32(0), []byte(p.version), []string{"eth"}, uint32(p.port), pubkey[1:],
})
p.QueueMessage(msg)
return nil
}
func (p *Peer) handleHandshake(msg *ethwire.Msg) { func (p *Peer) handleHandshake(msg *ethwire.Msg) {
c := msg.Data c := msg.Data
fmt.Println(c, c.Len())
var ( var (
p2pVersion = c.Get(0).Uint() p2pVersion = c.Get(0).Uint()
@ -684,8 +687,6 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
pub = c.Get(4).Bytes() pub = c.Get(4).Bytes()
) )
fmt.Println("PEER CAPS", caps)
// Check correctness of p2p protocol version // Check correctness of p2p protocol version
if p2pVersion != P2PVersion { if p2pVersion != P2PVersion {
peerlogger.Debugf("Invalid P2P version. Require protocol %d, received %d\n", P2PVersion, p2pVersion) peerlogger.Debugf("Invalid P2P version. Require protocol %d, received %d\n", P2PVersion, p2pVersion)
@ -735,7 +736,7 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
p.ethereum.PushPeer(p) p.ethereum.PushPeer(p)
p.ethereum.reactor.Post("peerList", p.ethereum.Peers()) p.ethereum.reactor.Post("peerList", p.ethereum.Peers())
ethlogger.Infof("Added peer (%s) %d / %d \n", p.conn.RemoteAddr(), p.ethereum.Peers().Len(), p.ethereum.MaxPeers) ethlogger.Infof("Added peer (%s) %d / %d (%v)\n", p.conn.RemoteAddr(), p.ethereum.Peers().Len(), p.ethereum.MaxPeers, caps)
peerlogger.Debugln(p) peerlogger.Debugln(p)