diff options
author | Robin Lee <rgl@google.com> | 2017-03-17 13:26:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-17 13:26:04 +0000 |
commit | a59b098cac43f37b0d99a52c62ef49fec025b96d (patch) | |
tree | 191f0973c98b20754bf97b1afd3a8c5b84930af6 | |
parent | 99108fbb58e36c7a5d077b7d29ed13ee95214e2f (diff) | |
parent | cd787c027b6b1bf58c51c3b0887af6730f858efe (diff) | |
download | mtpd-a59b098cac43f37b0d99a52c62ef49fec025b96d.tar.gz |
Merge "Protect mtpd socket from VPN" am: de148c40d2 am: e80d1cfd58
am: cd787c027b
Change-Id: Idac7b125d40dfd43b51d04070f92b4f754399c4a
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | mtpd.c | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -23,6 +23,7 @@ cc_binary { "libcrypto", "libcutils", "liblog", + "libnetd_client", ], cflags: ["-DANDROID_CHANGES"], init_rc: ["mtpd.rc"], @@ -35,6 +35,7 @@ #endif #include "mtpd.h" +#include "NetdClient.h" int the_socket = -1; @@ -295,6 +296,10 @@ void create_socket(int family, int type, char *server, char *port) exit(NETWORK_ERROR); } +#ifdef ANDROID_CHANGES + protectFromVpn(the_socket); +#endif + fcntl(the_socket, F_SETFD, FD_CLOEXEC); log_print(INFO, "Connection established (socket = %d)", the_socket); } |