Skip to content

Commit

Permalink
server: assume default port if one not present for --externalip
Browse files Browse the repository at this point in the history
  • Loading branch information
Roasbeef committed Apr 13, 2017
1 parent 54c63f4 commit d93e3e6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
18 changes: 14 additions & 4 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"net"
"strconv"
"sync"
"sync/atomic"
"time"
Expand Down Expand Up @@ -162,11 +163,20 @@ func newServer(listenAddrs []string, notifier chainntnfs.ChainNotifier,
// of this server's addresses.
selfAddrs := make([]net.Addr, 0, len(cfg.ExternalIPs))
for _, ip := range cfg.ExternalIPs {
addr, err := net.ResolveTCPAddr("tcp", ip)
var addr string
_, _, err = net.SplitHostPort(ip)
if err != nil {
addr = net.JoinHostPort(ip, strconv.Itoa(defaultPeerPort))
} else {
addr = ip
}

lnAddr, err := net.ResolveTCPAddr("tcp", addr)
if err != nil {
return nil, err
}
selfAddrs = append(selfAddrs, addr)

selfAddrs = append(selfAddrs, lnAddr)
}

chanGraph := chanDB.ChannelGraph()
Expand Down Expand Up @@ -617,7 +627,7 @@ func (s *server) inboundPeerConnected(conn net.Conn) {
s.peersMtx.Lock()
defer s.peersMtx.Unlock()

srvrLog.Tracef("New inbound connection from %v", conn.RemoteAddr())
srvrLog.Infof("New inbound connection from %v", conn.RemoteAddr())

nodePub := conn.(*brontide.Conn).RemotePub()

Expand Down Expand Up @@ -653,7 +663,7 @@ func (s *server) outboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
s.peersMtx.Lock()
defer s.peersMtx.Unlock()

srvrLog.Tracef("Established connection to: %v", conn.RemoteAddr())
srvrLog.Infof("Established connection to: %v", conn.RemoteAddr())

nodePub := conn.(*brontide.Conn).RemotePub()

Expand Down
3 changes: 3 additions & 0 deletions utxonursery.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,9 @@ out:
return
}

// TODO(roasbeef): if the BlockChainIO is rescanning
// will give stale data

// A new block has just been connected to the main
// chain which means we might be able to graduate some
// outputs out of the kindergarten bucket. Graduation
Expand Down

0 comments on commit d93e3e6

Please sign in to comment.