summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-02-27 07:09:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-27 07:09:25 +0000
commit73b0048c708e02eac0511f87ffc67df3b796bcff (patch)
treec3625a0aa44ffce56fcb7d4e46a5ebdad985ce38 /core
parent42ad7b5af44ee7c4a08cd58a8a40d674247261ba (diff)
parent35e36db1d726f5741e7d8d83d2556e1417642be9 (diff)
downloadframeworks_base-73b0048c708e02eac0511f87ffc67df3b796bcff.zip
frameworks_base-73b0048c708e02eac0511f87ffc67df3b796bcff.tar.gz
frameworks_base-73b0048c708e02eac0511f87ffc67df3b796bcff.tar.bz2
Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/os/INetworkManagementService.aidl12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl
index 5d5d2b3..154a5a5 100644
--- a/core/java/android/os/INetworkManagementService.aidl
+++ b/core/java/android/os/INetworkManagementService.aidl
@@ -178,6 +178,18 @@ interface INetworkManagementService
String[] getDnsForwarders();
/**
+ * Enables unidirectional packet forwarding from {@code fromIface} to
+ * {@code toIface}.
+ */
+ void startInterfaceForwarding(String fromIface, String toIface);
+
+ /**
+ * Disables unidirectional packet forwarding from {@code fromIface} to
+ * {@code toIface}.
+ */
+ void stopInterfaceForwarding(String fromIface, String toIface);
+
+ /**
* Enables Network Address Translation between two interfaces.
* The address and netmask of the external interface is used for
* the NAT'ed network.