commit 1a37153768aa605e0787591c39d73b674acd92c3
author Nathan Harold <nharold@google.com> Mon Jan 30 12:30:48 2017 -0800
committer Lorenzo Colitti <lorenzo@google.com> Sat Apr 01 16:58:04 2017 +0000
tree 6ff808e429f29e46be38fa5fff44fdfde22cdd6f
parent 6c6ea2ac9c441bd1cc24c553bfc76e13bb484d45

Add XfrmController to NetdNativeService

Add a new controller to Netd that can handle IPSec XFRM
commands from the framework.

-Add new XfrmController controller
-Connect XfrmController to Controllers
-Add APIs in XfrmController for creating Transport IpSec Assocs

Bug: 34811756
Test: 34812052
Change-Id: If518a53a83fa76ea4c866992055a741ae064c30d

server/Controllers.h

diff --git a/server/Controllers.h b/server/Controllers.h
index ac17fc1..bd372d8 100644
--- a/server/Controllers.h
+++ b/server/Controllers.h
@@ -19,19 +19,20 @@
 
 #include <sysutils/FrameworkListener.h>
 
-#include "NetworkController.h"
-#include "TetherController.h"
-#include "NatController.h"
-#include "PppController.h"
 #include "BandwidthController.h"
+#include "ClatdController.h"
+#include "EventReporter.h"
+#include "FirewallController.h"
 #include "IdletimerController.h"
 #include "InterfaceController.h"
 #include "IptablesRestoreController.h"
+#include "NatController.h"
+#include "NetworkController.h"
+#include "PppController.h"
 #include "ResolverController.h"
-#include "FirewallController.h"
-#include "ClatdController.h"
 #include "StrictController.h"
-#include "EventReporter.h"
+#include "TetherController.h"
+#include "XfrmController.h"
 
 namespace android {
 namespace net {
@@ -52,6 +53,7 @@
     StrictController strictCtrl;
     EventReporter eventReporter;
     IptablesRestoreController iptablesRestoreCtrl;
+    XfrmController xfrmCtrl;
 
     void init();