Merge branch 'master' of github.com:gophergala2016/meshbird

enricomariafusi · Jan 24, 2016 · 2cfd197 · 2cfd197
2 parents c63eedc + 1061736
commit 2cfd197
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/common/net_table.go b/common/net_table.go
@@ -164,6 +164,16 @@ func (nt *NetTable) SendPacket(dstIP net.IP, payload []byte) {
 	}
 }
 
+func (nt *NetTable) PeerAddresses() map[string]string {
+	nt.lock.Lock()
+	defer nt.lock.Unlock()
+	peers := make(map[string]string)
+	for l, peer := range nt.peers {
+		peers[l] = peer.publicAddress
+	}
+	return peers
+}
+
 func (nt *NetTable) knownHosts() []string {
 	nt.lock.Lock()
 	defer nt.lock.Unlock()

diff --git a/network/protocol/protocol.go b/network/protocol/protocol.go
@@ -116,7 +116,8 @@ func Decode(r io.Reader) (*Packet, error) {
 
 	remainLength := int(pack.Head.Length) - 1 // minus type
 
-	if TypeHandshake != pack.Data.Type && TypeOk != pack.Data.Type && TypePeerInfo != pack.Data.Type && TypeHeartbeat != pack.Data.Type {
+	// Only `TypeTransfer` has vector
+	if TypeTransfer == pack.Data.Type {
 		vector := make([]byte, bodyVectorLen)
 		if n, err := r.Read(vector); err != nil || n != bodyVectorLen {
 			if n != bodyVectorLen {