akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

watchtower/wtserver/server: log sent/recvd wire messages

Browse Source
This commit is contained in:
Conner Fromknecht 2019-01-08 00:14:07 -08:00
parent 00db396b51
commit 4a2fb1b4d0
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
watchtower/wtserver/server.go
View File

@ -188,7 +188,7 @@ func (s *Server) handleClient(peer Peer) {
peer.Close()
return
}
defer s.removePeer(&id)
defer s.removePeer(&id, peer.RemoteAddr())
msg, err := s.readMessage(peer)
remoteInit, ok := msg.(*wtwire.Init)
@ -246,12 +246,6 @@ func (s *Server) handleClient(peer Peer) {
return
}
log.Infof("Received CreateSession from %s, "+
"version=%d nupdates=%d rewardrate=%d "+
"sweepfeerate=%d", id, msg.BlobType,
msg.MaxUpdates, msg.RewardRate,
msg.SweepFeeRate)
// Attempt to open a new session for this client.
err := s.handleCreateSession(peer, &id, msg)
if err != nil {
@ -265,11 +259,6 @@ func (s *Server) handleClient(peer Peer) {
// A StateUpdate indicates an existing client attempting to
// back-up a revoked commitment state.
case *wtwire.StateUpdate:
log.Infof("Received SessionUpdate from %s, seqnum=%d "+
"lastapplied=%d complete=%v hint=%x", id,
msg.SeqNum, msg.LastApplied, msg.IsComplete,
msg.Hint[:])
// Try to accept the state update from the client.
err := s.handleStateUpdate(peer, &id, msg)
if err != nil {
@ -437,7 +426,7 @@ func (s *Server) handleStateUpdate(peer Peer, id *wtdb.SessionID,
lastApplied, err = s.cfg.DB.InsertStateUpdate(&sessionUpdate)
switch {
case err == nil:
log.Infof("State update %d accepted for %s",
log.Debugf("State update %d accepted for %s",
update.SeqNum, id)
failCode = wtwire.CodeOK
@ -568,13 +557,15 @@ func (s *Server) readMessage(peer Peer) (wtwire.Message, error) {
}
msgReader := bytes.NewReader(rawMsg)
nextMsg, err := wtwire.ReadMessage(msgReader, 0)
msg, err := wtwire.ReadMessage(msgReader, 0)
if err != nil {
err = fmt.Errorf("unable to parse message: %v", err)
return nil, err
}
return nextMsg, nil
logMessage(peer, msg, true)
return msg, nil
}
// sendMessage sends a watchtower wire message to the target peer.
@ -594,6 +585,8 @@ func (s *Server) sendMessage(peer Peer, msg wtwire.Message) error {
return err
}
logMessage(peer, msg, false)
_, err = peer.Write(b.Bytes())
return err
}
@ -619,8 +612,8 @@ func (s *Server) addPeer(id *wtdb.SessionID, peer Peer) error {
// removePeer deletes a client from the server's client map. If a peer is found,
// this method will close the peer's connection.
func (s *Server) removePeer(id *wtdb.SessionID) {
log.Infof("Releasing incoming peer %s", id)
func (s *Server) removePeer(id *wtdb.SessionID, addr net.Addr) {
log.Infof("Releasing incoming peer %s@%s", id, addr)
s.clientMtx.Lock()
peer, ok := s.clients[*id]
@ -632,6 +625,27 @@ func (s *Server) removePeer(id *wtdb.SessionID) {
}
}
// logMessage writes information about a message exchanged with a remote peer,
// using directional prepositions to signal whether the message was sent or
// received.
func logMessage(peer Peer, msg wtwire.Message, read bool) {
var action = "Received"
var preposition = "from"
if !read {
action = "Sending"
preposition = "to"
}
summary := wtwire.MessageSummary(msg)
if len(summary) > 0 {
summary = "(" + summary + ")"
}
log.Debugf("%s %s%v %s %x@%s", action, msg.MsgType(), summary,
preposition, peer.RemotePub().SerializeCompressed(),
peer.RemoteAddr())
}
// noDial is a dummy dial method passed to the server's connmgr.
func noDial(_ net.Addr) (net.Conn, error) {
return nil, fmt.Errorf("watchtower cannot make outgoing conns")