kill connections when they die in context

dial.go

@@ -2,7 +2,6 @@ package goSam
 
 import (
 	"context"
-	"fmt"
 	"log"
 	"net"
 	"strings"
@@ -15,7 +14,7 @@ func (c *Client) DialContext(ctx context.Context, network, addr string) (net.Con
 	errCh := make(chan error, 1)
 	connCh := make(chan net.Conn, 1)
 	go func() {
-		if conn, err := c.Dial(network, addr); err != nil {
+		if conn, err := c.DialContextFree(network, addr); err != nil {
 			errCh <- err
 		} else if ctx.Err() != nil {
 			log.Println(ctx)
@@ -26,10 +25,12 @@ func (c *Client) DialContext(ctx context.Context, network, addr string) (net.Con
 	}()
 	select {
 	case err := <-errCh:
-		return c.SamConn, err
+		c.Close()
+		return nil, err
 	case conn := <-connCh:
 		return conn, nil
 	case <-ctx.Done():
+		c.Close()
 		return nil, ctx.Err()
 	}
 }
@@ -45,8 +46,12 @@ func (c *Client) dialCheck(addr string) (int32, bool) {
 	return c.id, false
 }
 
-// Dial implements the net.Dial function and can be used for http.Transport
 func (c *Client) Dial(network, addr string) (net.Conn, error) {
+	return c.DialContext(context.Background(), network, addr)
+}
+
+// Dial implements the net.Dial function and can be used for http.Transport
+func (c *Client) DialContextFree(network, addr string) (net.Conn, error) {
 	c.ml.Lock()
 	defer c.ml.Unlock()
 	portIdx := strings.Index(addr, ":")