swarm connection using msgio

http://github.com/jbenet/msgio

swarm/conn.go

+package swarm
+
+import (
+  "fmt"
+  "net"
+  ma "github.com/jbenet/go-multiaddr"
+  peer "github.com/jbenet/go-ipfs/peer"
+  msgio "github.com/jbenet/go-msgio"
+)
+
+const ChanBuffer = 10
+
+type Conn struct {
+  Peer *peer.Peer
+  Addr *ma.Multiaddr
+  Conn net.Conn
+
+  Closed chan bool
+  Outgoing *msgio.Chan
+  Incoming *msgio.Chan
+}
+
+
+func Dial(network string, peer *peer.Peer) (*Conn, error) {
+  addr := peer.NetAddress(network)
+  if addr == nil {
+    return nil, fmt.Errorf("No address for network %s", network)
+  }
+
+  network, host, err := addr.DialArgs()
+  if err != nil {
+    return nil, err
+  }
+
+  nconn, err := net.Dial(network, host)
+  if err != nil {
+    return nil, err
+  }
+
+  out := msgio.NewChan(10)
+  inc := msgio.NewChan(10)
+
+  conn := &Conn{
+    Peer: peer,
+    Addr: addr,
+    Conn: nconn,
+
+    Outgoing: out,
+    Incoming: inc,
+    Closed: make(chan bool, 1),
+  }
+
+  go out.WriteTo(nconn)
+  go inc.ReadFrom(nconn, 1 << 12)
+
+  return conn, nil
+}
+
+func (s *Conn) Close() error {
+  if s.Conn == nil {
+    return fmt.Errorf("Already closed.") // already closed
+  }
+
+  // closing net connection
+  err := s.Conn.Close()
+  s.Conn = nil
+  // closing channels
+  s.Incoming.Close()
+  s.Outgoing.Close()
+  s.Closed<- true
+  return err
+}

swarm/conn_test.go

+package swarm
+
+import (
+  "fmt"
+  "net"
+  "testing"
+  ma "github.com/jbenet/go-multiaddr"
+  mh "github.com/jbenet/go-multihash"
+  peer "github.com/jbenet/go-ipfs/peer"
+)
+
+func setupPeer(id string, addr string) (*peer.Peer, error) {
+  tcp, err := ma.NewMultiaddr(addr)
+  if err != nil {
+    return nil, err
+  }
+
+  mh, err := mh.FromHexString(id)
+  if err != nil {
+    return nil, err
+  }
+
+  p := &peer.Peer{Id: peer.PeerId(mh)}
+  p.AddAddress(tcp)
+  return p, nil
+}
+
+func echoListen(listener *net.TCPListener) {
+  for {
+    c, err := listener.Accept()
+    if err == nil {
+      fmt.Println("accepeted")
+      go echo(c)
+    }
+  }
+}
+
+func echo(c net.Conn) {
+  for {
+    data := make([]byte, 1024)
+    i, err := c.Read(data)
+    if err != nil {
+      fmt.Printf("error %v\n", err)
+      return
+    }
+    _, err = c.Write(data[:i])
+    if err != nil {
+      fmt.Printf("error %v\n", err)
+      return
+    }
+    fmt.Println("echoing", data[:i])
+  }
+}
+
+func TestDial(t *testing.T) {
+
+  listener, err := net.Listen("tcp", "127.0.0.1:1234")
+  if err != nil {
+    t.Fatal("error setting up listener", err)
+  }
+  go echoListen(listener.(*net.TCPListener))
+
+  p, err := setupPeer("11140beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33", "/ip4/127.0.0.1/tcp/1234")
+  if err != nil {
+    t.Fatal("error setting up peer", err)
+  }
+
+  c, err := Dial("tcp", p)
+  if err != nil {
+    t.Fatal("error dialing peer", err)
+  }
+
+
+  fmt.Println("sending")
+  c.Outgoing.MsgChan<- []byte("beep")
+  c.Outgoing.MsgChan<- []byte("boop")
+  out := <-c.Incoming.MsgChan
+  fmt.Println("recving", string(out))
+  if string(out) != "beep" {
+    t.Error("unexpected conn output")
+  }
+
+  out = <-c.Incoming.MsgChan
+  if string(out) != "boop" {
+    t.Error("unexpected conn output")
+  }
+
+  fmt.Println("closing")
+  c.Close()
+  listener.Close()
+}
+
+

swarm/swarm.go

+package swarm
+
+import (
+)
+
+type Swarm struct {
+  Conns map[string]*Conn
+}
+