commit 96abf48e015c5ac8422426e26bb482917f2048dc
author Benedict Wong <benedictwong@google.com> Mon Jan 22 13:56:41 2018 -0800
committer Nathan Harold <nharold@google.com> Wed Jan 24 00:44:44 2018 -0800
tree 4485acf604b84be6f388295168f68df544631601
parent 84a8dcaf07edd78977dbce2924d950500a66293b

Add output mark to XfrmController

Adds the ability for XfrmController to set output marks, to allow
support for VTIs. This change uses the underlying networkId field
(renamed from underlyingNetwork), for which the System Server currently
passes the netid of the underlying Network.

Bug: 72392543
Test: All tests (CTS + unit tests) passing
Change-Id: I76fe052ecf0fc193f07713a2ea31a4ad58fc9ff9

server/NetdNativeService.h

diff --git a/server/NetdNativeService.h b/server/NetdNativeService.h
index 5858588..dbf4b6c 100644
--- a/server/NetdNativeService.h
+++ b/server/NetdNativeService.h
@@ -113,7 +113,7 @@
             int32_t mode,
             const std::string& sourceAddress,
             const std::string& destinationAddress,
-            int64_t underlyingNetworkHandle,
+            int32_t underlyingNetId,
             int32_t spi,
             int32_t markValue,
             int32_t markMask,