Ensure ports are freed on error when dialing.

skycoin · Mar 6, 2020 · 9a8708b · 9a8708b
1 parent 98ae279
commit 9a8708b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/app/appnet/skywire_networker.go b/pkg/app/appnet/skywire_networker.go
@@ -44,12 +44,19 @@ func (r *SkywireNetworker) Dial(addr Addr) (net.Conn, error) {
 }
 
 // DialContext dials remote `addr` via `skynet` with context.
-func (r *SkywireNetworker) DialContext(ctx context.Context, addr Addr) (net.Conn, error) {
+func (r *SkywireNetworker) DialContext(ctx context.Context, addr Addr) (conn net.Conn, err error) {
 	localPort, freePort, err := r.porter.ReserveEphemeral(ctx, nil)
 	if err != nil {
 		return nil, err
 	}
 
+	// ensure ports are freed on error.
+	defer func() {
+		if err != nil {
+			freePort()
+		}
+	}()
+
 	rg, err := r.r.DialRoutes(ctx, addr.PubKey, routing.Port(localPort), addr.Port, router.DefaultDialOptions())
 	if err != nil {
 		return nil, err

diff --git a/pkg/router/router.go b/pkg/router/router.go
@@ -40,6 +40,7 @@ var (
 	// ErrUnknownPacketType is returned when packet type is unknown.
 	ErrUnknownPacketType = errors.New("unknown packet type")
 
+	// ErrRemoteEmptyPK occurs when the specified remote public key is empty.
 	ErrRemoteEmptyPK = errors.New("empty remote public key")
 )