Add more comments, finish manager

skycoin · Sep 17, 2019 · 3e295fd · 3e295fd
1 parent a790f2c
commit 3e295fd
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 215 deletions.
diff --git a/pkg/app2/client.go b/pkg/app2/client.go
@@ -5,9 +5,8 @@ import (
 	"net"
 	"net/rpc"
 
-	"github.com/skycoin/dmsg/netutil"
-
 	"github.com/skycoin/dmsg/cipher"
+	"github.com/skycoin/dmsg/netutil"
 	"github.com/skycoin/skycoin/src/util/logging"
 
 	"github.com/skycoin/skywire/pkg/routing"

diff --git a/pkg/app2/conn.go b/pkg/app2/conn.go
@@ -4,16 +4,17 @@ import (
 	"net"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/skycoin/skywire/pkg/routing"
 )
 
 // Conn is a connection from app client to the server.
+// Implements `net.Conn`.
 type Conn struct {
-	id     uint16
-	rpc    ServerRPCClient
-	local  routing.Addr
-	remote routing.Addr
+	id            uint16
+	rpc           ServerRPCClient
+	local         routing.Addr
+	remote        routing.Addr
+	freeLocalPort func()
 }
 
 func (c *Conn) Read(b []byte) (int, error) {
@@ -25,6 +26,12 @@ func (c *Conn) Write(b []byte) (int, error) {
 }
 
 func (c *Conn) Close() error {
+	defer func() {
+		if c.freeLocalPort != nil {
+			c.freeLocalPort()
+		}
+	}()
+
 	return c.rpc.CloseConn(c.id)
 }
 
@@ -37,13 +44,13 @@ func (c *Conn) RemoteAddr() net.Addr {
 }
 
 func (c *Conn) SetDeadline(t time.Time) error {
-	return errors.New("method not implemented")
+	return errMethodNotImplemented
 }
 
 func (c *Conn) SetReadDeadline(t time.Time) error {
-	return errors.New("method not implemented")
+	return errMethodNotImplemented
 }
 
 func (c *Conn) SetWriteDeadline(t time.Time) error {
-	return errors.New("method not implemented")
+	return errMethodNotImplemented
 }
diff --git a/pkg/app2/conns_manager.go b/pkg/app2/conns_manager.go
diff --git a/pkg/app2/errors.go b/pkg/app2/errors.go
@@ -3,5 +3,12 @@ package app2
 import "github.com/pkg/errors"
 
 var (
+	// ErrPortAlreadyBound is being returned when trying to bind to the port
+	// which is already bound to.
 	ErrPortAlreadyBound = errors.New("port is already bound")
 )
+
+var (
+	// errMethodNotImplemented serves as a return value for non-implemented funcs (stubs).
+	errMethodNotImplemented = errors.New("method not implemented")
+)
diff --git a/pkg/app2/listener.go b/pkg/app2/listener.go
@@ -7,6 +7,7 @@ import (
 )
 
 // Listener is a listener for app server connections.
+// Implements `net.Listener`.
 type Listener struct {
 	id       uint16
 	rpc      ServerRPCClient

diff --git a/pkg/app2/listeners_manager.go b/pkg/app2/listeners_manager.go