Close the tun fd when closing the device

Close the tun fd when closing the device

[Aurélien Chabot]

This patch was part of the android development, as this is not specific
to android, here is an independent patch. 

[PATCH] Close the tun fd when closing the device

[Aurélien Chabot]

We also need to listen to the stop signal in the read tun function to
avoid reading a close tun device.

Signed-off-by: Aurélien Chabot <aurelien@chabot.fr>
---
 src/device.go |  1 +
 src/send.go   | 77 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/device.go b/src/device.go
index 61c87bc..8567a36 100644
--- a/src/device.go
+++ b/src/device.go
@@ -205,6 +205,7 @@ func (device *Device) Close() {
 	device.RemoveAllPeers()
 	close(device.signal.stop)
 	closeUDPConn(device)
+	device.tun.device.Close()
 }
 
 func (device *Device) WaitChannel() chan struct{} {
diff --git a/src/send.go b/src/send.go
index 5c88ead..35ae9a3 100644
--- a/src/send.go
+++ b/src/send.go
@@ -141,53 +141,60 @@ func (device *Device) RoutineReadFromTUN() {
 
 	for {
 
-		// read packet
 
-		elem.packet = elem.buffer[MessageTransportHeaderSize:]
-		size, err := device.tun.device.Read(elem.packet)
-		if err != nil {
-			logError.Println("Failed to read packet from TUN device:", err)
-			device.Close()
-			return
-		}
+		select {
+		case <-device.signal.stop:
+		    logDebug.Println("Routine, TUN Reader worker, stopped")
+		    return
+		default:
+		    // read packet
 
-		if size == 0 || size > MaxContentSize {
-			continue
-		}
+		    elem.packet = elem.buffer[MessageTransportHeaderSize:]
+			size, err := device.tun.device.Read(elem.packet)
+			if err != nil {
+				logError.Println("Failed to read packet from TUN device:", err)
+				device.Close()
+				return
+			}
 
-		elem.packet = elem.packet[:size]
+			if size == 0 || size > MaxContentSize {
+				continue
+			}
 
-		// lookup peer
+			elem.packet = elem.packet[:size]
 
-		var peer *Peer
-		switch elem.packet[0] >> 4 {
-		case ipv4.Version:
-			if len(elem.packet) < ipv4.HeaderLen {
-				continue
+			// lookup peer
+
+			var peer *Peer
+			switch elem.packet[0] >> 4 {
+			case ipv4.Version:
+				if len(elem.packet) < ipv4.HeaderLen {
+					continue
+				}
+				dst := elem.packet[IPv4offsetDst : IPv4offsetDst+net.IPv4len]
+				peer = device.routingTable.LookupIPv4(dst)
+
+			case ipv6.Version:
+				if len(elem.packet) < ipv6.HeaderLen {
+					continue
+				}
+				dst := elem.packet[IPv6offsetDst : IPv6offsetDst+net.IPv6len]
+				peer = device.routingTable.LookupIPv6(dst)
+
+			default:
+				logDebug.Println("Receieved packet with unknown IP version")
 			}
-			dst := elem.packet[IPv4offsetDst : IPv4offsetDst+net.IPv4len]
-			peer = device.routingTable.LookupIPv4(dst)
 
-		case ipv6.Version:
-			if len(elem.packet) < ipv6.HeaderLen {
+			if peer == nil {
 				continue
 			}
-			dst := elem.packet[IPv6offsetDst : IPv6offsetDst+net.IPv6len]
-			peer = device.routingTable.LookupIPv6(dst)
 
-		default:
-			logDebug.Println("Receieved packet with unknown IP version")
-		}
+			// insert into nonce/pre-handshake queue
 
-		if peer == nil {
-			continue
+			signalSend(peer.signal.handshakeReset)
+			addToOutboundQueue(peer.queue.nonce, elem)
+			elem = device.NewOutboundElement()
 		}
-
-		// insert into nonce/pre-handshake queue
-
-		signalSend(peer.signal.handshakeReset)
-		addToOutboundQueue(peer.queue.nonce, elem)
-		elem = device.NewOutboundElement()
 	}
 }
 
-- 
2.15.0

Re: Close the tun fd when closing the device

[Georg Faerber]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

On 17-11-10 22:00:32, Aurélien Chabot wrote:
> This patch was part of the android development, as this is not
> specific to android, here is an independent patch. 

You forgot to attach the patch.. :)

Cheers,
Georg

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Close the tun fd when closing the device

[Georg Faerber]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

On 17-11-10 12:38:41, Georg Faerber wrote:
> On 17-11-10 22:00:32, Aurélien Chabot wrote:
> > This patch was part of the android development, as this is not
> > specific to android, here is an independent patch. 
> 
> You forgot to attach the patch.. :)

Sorry for the noise! :x

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]