Merge pull request #407 from awh/369_name_weave_peers

nicknames for weave peers

Closes #369.
This commit is contained in:
rade committed 2015-02-25 18:10:36 +00:00
commit d1400bc233
13 files changed
+84 -45

No files matched your search

+5 -5
View File
@@ -19,7 +19,7 @@ type mockChannelConnection struct {
// We need to create some dummy channels otherwise tests hang on nil // We need to create some dummy channels otherwise tests hang on nil
// channels when Router.OnGossip() calls async methods. // channels when Router.OnGossip() calls async methods.
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)
router.ConnectionMaker.queryChan = make(chan *ConnectionMakerInteraction, ChannelSize) router.ConnectionMaker.queryChan = make(chan *ConnectionMakerInteraction, ChannelSize)
router.Routes.queryChan = make(chan *Interaction, ChannelSize) router.Routes.queryChan = make(chan *Interaction, ChannelSize)
return router return router
@@ -35,8 +35,8 @@ func (router *Router) AddTestChannelConnection(r *Router) {
fromName := router.Ourself.Peer.Name fromName := router.Ourself.Peer.Name
toName := r.Ourself.Peer.Name toName := r.Ourself.Peer.Name
fromPeer := NewPeer(fromName, router.Ourself.Peer.UID, 0) fromPeer := NewPeer(fromName, "", router.Ourself.Peer.UID, 0)
toPeer := NewPeer(toName, r.Ourself.Peer.UID, 0) toPeer := NewPeer(toName, "", r.Ourself.Peer.UID, 0)
r.Peers.FetchWithDefault(fromPeer) // Has side-effect of incrementing refcount r.Peers.FetchWithDefault(fromPeer) // Has side-effect of incrementing refcount
router.Peers.FetchWithDefault(toPeer) // router.Peers.FetchWithDefault(toPeer) //
@@ -70,10 +70,10 @@ func TestGossipTopology(t *testing.T) {
// the routers supplied as arguments, carrying across all UID and // the routers supplied as arguments, carrying across all UID and
// version information. // version information.
func (router *Router) tp(routers ...*Router) *Peer { func (router *Router) tp(routers ...*Router) *Peer {
peer := NewPeer(router.Ourself.Peer.Name, router.Ourself.Peer.UID, 0) peer := NewPeer(router.Ourself.Peer.Name, "", router.Ourself.Peer.UID, 0)
connections := make(map[PeerName]Connection) connections := make(map[PeerName]Connection)
for _, r := range routers { for _, r := range routers {
p := NewPeer(r.Ourself.Peer.Name, r.Ourself.Peer.UID, r.Ourself.Peer.version) p := NewPeer(r.Ourself.Peer.Name, "", r.Ourself.Peer.UID, r.Ourself.Peer.version)
connections[r.Ourself.Peer.Name] = newMockConnection(peer, p) connections[r.Ourself.Peer.Name] = newMockConnection(peer, p)
} }
peer.SetVersionAndConnections(router.Ourself.Peer.version, connections) peer.SetVersionAndConnections(router.Ourself.Peer.version, connections)
+3 -1
View File
@@ -59,6 +59,7 @@ func (conn *LocalConnection) handshake(enc *gob.Encoder, dec *gob.Decoder, accep
"ProtocolVersion": versionStr, "ProtocolVersion": versionStr,
"PeerNameFlavour": PeerNameFlavour, "PeerNameFlavour": PeerNameFlavour,
"Name": conn.local.Name.String(), "Name": conn.local.Name.String(),
"NickName": conn.local.NickName,
"UID": fmt.Sprint(conn.local.UID), "UID": fmt.Sprint(conn.local.UID),
"ConnID": fmt.Sprint(localConnID)} "ConnID": fmt.Sprint(localConnID)}
handshakeRecv := map[string]string{} handshakeRecv := map[string]string{}
@@ -84,6 +85,7 @@ func (conn *LocalConnection) handshake(enc *gob.Encoder, dec *gob.Decoder, accep
fv.CheckEqual("ProtocolVersion", versionStr) fv.CheckEqual("ProtocolVersion", versionStr)
fv.CheckEqual("PeerNameFlavour", PeerNameFlavour) fv.CheckEqual("PeerNameFlavour", PeerNameFlavour)
nameStr, _ := fv.Value("Name") nameStr, _ := fv.Value("Name")
nickNameStr, _ := fv.Value("NickName")
uidStr, _ := fv.Value("UID") uidStr, _ := fv.Value("UID")
remoteConnIdStr, _ := fv.Value("ConnID") remoteConnIdStr, _ := fv.Value("ConnID")
if err := fv.Err(); err != nil { if err := fv.Err(); err != nil {
@@ -136,7 +138,7 @@ func (conn *LocalConnection) handshake(enc *gob.Encoder, dec *gob.Decoder, accep
conn.Decryptor = NewNonDecryptor(conn) conn.Decryptor = NewNonDecryptor(conn)
} }
toPeer := NewPeer(name, uid, 0) toPeer := NewPeer(name, nickNameStr, uid, 0)
toPeer = conn.Router.Peers.FetchWithDefault(toPeer) toPeer = conn.Router.Peers.FetchWithDefault(toPeer)
switch toPeer { switch toPeer {
case nil: case nil:
+2 -2
View File
@@ -18,8 +18,8 @@ type PeerInteraction struct {
payload interface{} payload interface{}
} }
func NewLocalPeer(name PeerName, router *Router) *LocalPeer { func NewLocalPeer(name PeerName, nickName string, router *Router) *LocalPeer {
return &LocalPeer{Peer: NewPeer(name, 0, 0), Router: router} return &LocalPeer{Peer: NewPeer(name, nickName, 0, 0), Router: router}
} }
func (peer *LocalPeer) Start() { func (peer *LocalPeer) Start() {
+3 -3
View File
@@ -12,7 +12,7 @@ import (
// Add to peers a connection from peers.ourself to p // Add to peers a connection from peers.ourself to p
func (peers *Peers) AddTestConnection(p *Peer) { func (peers *Peers) AddTestConnection(p *Peer) {
toPeer := NewPeer(p.Name, p.UID, 0) toPeer := NewPeer(p.Name, "", p.UID, 0)
peers.FetchWithDefault(toPeer) // Has side-effect of incrementing refcount peers.FetchWithDefault(toPeer) // Has side-effect of incrementing refcount
conn := newMockConnection(peers.ourself, toPeer) conn := newMockConnection(peers.ourself, toPeer)
peers.ourself.addConnection(conn) peers.ourself.addConnection(conn)
@@ -22,10 +22,10 @@ func (peers *Peers) AddTestConnection(p *Peer) {
// Add to peers a connection from p1 to p2 // Add to peers a connection from p1 to p2
func (peers *Peers) AddTestRemoteConnection(p1, p2 *Peer) { func (peers *Peers) AddTestRemoteConnection(p1, p2 *Peer) {
fromName := p1.Name fromName := p1.Name
fromPeer := NewPeer(fromName, p1.UID, 0) fromPeer := NewPeer(fromName, "", p1.UID, 0)
fromPeer = peers.FetchWithDefault(fromPeer) fromPeer = peers.FetchWithDefault(fromPeer)
toName := p2.Name toName := p2.Name
toPeer := NewPeer(toName, p2.UID, 0) toPeer := NewPeer(toName, "", p2.UID, 0)
toPeer = peers.FetchWithDefault(toPeer) toPeer = peers.FetchWithDefault(toPeer)
peers.ourself.addConnection(&RemoteConnection{fromPeer, toPeer, "", false}) peers.ourself.addConnection(&RemoteConnection{fromPeer, toPeer, "", false})
} }
+4 -2
View File
@@ -10,19 +10,21 @@ type Peer struct {
sync.RWMutex sync.RWMutex
Name PeerName Name PeerName
NameByte []byte NameByte []byte
NickName string
UID uint64 UID uint64
version uint64 version uint64
localRefCount uint64 localRefCount uint64
connections map[PeerName]Connection connections map[PeerName]Connection
} }
func NewPeer(name PeerName, uid uint64, version uint64) *Peer { func NewPeer(name PeerName, nickName string, uid uint64, version uint64) *Peer {
if uid == 0 { if uid == 0 {
uid = randUint64() uid = randUint64()
} }
return &Peer{ return &Peer{
Name: name, Name: name,
NameByte: name.Bin(), NameByte: name.Bin(),
NickName: nickName,
UID: uid, UID: uid,
version: version, version: version,
connections: make(map[PeerName]Connection)} connections: make(map[PeerName]Connection)}
@@ -31,7 +33,7 @@ func NewPeer(name PeerName, uid uint64, version uint64) *Peer {
func (peer *Peer) String() string { func (peer *Peer) String() string {
peer.RLock() peer.RLock()
defer peer.RUnlock() defer peer.RUnlock()
return fmt.Sprint("Peer ", peer.Name, " (v", peer.version, ") (UID ", peer.UID, ")") return fmt.Sprint("Peer ", peer.Name, " (", peer.NickName, ") (v", peer.version, ") (UID ", peer.UID, ")")
} }
func (peer *Peer) Version() uint64 { func (peer *Peer) Version() uint64 {
+8 -4
View File
@@ -128,7 +128,7 @@ func (peers *Peers) String() string {
if !conn.Established() { if !conn.Established() {
established = " (unestablished)" established = " (unestablished)"
} }
buf.WriteString(fmt.Sprintf(" -> %v [%v%s]\n", remoteName, conn.RemoteTCPAddr(), established)) buf.WriteString(fmt.Sprintf(" -> %v (%v) [%v%s]\n", remoteName, conn.Remote().NickName, conn.RemoteTCPAddr(), established))
}) })
}) })
return buf.String() return buf.String()
@@ -178,7 +178,7 @@ func (peers *Peers) decodeUpdate(update []byte) (newPeers map[PeerName]*Peer, de
decoder := gob.NewDecoder(updateBuf) decoder := gob.NewDecoder(updateBuf)
for { for {
nameByte, uid, version, connsBuf, decErr := decodePeerNoConns(decoder) nameByte, nickName, uid, version, connsBuf, decErr := decodePeerNoConns(decoder)
if decErr == io.EOF { if decErr == io.EOF {
break break
} else if decErr != nil { } else if decErr != nil {
@@ -186,7 +186,7 @@ func (peers *Peers) decodeUpdate(update []byte) (newPeers map[PeerName]*Peer, de
return return
} }
name := PeerNameFromBin(nameByte) name := PeerNameFromBin(nameByte)
newPeer := NewPeer(name, uid, version) newPeer := NewPeer(name, nickName, uid, version)
decodedUpdate = append(decodedUpdate, newPeer) decodedUpdate = append(decodedUpdate, newPeer)
decodedConns = append(decodedConns, connsBuf) decodedConns = append(decodedConns, connsBuf)
existingPeer, found := peers.table[name] existingPeer, found := peers.table[name]
@@ -257,6 +257,7 @@ func (peer *Peer) encode(enc *gob.Encoder) {
defer peer.RUnlock() defer peer.RUnlock()
checkFatal(enc.Encode(peer.NameByte)) checkFatal(enc.Encode(peer.NameByte))
checkFatal(enc.Encode(peer.NickName))
checkFatal(enc.Encode(peer.UID)) checkFatal(enc.Encode(peer.UID))
checkFatal(enc.Encode(peer.version)) checkFatal(enc.Encode(peer.version))
@@ -271,10 +272,13 @@ func (peer *Peer) encode(enc *gob.Encoder) {
checkFatal(enc.Encode(connsBuf.Bytes())) checkFatal(enc.Encode(connsBuf.Bytes()))
} }
func decodePeerNoConns(dec *gob.Decoder) (nameByte []byte, uid uint64, version uint64, conns []byte, err error) { func decodePeerNoConns(dec *gob.Decoder) (nameByte []byte, nickName string, uid uint64, version uint64, conns []byte, err error) {
if err = dec.Decode(&nameByte); err != nil { if err = dec.Decode(&nameByte); err != nil {
return return
} }
if err = dec.Decode(&nickName); err != nil {
return
}
if err = dec.Decode(&uid); err != nil { if err = dec.Decode(&uid); err != nil {
return return
} }
+1 -1
View File
@@ -17,7 +17,7 @@ import (
// - non-gc of peers that are only referenced locally // - non-gc of peers that are only referenced locally
func newNode(name PeerName) (*Peer, *Peers) { func newNode(name PeerName) (*Peer, *Peers) {
peer := NewPeer(name, 0, 0) peer := NewPeer(name, "", 0, 0)
peers := NewPeers(peer, func(*Peer) {}) peers := NewPeers(peer, func(*Peer) {})
peers.FetchWithDefault(peer) peers.FetchWithDefault(peer)
return peer, peers return peer, peers
+1 -1
View File
@@ -2,7 +2,7 @@ package router
const ( const (
Protocol = "weave" Protocol = "weave"
ProtocolVersion = 12 ProtocolVersion = 13
) )
type ProtocolTag byte type ProtocolTag byte
+3 -3
View File
@@ -46,7 +46,7 @@ type PacketSourceSink interface {
PacketSink PacketSink
} }
func NewRouter(iface *net.Interface, name PeerName, 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)) *Router {
router := &Router{ router := &Router{
Iface: iface, Iface: iface,
GossipChannels: make(map[uint32]*GossipChannel), GossipChannels: make(map[uint32]*GossipChannel),
@@ -63,7 +63,7 @@ func NewRouter(iface *net.Interface, name PeerName, password []byte, connLimit i
router.Macs.Delete(peer) router.Macs.Delete(peer)
log.Println("Removed unreachable", peer) log.Println("Removed unreachable", peer)
} }
router.Ourself = NewLocalPeer(name, router) router.Ourself = NewLocalPeer(name, nickName, router)
router.Macs = NewMacCache(macMaxAge, onMacExpiry) router.Macs = NewMacCache(macMaxAge, onMacExpiry)
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)
@@ -94,7 +94,7 @@ func (router *Router) UsingPassword() bool {
func (router *Router) Status() string { func (router *Router) Status() string {
var buf bytes.Buffer var buf bytes.Buffer
buf.WriteString(fmt.Sprintln("Our name is", router.Ourself.Name)) buf.WriteString(fmt.Sprintln("Our name is", router.Ourself.Name, "(" + router.Ourself.NickName + ")"))
buf.WriteString(fmt.Sprintln("Sniffing traffic on", router.Iface)) buf.WriteString(fmt.Sprintln("Sniffing traffic on", router.Iface))
buf.WriteString(fmt.Sprintf("MACs:\n%s", router.Macs)) buf.WriteString(fmt.Sprintf("MACs:\n%s", router.Macs))
buf.WriteString(fmt.Sprintf("Peers:\n%s", router.Peers)) buf.WriteString(fmt.Sprintf("Peers:\n%s", router.Peers))
+6 -1
View File
@@ -7,7 +7,8 @@ layout: default
A weave network consists of a number of 'peers' - weave routers A weave network consists of a number of 'peers' - weave routers
residing on different hosts. Each peer has a name, which tends to residing on different hosts. Each peer has a name, which tends to
remain the same over restarts, and a unique identifier (UID) which is remain the same over restarts, a human friendly nickname for use in
status and logging output and a unique identifier (UID) which is
different each time it is run. These are opaque identifiers as far as different each time it is run. These are opaque identifiers as far as
the router is concerned, although the name defaults to a MAC address. the router is concerned, although the name defaults to a MAC address.
@@ -147,6 +148,8 @@ The topology update payload is laid out like this:
+-----------------------------------+ +-----------------------------------+
| Peer 1: Name | | Peer 1: Name |
+-----------------------------------+ +-----------------------------------+
| Peer 1: NickName |
+-----------------------------------+
| Peer 1: UID | | Peer 1: UID |
+-----------------------------------+ +-----------------------------------+
| Peer 1: Version number | | Peer 1: Version number |
@@ -157,6 +160,8 @@ The topology update payload is laid out like this:
+-----------------------------------+ +-----------------------------------+
| Peer N: Name | | Peer N: Name |
+-----------------------------------+ +-----------------------------------+
| Peer N: NickName |
+-----------------------------------+
| Peer N: UID | | Peer N: UID |
+-----------------------------------+ +-----------------------------------+
| Peer N: Version number | | Peer N: Version number |
+16 -12
View File
@@ -58,7 +58,7 @@ This produces output like:
```` ````
weave router 0.7.0 weave router 0.7.0
Encryption off Encryption off
Our name is 7a:f4:56:87:76:3b Our name is 7a:f4:56:87:76:3b (weave01)
Sniffing traffic on &{39 65535 ethwe ae:e3:07:9c:8c:d4 up|broadcast|multicast} Sniffing traffic on &{39 65535 ethwe ae:e3:07:9c:8c:d4 up|broadcast|multicast}
MACs: MACs:
ba:8c:b9:dc:e1:c9 -> 7a:f4:56:87:76:3b (2014-10-23 16:39:19.482338935 +0000 UTC) ba:8c:b9:dc:e1:c9 -> 7a:f4:56:87:76:3b (2014-10-23 16:39:19.482338935 +0000 UTC)
@@ -67,10 +67,10 @@ ce:15:34:a9:b5:6d -> 7a:f4:56:87:76:3b (2014-10-23 16:39:28.257103595 +0000 UTC)
9e:95:0c:54:8e:39 -> 7a:16:dd:5b:83:de (2014-10-23 16:39:28.795601325 +0000 UTC) 9e:95:0c:54:8e:39 -> 7a:16:dd:5b:83:de (2014-10-23 16:39:28.795601325 +0000 UTC)
72:5f:a4:60:e5:ce -> 7a:16:dd:5b:83:de (2014-10-23 16:39:29.575995255 +0000 UTC) 72:5f:a4:60:e5:ce -> 7a:16:dd:5b:83:de (2014-10-23 16:39:29.575995255 +0000 UTC)
Peers: Peers:
Peer 7a:16:dd:5b:83:de (v31) (UID 13151318985609435078) Peer 7a:16:dd:5b:83:de (weave02) (v31) (UID 13151318985609435078)
-> 7a:f4:56:87:76:3b [37.157.33.76:7195] -> 7a:f4:56:87:76:3b (weave01) [37.157.33.76:7195]
Peer 7a:f4:56:87:76:3b (v1) (UID 6913268221365110570) Peer 7a:f4:56:87:76:3b (weave01) (v1) (UID 6913268221365110570)
-> 7a:16:dd:5b:83:de [191.235.147.190:6783] -> 7a:16:dd:5b:83:de (weave02) [191.235.147.190:6783]
Routes: Routes:
unicast: unicast:
7a:f4:56:87:76:3b -> 00:00:00:00:00:00 7a:f4:56:87:76:3b -> 00:00:00:00:00:00
@@ -86,7 +86,10 @@ The terms used here are explained further at
[how it works](how-it-works.html). [how it works](how-it-works.html).
The 'Our name' line identifies the local weave router as a peer in the The 'Our name' line identifies the local weave router as a peer in the
weave network. weave network, displaying the peer name followed by the peer's nickname
in parenthesis. The nickname defaults to the name of the host on which
the weave container was launched; if desired it can be overriden by
supplying the `-nickname` argument to `weave launch`.
The 'Sniffing traffic' line shows details of the virtual ethernet The 'Sniffing traffic' line shows details of the virtual ethernet
interface that weave is using to receive packets on the local interface that weave is using to receive packets on the local
@@ -100,12 +103,13 @@ router last saw some traffic from that MAC. The router forgets
addresses which are inactive for longer than 10 minutes. addresses which are inactive for longer than 10 minutes.
The 'Peers' section lists all peers known to this router, including The 'Peers' section lists all peers known to this router, including
itself. Each peer is shown with its name, version number (incremented itself. Each peer is shown with its name, nickname, version number
on each reconnect) and the UID. Then each line beginning `->` shows (incremented on each reconnect) and the UID. Then each line
another peer that it is connected to, with the IP address and port beginning `->` shows another peer that it is connected to, with the
number of the connection. In the above example, the local router has IP address and port number of the connection. In the above example,
connected to its peer using address 191.235.147.190:6783, and its peer the local router has connected to its peer using address
sees the same connection as coming from 37.157.33.76:7195. 191.235.147.190:6783, and its peer sees the same connection as coming
from 37.157.33.76:7195.
The 'Routes' section summarised the information for deciding how to The 'Routes' section summarised the information for deciding how to
route packets between peers, which is mostly of interest when the route packets between peers, which is mostly of interest when the
+21 -8
View File
@@ -6,7 +6,7 @@ SCRIPT_VERSION="(unreleased version)"
usage() { usage() {
echo "Usage:" echo "Usage:"
echo "weave setup" echo "weave setup"
echo "weave launch [-password <password>] <peer> ..." echo "weave launch [-password <password>] [-nickname <nickname>] <peer> ..."
echo "weave launch-dns <cidr>" echo "weave launch-dns <cidr>"
echo "weave connect <peer>" echo "weave connect <peer>"
echo "weave run [--with-dns] <cidr> <docker run args> ..." echo "weave run [--with-dns] <cidr> <docker run args> ..."
@@ -475,18 +475,31 @@ case "$COMMAND" in
echo "WARNING: $1 parameter ignored; 'weave launch' no longer takes a CIDR as the first parameter" >&2 echo "WARNING: $1 parameter ignored; 'weave launch' no longer takes a CIDR as the first parameter" >&2
shift 1 shift 1
fi fi
if [ "$1" = "-password" ] ; then NICKNAME=$(hostname)
[ $# -gt 1 ] || usage while true; do
WEAVE_PASSWORD="$2" case "$1" in
export WEAVE_PASSWORD -password)
shift 2 [ $# -gt 1 ] || usage
fi WEAVE_PASSWORD="$2"
export WEAVE_PASSWORD
shift 2
;;
-nickname)
[ $# -gt 1 ] || usage
NICKNAME="$2"
shift 2
;;
*)
break
;;
esac
done
# Set WEAVE_DOCKER_ARGS in the environment in order to supply # Set WEAVE_DOCKER_ARGS in the environment in order to supply
# additional parameters, such as resource limits, to docker # additional parameters, such as resource limits, to docker
# when launching the weave container. # when launching the weave container.
CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME \ CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME \
-p $PORT:$PORT/tcp -p $PORT:$PORT/udp -e WEAVE_PASSWORD \ -p $PORT:$PORT/tcp -p $PORT:$PORT/udp -e WEAVE_PASSWORD \
$WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR -iface $CONTAINER_IFNAME "$@") $WEAVE_DOCKER_ARGS $IMAGE -iface $CONTAINER_IFNAME -name $MACADDR -nickname "$NICKNAME" "$@")
with_container_netns $CONTAINER launch >/dev/null with_container_netns $CONTAINER launch >/dev/null
echo $CONTAINER echo $CONTAINER
;; ;;
+11 -2
View File
@@ -37,6 +37,7 @@ func main() {
justVersion bool justVersion bool
ifaceName string ifaceName string
routerName string routerName string
nickName string
password string password string
wait int wait int
debug bool debug bool
@@ -49,6 +50,7 @@ func main() {
flag.BoolVar(&justVersion, "version", false, "print version and exit") flag.BoolVar(&justVersion, "version", false, "print version and exit")
flag.StringVar(&ifaceName, "iface", "", "name of interface to read from") flag.StringVar(&ifaceName, "iface", "", "name of interface to read from")
flag.StringVar(&routerName, "name", "", "name of router (defaults to MAC)") flag.StringVar(&routerName, "name", "", "name of router (defaults to MAC)")
flag.StringVar(&nickName, "nickname", "", "nickname of peer (defaults to hostname)")
flag.StringVar(&password, "password", "", "network password") flag.StringVar(&password, "password", "", "network password")
flag.IntVar(&wait, "wait", 0, "number of seconds to wait for interface to be created and come up (defaults to 0, i.e. don't wait)") flag.IntVar(&wait, "wait", 0, "number of seconds to wait for interface to be created and come up (defaults to 0, i.e. don't wait)")
flag.BoolVar(&debug, "debug", false, "enable debug logging") flag.BoolVar(&debug, "debug", false, "enable debug logging")
@@ -87,6 +89,13 @@ func main() {
routerName = iface.HardwareAddr.String() routerName = iface.HardwareAddr.String()
} }
if nickName == "" {
nickName, err = os.Hostname()
if err != nil {
log.Fatal(err)
}
}
ourName, err := weave.PeerNameFromUserInput(routerName) ourName, err := weave.PeerNameFromUserInput(routerName)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@@ -121,8 +130,8 @@ func main() {
defer profile.Start(&p).Stop() defer profile.Start(&p).Stop()
} }
router := weave.NewRouter(iface, ourName, []byte(password), connLimit, bufSz*1024*1024, logFrame) router := weave.NewRouter(iface, ourName, nickName, []byte(password), connLimit, bufSz*1024*1024, logFrame)
log.Println("Our name is", router.Ourself.Name) log.Println("Our name is", router.Ourself.Name, "("+router.Ourself.NickName+")")
router.Start() router.Start()
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", weave.NormalisePeerAddr(peer)); err == nil {