aboutsummaryrefslogtreecommitdiffstats
path: root/les/handler.go
diff options
context:
space:
mode:
Diffstat (limited to 'les/handler.go')
-rw-r--r--les/handler.go42
1 files changed, 21 insertions, 21 deletions
diff --git a/les/handler.go b/les/handler.go
index 8b8ca75da..a51358676 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -249,7 +249,7 @@ func (pm *ProtocolManager) findServers() {
select {
case enode := <-enodes:
if !added[enode] {
- fmt.Println("Found LES server:", enode)
+ glog.V(logger.Info).Infoln("Found LES server:", enode)
added[enode] = true
if node, err := discover.ParseNode(enode); err == nil {
pm.p2pServer.AddPeer(node)
@@ -280,9 +280,9 @@ func (pm *ProtocolManager) Start(srvr *p2p.Server) {
} else {
if pm.topicDisc != nil {
go func() {
- fmt.Println("Starting topic register")
+ glog.V(logger.Debug).Infoln("Starting topic register")
pm.topicDisc.RegisterTopic(pm.lesTopic, pm.quitSync)
- fmt.Println("Stopped topic register")
+ glog.V(logger.Debug).Infoln("Stopped topic register")
}()
}
go func() {
@@ -382,7 +382,6 @@ func (pm *ProtocolManager) handle(p *peer) error {
select {
case announce := <-p.announceChn:
p.SendAnnounce(announce)
- //fmt.Println(" BROADCAST sent")
case <-stop:
return
}
@@ -393,7 +392,6 @@ func (pm *ProtocolManager) handle(p *peer) error {
for {
if err := pm.handleMsg(p); err != nil {
glog.V(logger.Debug).Infof("%v: message handling failed: %v", p, err)
- //fmt.Println("handleMsg err:", err)
return err
}
}
@@ -413,7 +411,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
var costs *requestCosts
var reqCnt, maxReqs int
- //fmt.Println("MSG", msg.Code, msg.Size)
+ glog.V(logger.Debug).Infoln("msg:", msg.Code, msg.Size)
if rc, ok := p.fcCosts[msg.Code]; ok { // check if msg is a supported request type
costs = rc
if p.fcClient == nil {
@@ -442,21 +440,23 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
// Handle the message depending on its contents
switch msg.Code {
case StatusMsg:
- glog.V(logger.Debug).Infof("LES: received StatusMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== StatusMsg from peer %v", p.id)
// Status messages should never arrive after the handshake
return errResp(ErrExtraStatusMsg, "uncontrolled status message")
// Block header query, collect the requested headers and reply
case AnnounceMsg:
+ glog.V(logger.Debug).Infoln("<=== AnnounceMsg from peer %v:", p.id)
+
var req announceData
if err := msg.Decode(&req); err != nil {
return errResp(ErrDecode, "%v: %v", msg, err)
}
- //fmt.Println("RECEIVED", req.Number, req.Hash, req.Td, req.ReorgDepth)
+ glog.V(logger.Detail).Infoln("AnnounceMsg:", req.Number, req.Hash, req.Td, req.ReorgDepth)
pm.fetcher.notify(p, &req)
case GetBlockHeadersMsg:
- glog.V(logger.Debug).Infof("LES: received GetBlockHeadersMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== GetBlockHeadersMsg from peer %v", p.id)
// Decode the complex header query
var req struct {
ReqID uint64
@@ -541,7 +541,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
return errResp(ErrUnexpectedResponse, "")
}
- glog.V(logger.Debug).Infof("LES: received BlockHeadersMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== BlockHeadersMsg from peer %v", p.id)
// A batch of headers arrived to one of our previous requests
var resp struct {
ReqID, BV uint64
@@ -561,7 +561,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
case GetBlockBodiesMsg:
- glog.V(logger.Debug).Infof("LES: received GetBlockBodiesMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== GetBlockBodiesMsg from peer %v", p.id)
// Decode the retrieval message
var req struct {
ReqID uint64
@@ -598,7 +598,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
return errResp(ErrUnexpectedResponse, "")
}
- glog.V(logger.Debug).Infof("LES: received BlockBodiesMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== BlockBodiesMsg from peer %v", p.id)
// A batch of block bodies arrived to one of our previous requests
var resp struct {
ReqID, BV uint64
@@ -615,7 +615,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
case GetCodeMsg:
- glog.V(logger.Debug).Infof("LES: received GetCodeMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== GetCodeMsg from peer %v", p.id)
// Decode the retrieval message
var req struct {
ReqID uint64
@@ -659,7 +659,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
return errResp(ErrUnexpectedResponse, "")
}
- glog.V(logger.Debug).Infof("LES: received CodeMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== CodeMsg from peer %v", p.id)
// A batch of node state data arrived to one of our previous requests
var resp struct {
ReqID, BV uint64
@@ -676,7 +676,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
case GetReceiptsMsg:
- glog.V(logger.Debug).Infof("LES: received GetReceiptsMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== GetReceiptsMsg from peer %v", p.id)
// Decode the retrieval message
var req struct {
ReqID uint64
@@ -722,7 +722,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
return errResp(ErrUnexpectedResponse, "")
}
- glog.V(logger.Debug).Infof("LES: received ReceiptsMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== ReceiptsMsg from peer %v", p.id)
// A batch of receipts arrived to one of our previous requests
var resp struct {
ReqID, BV uint64
@@ -739,7 +739,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
case GetProofsMsg:
- glog.V(logger.Debug).Infof("LES: received GetProofsMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== GetProofsMsg from peer %v", p.id)
// Decode the retrieval message
var req struct {
ReqID uint64
@@ -789,7 +789,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
return errResp(ErrUnexpectedResponse, "")
}
- glog.V(logger.Debug).Infof("LES: received ProofsMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== ProofsMsg from peer %v", p.id)
// A batch of merkle proofs arrived to one of our previous requests
var resp struct {
ReqID, BV uint64
@@ -806,7 +806,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
case GetHeaderProofsMsg:
- glog.V(logger.Debug).Infof("LES: received GetHeaderProofsMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== GetHeaderProofsMsg from peer %v", p.id)
// Decode the retrieval message
var req struct {
ReqID uint64
@@ -850,7 +850,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
return errResp(ErrUnexpectedResponse, "")
}
- glog.V(logger.Debug).Infof("LES: received HeaderProofsMsg from peer %v", p.id)
+ glog.V(logger.Debug).Infof("<=== HeaderProofsMsg from peer %v", p.id)
var resp struct {
ReqID, BV uint64
Data []ChtResp
@@ -883,7 +883,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
pm.server.fcCostStats.update(msg.Code, uint64(reqCnt), rcost)
default:
- glog.V(logger.Debug).Infof("LES: received unknown message with code %d from peer %v", msg.Code, p.id)
+ glog.V(logger.Debug).Infof("<=== unknown message with code %d from peer %v", msg.Code, p.id)
return errResp(ErrInvalidMsgCode, "%v", msg.Code)
}