Merge pull request #534 from abligh/select-ports-on-cli

Add options to set ports on weaver command line
This commit is contained in:
rade committed 2015-04-10 13:54:41 +01:00
commit bd8cb02f17
7 files changed
+49 -40

No files matched your search

+15 -13
View File
@@ -15,11 +15,12 @@ const (
) )
type ConnectionMaker struct { type ConnectionMaker struct {
ourself *LocalPeer ourself *LocalPeer
peers *Peers peers *Peers
targets map[string]*Target normalisePeerAddr func(string) string
cmdLineAddress map[string]struct{} targets map[string]*Target
actionChan chan<- ConnectionMakerAction cmdLineAddress map[string]struct{}
actionChan chan<- ConnectionMakerAction
} }
// Information about an address where we may find a peer // Information about an address where we may find a peer
@@ -31,12 +32,13 @@ type Target struct {
type ConnectionMakerAction func() bool type ConnectionMakerAction func() bool
func NewConnectionMaker(ourself *LocalPeer, peers *Peers) *ConnectionMaker { func NewConnectionMaker(ourself *LocalPeer, peers *Peers, normalisePeerAddr func(string) string) *ConnectionMaker {
return &ConnectionMaker{ return &ConnectionMaker{
ourself: ourself, ourself: ourself,
peers: peers, peers: peers,
cmdLineAddress: make(map[string]struct{}), normalisePeerAddr: normalisePeerAddr,
targets: make(map[string]*Target)} cmdLineAddress: make(map[string]struct{}),
targets: make(map[string]*Target)}
} }
func (cm *ConnectionMaker) Start() { func (cm *ConnectionMaker) Start() {
@@ -47,7 +49,7 @@ func (cm *ConnectionMaker) Start() {
func (cm *ConnectionMaker) InitiateConnection(address string) { func (cm *ConnectionMaker) InitiateConnection(address string) {
cm.actionChan <- func() bool { cm.actionChan <- func() bool {
cm.cmdLineAddress[NormalisePeerAddr(address)] = void cm.cmdLineAddress[cm.normalisePeerAddr(address)] = void
if target, found := cm.targets[address]; found { if target, found := cm.targets[address]; found {
target.tryAfter, target.tryInterval = tryImmediately() target.tryAfter, target.tryInterval = tryImmediately()
} }
@@ -57,7 +59,7 @@ func (cm *ConnectionMaker) InitiateConnection(address string) {
func (cm *ConnectionMaker) ForgetConnection(address string) { func (cm *ConnectionMaker) ForgetConnection(address string) {
cm.actionChan <- func() bool { cm.actionChan <- func() bool {
delete(cm.cmdLineAddress, NormalisePeerAddr(address)) delete(cm.cmdLineAddress, cm.normalisePeerAddr(address))
return false return false
} }
} }
@@ -150,7 +152,7 @@ func (cm *ConnectionMaker) checkStateAndAttemptConnections() time.Duration {
addTarget(address) addTarget(address)
} }
if host, _, err := net.SplitHostPort(address); err == nil { if host, _, err := net.SplitHostPort(address); err == nil {
addTarget(NormalisePeerAddr(host)) addTarget(cm.normalisePeerAddr(host))
} }
} }
}) })
+1 -1
View File
@@ -17,7 +17,7 @@ type mockChannelConnection struct {
// Construct a "passive" Router, i.e. without any goroutines, except // Construct a "passive" Router, i.e. without any goroutines, except
// for Routes and GossipSenders. // for Routes and GossipSenders.
func NewTestRouter(name PeerName) *Router { func NewTestRouter(name PeerName) *Router {
router := NewRouter(nil, name, "", nil, 10, 1024, nil) router := NewRouter(nil, name, "", nil, 10, 1024, nil, Port)
// need to create a dummy channel otherwise tests hang on nil // need to create a dummy channel otherwise tests hang on nil
// channels when the Router invoked ConnectionMaker.Refresh // channels when the Router invoked ConnectionMaker.Refresh
router.ConnectionMaker.actionChan = make(chan ConnectionMakerAction, ChannelSize) router.ConnectionMaker.actionChan = make(chan ConnectionMakerAction, ChannelSize)
+1 -1
View File
@@ -94,7 +94,7 @@ func (peer *LocalPeer) CreateConnection(peerAddr string, acceptNewPeer bool) err
return err return err
} }
// We're dialing the remote so that means connections will come from random ports // We're dialing the remote so that means connections will come from random ports
addrStr := NormalisePeerAddr(peerAddr) addrStr := peer.Router.NormalisePeerAddr(peerAddr)
tcpAddr, tcpErr := net.ResolveTCPAddr("tcp4", addrStr) tcpAddr, tcpErr := net.ResolveTCPAddr("tcp4", addrStr)
udpAddr, udpErr := net.ResolveUDPAddr("udp4", addrStr) udpAddr, udpErr := net.ResolveUDPAddr("udp4", addrStr)
if tcpErr != nil || udpErr != nil { if tcpErr != nil || udpErr != nil {
+18 -6
View File
@@ -31,6 +31,7 @@ type Router struct {
ConnLimit int ConnLimit int
BufSz int BufSz int
LogFrame func(string, []byte, *layers.Ethernet) LogFrame func(string, []byte, *layers.Ethernet)
Port int
} }
type PacketSource interface { type PacketSource interface {
@@ -46,14 +47,15 @@ type PacketSourceSink interface {
PacketSink PacketSink
} }
func NewRouter(iface *net.Interface, name PeerName, nickName string, password []byte, connLimit int, bufSz int, logFrame func(string, []byte, *layers.Ethernet)) *Router { func NewRouter(iface *net.Interface, name PeerName, nickName string, password []byte, connLimit int, bufSz int, logFrame func(string, []byte, *layers.Ethernet), port int) *Router {
router := &Router{ router := &Router{
Iface: iface, Iface: iface,
GossipChannels: make(map[uint32]*GossipChannel), GossipChannels: make(map[uint32]*GossipChannel),
Password: password, Password: password,
ConnLimit: connLimit, ConnLimit: connLimit,
BufSz: bufSz, BufSz: bufSz,
LogFrame: logFrame} LogFrame: logFrame,
Port: port}
onMacExpiry := func(mac net.HardwareAddr, peer *Peer) { onMacExpiry := func(mac net.HardwareAddr, peer *Peer) {
log.Println("Expired MAC", mac, "at", peer.FullName()) log.Println("Expired MAC", mac, "at", peer.FullName())
} }
@@ -66,7 +68,7 @@ func NewRouter(iface *net.Interface, name PeerName, nickName string, password []
router.Peers = NewPeers(router.Ourself.Peer, onPeerGC) router.Peers = NewPeers(router.Ourself.Peer, onPeerGC)
router.Peers.FetchWithDefault(router.Ourself.Peer) router.Peers.FetchWithDefault(router.Ourself.Peer)
router.Routes = NewRoutes(router.Ourself.Peer, router.Peers) router.Routes = NewRoutes(router.Ourself.Peer, router.Peers)
router.ConnectionMaker = NewConnectionMaker(router.Ourself, router.Peers) router.ConnectionMaker = NewConnectionMaker(router.Ourself, router.Peers, router.NormalisePeerAddr)
router.TopologyGossip = router.NewGossip("topology", router) router.TopologyGossip = router.NewGossip("topology", router)
return router return router
} }
@@ -86,8 +88,8 @@ func (router *Router) Start() {
router.Macs.Start() router.Macs.Start()
router.Routes.Start() router.Routes.Start()
router.ConnectionMaker.Start() router.ConnectionMaker.Start()
router.UDPListener = router.listenUDP(Port, po) router.UDPListener = router.listenUDP(router.Port, po)
router.listenTCP(Port) router.listenTCP(router.Port)
if pio != nil { if pio != nil {
router.sniff(pio) router.sniff(pio)
} }
@@ -198,7 +200,7 @@ func (router *Router) listenTCP(localPort int) {
func (router *Router) acceptTCP(tcpConn *net.TCPConn) { func (router *Router) acceptTCP(tcpConn *net.TCPConn) {
// someone else is dialing us, so our udp sender is the conn // someone else is dialing us, so our udp sender is the conn
// on Port and we wait for them to send us something on UDP to // on router.Port and we wait for them to send us something on UDP to
// start. // start.
remoteAddrStr := tcpConn.RemoteAddr().String() remoteAddrStr := tcpConn.RemoteAddr().String()
log.Printf("->[%s] connection accepted\n", remoteAddrStr) log.Printf("->[%s] connection accepted\n", remoteAddrStr)
@@ -416,3 +418,13 @@ func (router *Router) applyTopologyUpdate(update []byte) (PeerNameSet, PeerNameS
} }
return origUpdate, newUpdate, nil return origUpdate, newUpdate, nil
} }
// given an address like '1.2.3.4:567', return the address if it has a port,
// otherwise return the address with the default port number for the router
func (router *Router) NormalisePeerAddr(peerAddr string) string {
_, _, err := net.SplitHostPort(peerAddr)
if err == nil {
return peerAddr
}
return fmt.Sprintf("%s:%d", peerAddr, router.Port)
}
+1 -1
View File
@@ -48,7 +48,7 @@ func NewRawUDPSender(conn *LocalConnection) (*RawUDPSender, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
udpHeader := &layers.UDP{SrcPort: layers.UDPPort(Port)} udpHeader := &layers.UDP{SrcPort: layers.UDPPort(conn.Router.Port)}
ipBuf := gopacket.NewSerializeBuffer() ipBuf := gopacket.NewSerializeBuffer()
opts := gopacket.SerializeOptions{ opts := gopacket.SerializeOptions{
FixLengths: true, FixLengths: true,
-10
View File
@@ -117,13 +117,3 @@ func (lop ListOfPeers) Swap(i, j int) {
func (lop ListOfPeers) Less(i, j int) bool { func (lop ListOfPeers) Less(i, j int) bool {
return lop[i].Name < lop[j].Name return lop[i].Name < lop[j].Name
} }
// given an address like '1.2.3.4:567', return the address if it has a port,
// otherwise return the address with weave's standard port number
func NormalisePeerAddr(peerAddr string) string {
_, _, err := net.SplitHostPort(peerAddr)
if err == nil {
return peerAddr
}
return fmt.Sprintf("%s:%d", peerAddr, Port)
}
+13 -8
View File
@@ -46,6 +46,8 @@ func main() {
peers []string peers []string
connLimit int connLimit int
bufSz int bufSz int
port int
httpAddr string
) )
flag.BoolVar(&justVersion, "version", false, "print version and exit") flag.BoolVar(&justVersion, "version", false, "print version and exit")
@@ -58,6 +60,8 @@ func main() {
flag.StringVar(&prof, "profile", "", "enable profiling and write profiles to given path") flag.StringVar(&prof, "profile", "", "enable profiling and write profiles to given path")
flag.IntVar(&connLimit, "connlimit", 30, "connection limit (defaults to 30, set to 0 for unlimited)") flag.IntVar(&connLimit, "connlimit", 30, "connection limit (defaults to 30, set to 0 for unlimited)")
flag.IntVar(&bufSz, "bufsz", 8, "capture buffer size in MB (defaults to 8MB)") flag.IntVar(&bufSz, "bufsz", 8, "capture buffer size in MB (defaults to 8MB)")
flag.IntVar(&port, "port", weave.Port, fmt.Sprintf("router port (defaults to %d)", weave.Port))
flag.StringVar(&httpAddr, "httpaddr", fmt.Sprintf(":%d", weave.HTTPPort), fmt.Sprintf("address to bind HTTP interface to (defaults to :%d, set to \"\" to disable)", weave.HTTPPort))
flag.Parse() flag.Parse()
peers = flag.Args() peers = flag.Args()
@@ -121,11 +125,13 @@ func main() {
defer profile.Start(&p).Stop() defer profile.Start(&p).Stop()
} }
router := weave.NewRouter(iface, ourName, nickName, pwSlice, connLimit, bufSz*1024*1024, logFrameFunc(debug)) router := weave.NewRouter(iface, ourName, nickName, pwSlice, connLimit, bufSz*1024*1024, logFrameFunc(debug), port)
log.Println("Our name is", router.Ourself.FullName()) log.Println("Our name is", router.Ourself.FullName())
router.Start() router.Start()
initiateConnections(router, peers) initiateConnections(router, peers)
go handleHTTP(router) if httpAddr != "" {
go handleHTTP(router, httpAddr)
}
handleSignals(router) handleSignals(router)
} }
@@ -145,7 +151,7 @@ func logFrameFunc(debug bool) func(string, []byte, *layers.Ethernet) {
func initiateConnections(router *weave.Router, peers []string) { func initiateConnections(router *weave.Router, peers []string) {
for _, peer := range peers { for _, peer := range peers {
if addr, err := net.ResolveTCPAddr("tcp4", weave.NormalisePeerAddr(peer)); err == nil { if addr, err := net.ResolveTCPAddr("tcp4", router.NormalisePeerAddr(peer)); err == nil {
router.ConnectionMaker.InitiateConnection(addr.String()) router.ConnectionMaker.InitiateConnection(addr.String())
} else { } else {
log.Fatal(err) log.Fatal(err)
@@ -153,7 +159,7 @@ func initiateConnections(router *weave.Router, peers []string) {
} }
} }
func handleHTTP(router *weave.Router) { func handleHTTP(router *weave.Router, httpAddr string) {
encryption := "off" encryption := "off"
if router.UsingPassword() { if router.UsingPassword() {
encryption = "on" encryption = "on"
@@ -174,7 +180,7 @@ func handleHTTP(router *weave.Router) {
muxRouter.Methods("POST").Path("/connect").HandlerFunc(func(w http.ResponseWriter, r *http.Request) { muxRouter.Methods("POST").Path("/connect").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
peer := r.FormValue("peer") peer := r.FormValue("peer")
if addr, err := net.ResolveTCPAddr("tcp4", weave.NormalisePeerAddr(peer)); err == nil { if addr, err := net.ResolveTCPAddr("tcp4", router.NormalisePeerAddr(peer)); err == nil {
router.ConnectionMaker.InitiateConnection(addr.String()) router.ConnectionMaker.InitiateConnection(addr.String())
} else { } else {
http.Error(w, fmt.Sprint("invalid peer address: ", err), http.StatusBadRequest) http.Error(w, fmt.Sprint("invalid peer address: ", err), http.StatusBadRequest)
@@ -183,7 +189,7 @@ func handleHTTP(router *weave.Router) {
muxRouter.Methods("POST").Path("/forget").HandlerFunc(func(w http.ResponseWriter, r *http.Request) { muxRouter.Methods("POST").Path("/forget").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
peer := r.FormValue("peer") peer := r.FormValue("peer")
if addr, err := net.ResolveTCPAddr("tcp4", weave.NormalisePeerAddr(peer)); err == nil { if addr, err := net.ResolveTCPAddr("tcp4", router.NormalisePeerAddr(peer)); err == nil {
router.ConnectionMaker.ForgetConnection(addr.String()) router.ConnectionMaker.ForgetConnection(addr.String())
} else { } else {
http.Error(w, fmt.Sprint("invalid peer address: ", err), http.StatusBadRequest) http.Error(w, fmt.Sprint("invalid peer address: ", err), http.StatusBadRequest)
@@ -192,8 +198,7 @@ func handleHTTP(router *weave.Router) {
http.Handle("/", muxRouter) http.Handle("/", muxRouter)
address := fmt.Sprintf(":%d", weave.HTTPPort) err := http.ListenAndServe(httpAddr, nil)
err := http.ListenAndServe(address, nil)
if err != nil { if err != nil {
log.Fatal("Unable to create http listener: ", err) log.Fatal("Unable to create http listener: ", err)
} }