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/NetlinkCommands.cpp

diff --git a/server/NetlinkCommands.cpp b/server/NetlinkCommands.cpp
index 1380196..9f1bae9 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 @@
         nlmsg.nlmsg_len += iov[i].iov_len;
     }
 
-    int sock = openRtNetlinkSocket();
+    int sock = openNetlinkSocket(NETLINK_ROUTE);
     if (sock < 0) {
         return sock;
     }
@@ -153,7 +153,7 @@
         return -EINVAL;
     }
 
-    int writeSock = openRtNetlinkSocket();
+    int writeSock = openNetlinkSocket(NETLINK_ROUTE);
     if (writeSock < 0) {
         return writeSock;
     }