commit 6a773534e7f8541f221f27fb8063af079b1a5936
author Sreeram Ramachandran <sreeram@google.com> Fri Jul 11 09:10:20 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Fri Jul 11 11:07:58 2014 -0700
tree 03b44593f5021c5fd8526d257d716c45c65d146d
parent c7d804c1d22db40ac79fde46a032cd359e975f5b

Fix tethering in the case of a regular upstream connection.

Fixes tethering via Ethernet, Bluetooth and WiFi (hotspot).

Tethering when the upstream has a DUN-specific APN is likely still broken
(untested).

For now, assign a fixed NetId (a hack) until we can change the framework to
create a valid NetworkAgent and all that jazz.

Bug: 15968336
Bug: 14988803
Change-Id: Idcf4d492d9329a9c87913e27be6dd835a792bea2

server/RouteController.h

diff --git a/server/RouteController.h b/server/RouteController.h
index 86ac089..a3010de 100644
--- a/server/RouteController.h
+++ b/server/RouteController.h
@@ -37,6 +37,10 @@
 
     static int Init() WARN_UNUSED_RESULT;
 
+    static int addInterfaceToLocalNetwork(unsigned netId, const char* interface) WARN_UNUSED_RESULT;
+    static int removeInterfaceFromLocalNetwork(unsigned netId,
+                                               const char* interface) WARN_UNUSED_RESULT;
+
     static int addInterfaceToPhysicalNetwork(unsigned netId, const char* interface,
                                              Permission permission) WARN_UNUSED_RESULT;
     static int removeInterfaceFromPhysicalNetwork(unsigned netId, const char* interface,