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

1 files changed, 4 insertions, 4 deletions

diff --git a/server/NetlinkCommands.cpp b/server/NetlinkCommands.cpp
index 138019657..9f1bae908 100644
--- a/server/NetlinkCommands.cpp
+++ b/server/NetlinkCommands.cpp
@@ -30,8 +30,8 @@
 namespace android {
 namespace net {
 
-int openRtNetlinkSocket() {
-    int sock = socket(AF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC, NETLINK_ROUTE);
+int openNetlinkSocket(int protocol) {
+    int sock = socket(AF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC, protocol);
     if (sock == -1) {
         return -errno;
     }
@@ -85,7 +85,7 @@ WARN_UNUSED_RESULT int sendNetlinkRequest(uint16_t action, uint16_t flags, iovec
         nlmsg.nlmsg_len += iov[i].iov_len;
     }
 
-    int sock = openRtNetlinkSocket();
+    int sock = openNetlinkSocket(NETLINK_ROUTE);
     if (sock < 0) {
         return sock;
     }
@@ -153,7 +153,7 @@ WARN_UNUSED_RESULT int rtNetlinkFlush(uint16_t getAction, uint16_t deleteAction,
         return -EINVAL;
     }
 
-    int writeSock = openRtNetlinkSocket();
+    int writeSock = openNetlinkSocket(NETLINK_ROUTE);
     if (writeSock < 0) {
         return writeSock;
     }