diff options
author | Maciej Żenczykowski <maze@google.com> | 2019-04-08 17:46:48 -0700 |
---|---|---|
committer | Maciej Żenczykowski <maze@google.com> | 2019-05-08 21:02:19 -0700 |
commit | 8addcc0f6360cc3762e9ef27437ded250e785da3 (patch) | |
tree | ac9a90d6280e22785aaca68db210bf5612ea1b13 /main.c | |
parent | 3297c7d7bca85db2b178e8838138b71e9d2a86ad (diff) | |
download | platform_external_android-clat-android-10.0.0_r12.tar.gz platform_external_android-clat-android-10.0.0_r12.tar.bz2 platform_external_android-clat-android-10.0.0_r12.zip |
clatd: change to pass in tun filedescriptor via command lineandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
Test: atest clatd_test, built and installed on aosp_blueline device
connected to ipv6-only wifi network: ping 8.8.8.8 still works
and it is via v4-wlan0 clat tun interface
Bug: 65674744
Bug: 131268436
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8c9e235e9a5bf1a1436e8dc3af8d0aa86f6dc1a5
Merged-In: I8c9e235e9a5bf1a1436e8dc3af8d0aa86f6dc1a5
(cherry picked from commit 716518d9b9ca52182498b1d7ed0f0ed8ab42cbe1)
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 24 |
1 files changed, 15 insertions, 9 deletions
@@ -46,6 +46,7 @@ void print_help() { printf("-6 [IPv6 address]\n"); printf("-n [NetId]\n"); printf("-m [socket mark]\n"); + printf("-t [tun file descriptor number]\n"); } /* function: main @@ -55,12 +56,12 @@ int main(int argc, char **argv) { struct tun_data tunnel; int opt; char *uplink_interface = NULL, *plat_prefix = NULL, *net_id_str = NULL, *mark_str = NULL; - char *v4_addr = NULL, *v6_addr = NULL; + char *v4_addr = NULL, *v6_addr = NULL, *tunfd_str = NULL; unsigned net_id = NETID_UNSET; uint32_t mark = MARK_UNSET; unsigned len; - while ((opt = getopt(argc, argv, "i:p:4:6:n:m:h")) != -1) { + while ((opt = getopt(argc, argv, "i:p:4:6:n:m:t:h")) != -1) { switch (opt) { case 'i': uplink_interface = optarg; @@ -80,6 +81,9 @@ int main(int argc, char **argv) { case 'm': mark_str = optarg; break; + case 't': + tunfd_str = optarg; + break; case 'h': print_help(); exit(0); @@ -104,6 +108,15 @@ int main(int argc, char **argv) { exit(1); } + if (tunfd_str != NULL && !parse_int(tunfd_str, &tunnel.fd4)) { + logmsg(ANDROID_LOG_FATAL, "invalid tunfd %s", tunfd_str); + exit(1); + } + if (!tunnel.fd4) { + logmsg(ANDROID_LOG_FATAL, "no tunfd specified on commandline."); + exit(1); + } + len = snprintf(tunnel.device4, sizeof(tunnel.device4), "%s%s", DEVICEPREFIX, uplink_interface); if (len >= sizeof(tunnel.device4)) { logmsg(ANDROID_LOG_FATAL, "interface name too long '%s'", tunnel.device4); @@ -124,13 +137,6 @@ int main(int argc, char **argv) { // keeps only admin capability set_capability(1 << CAP_NET_ADMIN); - // we can create tun devices as non-root because we're in the VPN group. - tunnel.fd4 = tun_open(); - if (tunnel.fd4 < 0) { - logmsg(ANDROID_LOG_FATAL, "tun_open4 failed: %s", strerror(errno)); - exit(1); - } - // When run from netd, the environment variable ANDROID_DNS_MODE is set to // "local", but that only works for the netd process itself. Removing the // following line causes XLAT failure in permissive mode. |