summaryrefslogtreecommitdiffstats
path: root/server/ClatdController.cpp
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-01-27 21:47:06 -0800
committerMaciej Żenczykowski <maze@google.com>2020-01-27 22:30:42 -0800
commit94db658403dc613185e6b8c6be023aa5ef3c4edc (patch)
treea95920b70bba40b5b45f63bea92c1d98a57d4319 /server/ClatdController.cpp
parentd4b1f6d132267af83f03e49dc6314eb2cee3687b (diff)
downloadplatform_system_netd-94db658403dc613185e6b8c6be023aa5ef3c4edc.tar.gz
platform_system_netd-94db658403dc613185e6b8c6be023aa5ef3c4edc.tar.bz2
platform_system_netd-94db658403dc613185e6b8c6be023aa5ef3c4edc.zip
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
Diffstat (limited to 'server/ClatdController.cpp')
-rw-r--r--server/ClatdController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 0b62fb413..728ae69af 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -557,7 +557,7 @@ int ClatdController::startClatd(const std::string& interface, const std::string&
}
// 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));