[WIP] Data model for details pane

.travis.yml

@@ -16,6 +16,7 @@ install:
   - go install -tags netgo std
   - pip install --user --upgrade gcloud gsutil
   - bin/setup-ci-secrets $encrypted_5ba036e89377_key $encrypted_5ba036e89377_iv
+  - cd ..; git clone ssh://git@github.com/weaveworks/procspy.git; cd scope
   - make travis
 
 script:

Makefile

@@ -48,8 +48,8 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE): common/*.go
 $(WEAVER_EXE): router/*.go weaver/main.go
 $(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go
 $(SIGPROXY_EXE): sigproxy/main.go
-$(SCOPEAPP_EXE): scope/app/*.go
-$(SCOPEPROBE_EXE): scope/probe/*.go
+$(SCOPEAPP_EXE): scope/app/*.go scope/xfer/*.go scope/report/*.go
+$(SCOPEPROBE_EXE): scope/probe/*.go scope/xfer/*.go scope/report/*.go
 
 # Sigproxy etc needs separate rule as it fails the netgo check in the main
 # build stanza due to not importing net package

README.md

@@ -103,7 +103,7 @@ Note that we could instead have told the weave on `$HOST1` to connect to
 weave automatically (re)connects to peers when they become
 available. Also, we can tell weave to connect to multiple peers by
 supplying multiple addresses, separated by spaces. And we can
-[add peers dynamically](http://weaveworks.github.io/weave/features.html#dynamic-topologies).
+[add peers dynamically](http://docs.weave.works/weave/latest_release/features.html#dynamic-topologies).
 
 Now that we've got everything set up, let's see whether our containers
 can talk to each other...
@@ -131,12 +131,12 @@ to each other.
 
 ## Find out more
 
- * [Documentation homepage](http://weaveworks.github.io/weave/)
- * [Features](http://weaveworks.github.io/weave/features.html)
- * [Troubleshooting](http://weaveworks.github.io/weave/troubleshooting.html)
- * [Building](http://weaveworks.github.io/weave/building.html)
- * [How it works](http://weaveworks.github.io/weave/how-it-works.html)
- * [Automatic Discovery with WeaveDNS](https://github.com/weaveworks/weave/tree/master/weavedns#readme)
+ * [Documentation homepage](http://docs.weave.works/weave/latest_release/)
+ * [Features](http://docs.weave.works/weave/latest_release/features.html)
+ * [Troubleshooting](http://docs.weave.works/weave/latest_release/troubleshooting.html)
+ * [Building](http://docs.weave.works/weave/latest_release/building.html)
+ * [How it works](http://docs.weave.works/weave/latest_release/how-it-works.html)
+ * [Automatic Discovery with WeaveDNS](https://github.com/weaveworks/weave/tree/latest_release/weavedns#readme)
 
 ## Contact Us
 

bin/multiweave

@@ -14,14 +14,23 @@ set -e
 START=${FIRST_WEAVE:-1}
 COUNT=${NUM_WEAVES:-28}
 FINISH=$((START+COUNT-1))
+PORT=6783
 
 weavedir=$(dirname $0)/..
 
+# Generate a random MAC value - copied from 'weave' script
+random_mac() {
+    # In the first byte of the MAC, the 'multicast' bit should be
+    # clear and 'locally administered' bit should be set.  All other
+    # bits should be random.
+    od -txC -An -N6 /dev/urandom | sed 's|^ ||;s| |:|;s|[0-3]:|2:|;s|[4-7]:|6:|;s|[89ab]:|a:|;s|[c-f]:|e:|;s| |:|g'
+}
+
 case "$1" in
     launch)
         shift 1
         for i in $(seq $START $FINISH); do
-            WEAVE_CONTAINER_NAME=weave$i $weavedir/weave test-launch "$@"
+            WEAVE_CONTAINER_NAME=weave$i WEAVE_PORT=$((5000+i)) $weavedir/weave launch -iface '' -name $(random_mac) -nickname weave$i -port $PORT "$@"
         done
         if [ $START -ne 1 ] ; then
             status=$(docker inspect --format='{{.State.Running}} {{.NetworkSettings.IPAddress}}' weave$((START-1)))

nameserver/addrs.go

@@ -51,22 +51,22 @@ func (r Record) Priority() int { return r.priority }
 func (r Record) Weight() int   { return r.weight }
 func (r Record) TTL() int      { return r.ttl }
 
-func (i Record) String() string {
+func (r Record) String() string {
 	var buf bytes.Buffer
-	if len(i.Name()) > 0 {
-		fmt.Fprintf(&buf, "%s", i.Name())
+	if len(r.Name()) > 0 {
+		fmt.Fprintf(&buf, "%s", r.Name())
 	}
-	if !i.IP().IsUnspecified() {
-		fmt.Fprintf(&buf, "[%s]", i.IP())
+	if !r.IP().IsUnspecified() {
+		fmt.Fprintf(&buf, "[%s]", r.IP())
 	}
-	if i.Priority() > 0 {
-		fmt.Fprintf(&buf, "/P:%d", i.Priority())
+	if r.Priority() > 0 {
+		fmt.Fprintf(&buf, "/P:%d", r.Priority())
 	}
-	if i.Weight() > 0 {
-		fmt.Fprintf(&buf, "/W:%d", i.Weight())
+	if r.Weight() > 0 {
+		fmt.Fprintf(&buf, "/W:%d", r.Weight())
 	}
-	if i.TTL() > 0 {
-		fmt.Fprintf(&buf, "/TTL:%d", i.TTL())
+	if r.TTL() > 0 {
+		fmt.Fprintf(&buf, "/TTL:%d", r.TTL())
 	}
 
 	return buf.String()

nameserver/mdns_client.go

@@ -54,19 +54,19 @@ func (r Response) Equal(r2 *Response) bool {
 	return true
 }
 
-func (i Response) String() string {
+func (r Response) String() string {
 	var buf bytes.Buffer
-	if i.err != nil {
-		fmt.Fprintf(&buf, "%s", i.err)
+	if r.err != nil {
+		fmt.Fprintf(&buf, "%s", r.err)
 	} else {
-		if len(i.Name()) > 0 {
-			fmt.Fprintf(&buf, "%s", i.Name())
+		if len(r.Name()) > 0 {
+			fmt.Fprintf(&buf, "%s", r.Name())
 		}
-		if !i.IP().IsUnspecified() {
-			fmt.Fprintf(&buf, "[%s]", i.IP())
+		if !r.IP().IsUnspecified() {
+			fmt.Fprintf(&buf, "[%s]", r.IP())
 		}
-		if i.ttl > 0 {
-			fmt.Fprintf(&buf, "(TTL:%d)", i.TTL())
+		if r.ttl > 0 {
+			fmt.Fprintf(&buf, "(TTL:%d)", r.TTL())
 		}
 	}
 	return buf.String()
@@ -214,7 +214,7 @@ func (c *MDNSClient) ResponseCallback(r *dns.Msg) {
 			}
 
 			if query, found := c.inflight[name]; found {
-				newResponseInfos := make([]*responseInfo, 0)
+				var newResponseInfos []*responseInfo
 				for _, resp := range query.responseInfos {
 					resp.ch <- res
 					// insistent queries are not removed on the first reply, but on the timeout

nameserver/mdns_lookup.go

@@ -6,7 +6,7 @@ import (
 )
 
 func mdnsLookup(client *MDNSClient, name string, qtype uint16, insistent bool) ([]ZoneRecord, error) {
-	responses := make([]*Response, 0)
+	var responses []*Response
 	channel := make(chan *Response)
 	client.SendQuery(name, qtype, insistent, channel)
 

nameserver/mdns_server_test.go

@@ -26,7 +26,7 @@ func TestServerSimpleQuery(t *testing.T) {
 	wt.AssertNoErr(t, err)
 	defer mdnsServer.Stop()
 
-	receivedAddrs := make([]net.IP, 0)
+	var receivedAddrs []net.IP
 	receivedName := ""
 	recvChan := make(chan interface{})
 	receivedCount := 0

nameserver/mocks_test.go

@@ -34,8 +34,8 @@ func (mz *mockedZoneWithRecords) LookupName(name string) ([]ZoneRecord, error) {
 	mz.Lock()
 	defer mz.Unlock()
 
-	mz.NumLookupsName += 1
-	res := make([]ZoneRecord, 0)
+	mz.NumLookupsName++
+	var res []ZoneRecord
 	for _, r := range mz.records {
 		if r.Name() == name {
 			res = append(res, r)
@@ -49,8 +49,8 @@ func (mz *mockedZoneWithRecords) LookupInaddr(inaddr string) ([]ZoneRecord, erro
 	mz.Lock()
 	defer mz.Unlock()
 
-	mz.NumLookupsInaddr += 1
-	res := make([]ZoneRecord, 0)
+	mz.NumLookupsInaddr++
+	var res []ZoneRecord
 	for _, r := range mz.records {
 		revIP, err := raddrToIP(inaddr)
 		if err != nil {

nameserver/server.go

@@ -215,11 +215,11 @@ func (s *DNSServer) Stop() error {
 
 func (s *DNSServer) queryHandler(proto dnsProtocol) dns.HandlerFunc {
 	zoneLookup := func(lookup ZoneLookup, q *dns.Question, r *dns.Msg) (*dns.Msg, []ZoneRecord, error) {
-		if ips, err := lookup.LookupName(q.Name); err != nil {
+		ips, err := lookup.LookupName(q.Name)
+		if err != nil {
 			return nil, nil, err
-		} else {
-			return makeAddressReply(r, q, ips), ips, nil
 		}
+		return makeAddressReply(r, q, ips), ips, nil
 	}
 
 	fallback := func(w dns.ResponseWriter, r *dns.Msg) {
@@ -231,11 +231,11 @@ func (s *DNSServer) queryHandler(proto dnsProtocol) dns.HandlerFunc {
 
 func (s *DNSServer) rdnsHandler(proto dnsProtocol) dns.HandlerFunc {
 	zoneLookup := func(lookup ZoneLookup, q *dns.Question, r *dns.Msg) (*dns.Msg, []ZoneRecord, error) {
-		if names, err := lookup.LookupInaddr(q.Name); err != nil {
+		names, err := lookup.LookupInaddr(q.Name)
+		if err != nil {
 			return nil, nil, err
-		} else {
-			return makePTRReply(r, q, names), names, nil
 		}
+		return makePTRReply(r, q, names), names, nil
 	}
 
 	notUsHandler := s.notUsHandler(proto)

router/connection.go

@@ -82,17 +82,17 @@ func (conn *RemoteConnection) BreakTie(Connection) ConnectionTieBreak { return T
 func (conn *RemoteConnection) Shutdown(error)                         {}
 
 func (conn *RemoteConnection) Log(args ...interface{}) {
-	log.Println(append(append([]interface{}{}, fmt.Sprintf("->[%s|%s]:", conn.remoteTCPAddr, conn.remote.FullName())), args...)...)
+	log.Println(append(append([]interface{}{}, fmt.Sprintf("->[%s|%s]:", conn.remoteTCPAddr, conn.remote)), args...)...)
 }
 
 func (conn *RemoteConnection) String() string {
 	from := "<nil>"
 	if conn.local != nil {
-		from = conn.local.FullName()
+		from = conn.local.String()
 	}
 	to := "<nil>"
 	if conn.remote != nil {
-		to = conn.remote.FullName()
+		to = conn.remote.String()
 	}
 	return fmt.Sprint("Connection ", from, "->", to)
 }
@@ -231,7 +231,7 @@ func (conn *LocalConnection) ReceivedHeartbeat(remoteUDPAddr *net.UDPAddr, connU
 		if oldRemoteUDPAddr == nil {
 			return conn.sendFastHeartbeats()
 		} else if oldRemoteUDPAddr.String() != remoteUDPAddr.String() {
-			log.Println("Peer", conn.remote.FullName(), "moved from", old, "to", remoteUDPAddr)
+			log.Println("Peer", conn.remote, "moved from", old, "to", remoteUDPAddr)
 		}
 		return nil
 	})

router/handshake.go

@@ -76,7 +76,7 @@ func (conn *LocalConnection) handshake(enc *gob.Encoder, dec *gob.Decoder, accep
 		}
 	}
 	if existingConn, found := conn.local.ConnectionTo(name); found && existingConn.Established() {
-		return fmt.Errorf("Already have connection to %s at %s", existingConn.Remote().FullName(), existingConn.RemoteTCPAddr())
+		return fmt.Errorf("Already have connection to %s at %s", existingConn.Remote(), existingConn.RemoteTCPAddr())
 	}
 	uid, err := strconv.ParseUint(uidStr, 10, 64)
 	if err != nil {

router/local_peer.go

@@ -38,7 +38,7 @@ func (peer *LocalPeer) Relay(srcPeer, dstPeer *Peer, df bool, frame []byte, dec
 	if !found {
 		// Not necessarily an error as there could be a race with the
 		// dst disappearing whilst the frame is in flight
-		log.Println("Received packet for unknown destination:", dstPeer.FullName())
+		log.Println("Received packet for unknown destination:", dstPeer)
 		return nil
 	}
 	conn, found := peer.ConnectionTo(relayPeerName)
@@ -162,7 +162,7 @@ func (peer *LocalPeer) handleAddConnection(conn Connection) error {
 		log.Fatal("Attempt made to add connection to peer with unknown remote peer")
 	}
 	toName := conn.Remote().Name
-	dupErr := fmt.Errorf("Multiple connections to %s added to %s", conn.Remote().FullName(), peer.FullName())
+	dupErr := fmt.Errorf("Multiple connections to %s added to %s", conn.Remote(), peer.String())
 	// deliberately non symmetrical
 	if dupConn, found := peer.connections[toName]; found {
 		if dupConn == conn {

router/mac_cache.go

@@ -89,7 +89,7 @@ func (cache *MacCache) String() string {
 	cache.RLock()
 	defer cache.RUnlock()
 	for key, entry := range cache.table {
-		fmt.Fprintf(&buf, "%v -> %s (%v)\n", intmac(key), entry.peer.FullName(), entry.lastSeen)
+		fmt.Fprintf(&buf, "%v -> %s (%v)\n", intmac(key), entry.peer, entry.lastSeen)
 	}
 	return buf.String()
 }

router/peer.go

@@ -33,13 +33,13 @@ func NewPeer(name PeerName, nickName string, uid uint64, version uint64) *Peer {
 }
 
 func (peer *Peer) String() string {
-	peer.RLock()
-	defer peer.RUnlock()
-	return fmt.Sprint(peer.FullName(), " (v", peer.version, ") (UID ", peer.UID, ")")
+	return fmt.Sprint(peer.Name, "(", peer.NickName, ")")
 }
 
-func (peer *Peer) FullName() string {
-	return fmt.Sprint(peer.Name, "(", peer.NickName, ")")
+func (peer *Peer) Info() string {
+	peer.RLock()
+	defer peer.RUnlock()
+	return fmt.Sprint(peer.String(), " (v", peer.version, ") (UID ", peer.UID, ")")
 }
 
 func (peer *Peer) Version() uint64 {

router/peer_name_hash.go

@@ -2,6 +2,7 @@
 
 // Let peer names be sha256 hashes...of anything (as long as it's
 // unique).
+
 package router
 
 import (

router/peer_name_mac.go

@@ -14,6 +14,7 @@
 // Note that we do not mandate *what* MAC should be used as the peer
 // name. In particular it doesn't actually have to be the MAC of, say,
 // the network interface the peer is sniffing on.
+
 package router
 
 import (

router/peers.go

@@ -150,13 +150,13 @@ func (peers *Peers) GarbageCollect() []*Peer {
 func (peers *Peers) String() string {
 	var buf bytes.Buffer
 	peers.ForEach(func(peer *Peer) {
-		fmt.Fprint(&buf, peer, "\n")
+		fmt.Fprintln(&buf, peer.Info())
 		for conn := range peer.Connections() {
 			established := ""
 			if !conn.Established() {
 				established = " (unestablished)"
 			}
-			fmt.Fprintf(&buf, "   -> %s [%v%s]\n", conn.Remote().FullName(), conn.RemoteTCPAddr(), established)
+			fmt.Fprintf(&buf, "   -> %s [%v%s]\n", conn.Remote(), conn.RemoteTCPAddr(), established)
 		}
 	})
 	return buf.String()

router/router.go

@@ -56,11 +56,11 @@ type PacketSourceSink interface {
 func NewRouter(config RouterConfig, name PeerName, nickName string) *Router {
 	router := &Router{RouterConfig: config, GossipChannels: make(map[uint32]*GossipChannel)}
 	onMacExpiry := func(mac net.HardwareAddr, peer *Peer) {
-		log.Println("Expired MAC", mac, "at", peer.FullName())
+		log.Println("Expired MAC", mac, "at", peer)
 	}
 	onPeerGC := func(peer *Peer) {
 		router.Macs.Delete(peer)
-		log.Println("Removed unreachable peer", peer.FullName())
+		log.Println("Removed unreachable peer", peer)
 	}
 	router.Ourself = NewLocalPeer(name, nickName, router)
 	router.Macs = NewMacCache(macMaxAge, onMacExpiry)
@@ -95,7 +95,7 @@ func (router *Router) Start() {
 }
 
 func (router *Router) Stop() error {
-	// TODO: perform greceful shutdown...
+	// TODO: perform graceful shutdown...
 	return nil
 }
 
@@ -105,7 +105,7 @@ func (router *Router) UsingPassword() bool {
 
 func (router *Router) Status() string {
 	var buf bytes.Buffer
-	fmt.Fprintln(&buf, "Our name is", router.Ourself.FullName())
+	fmt.Fprintln(&buf, "Our name is", router.Ourself)
 	fmt.Fprintln(&buf, "Sniffing traffic on", router.Iface)
 	fmt.Fprintf(&buf, "MACs:\n%s", router.Macs)
 	fmt.Fprintf(&buf, "Peers:\n%s", router.Peers)
@@ -328,7 +328,7 @@ func (router *Router) handleUDPPacketFunc(relayConn *LocalConnection, dec *Ether
 		dstMac := dec.eth.DstMAC
 
 		if router.Macs.Enter(srcMac, srcPeer) {
-			log.Println("Discovered remote MAC", srcMac, "at", srcPeer.FullName())
+			log.Println("Discovered remote MAC", srcMac, "at", srcPeer)
 		}
 		if po != nil {
 			router.LogFrame("Injecting", frame, &dec.eth)