Merge pull request #1 from NordSecurity/LLT-5312_add_logging_when_rea…

…d_from_tun_failure_happens

[LLT-5312] Add more logging when read from tun failure happens

device/send.go

@@ -10,7 +10,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"net"
-	"os"
 	"sync"
 	"time"
 
@@ -310,9 +309,7 @@ func (device *Device) RoutineReadFromTUN() {
 				continue
 			}
 			if !device.isClosed() {
-				if !errors.Is(readErr, os.ErrClosed) {
-					device.log.Errorf("Failed to read packet from TUN device: %v", readErr)
-				}
+				device.log.Errorf("Failed to read packet from TUN device: %v", readErr)
 				go device.Close()
 			}
 			return

tun/tun_windows.go

@@ -149,13 +149,13 @@ func (tun *NativeTun) Read(bufs [][]byte, sizes []int, offset int) (int, error)
 	defer tun.running.Done()
 retry:
 	if tun.close.Load() {
-		return 0, os.ErrClosed
+		return 0, errors.New("Tunnel is being shutdown at the startup of reading of packets")
 	}
 	start := nanotime()
 	shouldSpin := tun.rate.current.Load() >= spinloopRateThreshold && uint64(start-tun.rate.nextStartTime.Load()) <= rateMeasurementGranularity*2
 	for {
 		if tun.close.Load() {
-			return 0, os.ErrClosed
+			return 0, errors.New("Tunnel is being shutdown while reading packets")
 		}
 		packet, err := tun.session.ReceivePacket()
 		switch err {
@@ -173,7 +173,7 @@ retry:
 			procyield(1)
 			continue
 		case windows.ERROR_HANDLE_EOF:
-			return 0, os.ErrClosed
+			return 0, errors.New("Driver indicated EOF while reading from tunnel")
 		case windows.ERROR_INVALID_DATA:
 			return 0, errors.New("Send ring corrupt")
 		}