commit 94db658403dc613185e6b8c6be023aa5ef3c4edc
author Maciej Żenczykowski <maze@google.com> Mon Jan 27 21:47:06 2020 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Jan 27 22:30:42 2020 -0800
tree a95920b70bba40b5b45f63bea92c1d98a57d4319
parent d4b1f6d132267af83f03e49dc6314eb2cee3687b

ClatdController & tests/tun_interface: change from /dev/tun to /dev/net/tun

(this is the upstream default location of the 'tun' special device)

Test: build, atest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie834a16264dc1188aa9f3fb40cb5e0e5643737cc

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 0b62fb4..728ae69 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -557,7 +557,7 @@
     }
 
     // 3. open the tun device in non blocking mode as required by clatd
-    int res = open("/dev/tun", O_RDWR | O_NONBLOCK | O_CLOEXEC);
+    int res = open("/dev/net/tun", O_RDWR | O_NONBLOCK | O_CLOEXEC);
     if (res == -1) {
         res = errno;
         ALOGE("open of tun device failed (%s)", strerror(res));