improving conn close

relay.go

@@ -126,6 +126,10 @@ func (client *Client) handleRequest() {
 
 	rConn, err := net.Dial(network, address)
 
+	defer func() {
+		_ = rConn.Close()
+	}()
+
 	if err != nil {
 		log.Println(fmt.Errorf("failed to connect to socket: %v", err))
 		return
@@ -134,8 +138,6 @@ func (client *Client) handleRequest() {
 	// transmit data
 	go Copy(client.conn, rConn)
 	Copy(rConn, client.conn)
-
-	_ = rConn.Close()
 }
 
 // Copy reads from src and writes to dst until either EOF is reached on src or

udp.go

@@ -77,7 +77,10 @@ func getOrCreateUDPChan(destination, header string) (chan []byte, error) {
 	go readFromConn(udpConn, udpReadChanFromConn)
 
 	go func() {
-		defer delete(udpToTCPChannels, channelID)
+		defer func() {
+			delete(udpToTCPChannels, channelID)
+			_ = udpConn.Close()
+		}()
 		for {
 			select {
 			case dataFromWS := <-udpToTCPChannels[channelID]: