pluto: CAP_NET_RAW seems to be required on Android even to open regular sockets.

diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c
index 6366b2982d352304dcdcfc32d028b8858fc779b1..db5f2d941c8861a0fa5139f19ca5c33a3bafe191 100644 (file)
--- a/src/pluto/plutomain.c
+++ b/src/pluto/plutomain.c
@@ -294,7 +294,13 @@ int main(int argc, char **argv)
        bool force_keepalive = FALSE;
        char *virtual_private = NULL;
 #ifdef CAPABILITIES
-       int keep[] = { CAP_NET_ADMIN, CAP_NET_BIND_SERVICE };
+       int keep[] = {
+                       CAP_NET_ADMIN,
+                       CAP_NET_BIND_SERVICE,
+#ifdef ANDROID
+                       CAP_NET_RAW,
+#endif
+       };
 #endif /* CAPABILITIES */
 
        /* initialize library and optionsfrom */

diff --git a/src/pluto/server.c b/src/pluto/server.c
index 2d608048b099d4487919983c565eb739c6b443ed..167b1d4c70b87f12107eaa4d3d134e531db98a04 100644 (file)
--- a/src/pluto/server.c
+++ b/src/pluto/server.c
@@ -229,7 +229,7 @@ find_raw_ifaces4(void)
        struct ifconf ifconf;
        struct ifreq buf[300];      /* for list of interfaces -- arbitrary limit */
        struct raw_iface *rifaces = NULL;
-       int master_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);    /* Get a UDP socket */
+       int master_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);    /* Get a UDP socket */
 
        /* get list of interfaces with assigned IPv4 addresses from system */