From 68216245c685d65c5192f611d5b71f1743f90c22 Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Sun, 14 Sep 2014 05:24:59 -0700
Subject: [PATCH] fix(net) use NetMessage interface

---
 net/interface.go  | 2 +-
 net/net.go        | 2 +-
 net/swarm/conn.go | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/interface.go b/net/interface.go
index f5934a7e1..6f1539836 100644
--- a/net/interface.go
+++ b/net/interface.go
@@ -26,7 +26,7 @@ type Network interface {
 	GetProtocols() *mux.ProtocolMap
 
 	// SendMessage sends given Message out
-	SendMessage(*msg.Message) error
+	SendMessage(msg.NetMessage) error
 
 	// Close terminates all network operation
 	Close() error
diff --git a/net/net.go b/net/net.go
index a6361d9b6..e080ff97c 100644
--- a/net/net.go
+++ b/net/net.go
@@ -86,7 +86,7 @@ func (n *IpfsNetwork) GetProtocols() *mux.ProtocolMap {
 }
 
 // SendMessage sends given Message out
-func (n *IpfsNetwork) SendMessage(m *msg.Message) error {
+func (n *IpfsNetwork) SendMessage(m msg.NetMessage) error {
 	n.swarm.Outgoing <- m
 	return nil
 }
diff --git a/net/swarm/conn.go b/net/swarm/conn.go
index 9be46fd70..93bee663d 100644
--- a/net/swarm/conn.go
+++ b/net/swarm/conn.go
@@ -153,7 +153,7 @@ func (s *Swarm) fanOut() {
 			}
 
 			s.connsLock.RLock()
-			conn, found := s.conns[msg.Peer.Key()]
+			conn, found := s.conns[msg.Peer().Key()]
 			s.connsLock.RUnlock()
 
 			if !found {
@@ -164,7 +164,7 @@ func (s *Swarm) fanOut() {
 			}
 
 			// queue it in the connection's buffer
-			conn.Outgoing.MsgChan <- msg.Data
+			conn.Outgoing.MsgChan <- msg.Data()
 		}
 	}
 }
@@ -189,7 +189,7 @@ func (s *Swarm) fanIn(c *conn.Conn) {
 				goto out
 			}
 
-			msg := &msg.Message{Peer: c.Peer, Data: data}
+			msg := msg.New(c.Peer, data)
 			s.Incoming <- msg
 		}
 	}