diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-03-13 18:12:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 18:12:36 +0000 |
| commit | 78f204aed8c0f3c8174616801d66f96a9a00a5fd (patch) | |
| tree | fccf2ea9cb330cf705ea043bcda7f89a6f8abf48 /core/java/android | |
| parent | fc1d04714e9042a1b01c7a725fafa1820b8c14fb (diff) | |
| parent | 8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac (diff) | |
am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
Remove SO_BINDTODEVICE from VPN protect
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/VpnService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index d7dc7f5eac11..7385dff3ff80 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -151,9 +151,10 @@ public class VpnService extends Service { } /** - * Protect a socket from VPN connections. The socket will be bound to the - * current default network interface, so its traffic will not be forwarded - * through VPN. This method is useful if some connections need to be kept + * Protect a socket from VPN connections. After protecting, data sent + * through this socket will go directly to the underlying network, + * so its traffic will not be forwarded through the VPN. + * This method is useful if some connections need to be kept * outside of VPN. For example, a VPN tunnel should protect itself if its * destination is covered by VPN routes. Otherwise its outgoing packets * will be sent back to the VPN interface and cause an infinite loop. This |