From 4e24993aff4c5a0cb2bec96e5499131a660a79f9 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 24 Jul 2018 17:01:46 +0200
Subject: [socket-nif] Add support for socket (level ipv6) option recverr

Added support for the IPv6 socket option RECVERR.
To actually make use of this option, we need the recvmsg
function, which we don't have yet. Baby steps.

OTP-14831.
---
 erts/emulator/nifs/common/socket_nif.c | 43 ++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'erts/emulator')

diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index 86a81c882b..3f87232000 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -551,6 +551,7 @@ typedef union {
 #define SOCKET_OPT_IPV6_MULTICAST_HOPS       19
 #define SOCKET_OPT_IPV6_MULTICAST_IF         20
 #define SOCKET_OPT_IPV6_MULTICAST_LOOP       21
+#define SOCKET_OPT_IPV6_RECVERR              24
 #define SOCKET_OPT_IPV6_RECVPKTINFO          25 // PKTINFO on FreeBSD
 #define SOCKET_OPT_IPV6_ROUTER_ALERT         27
 #define SOCKET_OPT_IPV6_RTHDR                28
@@ -1276,6 +1277,11 @@ static ERL_NIF_TERM nsetopt_lvl_ipv6_multicast_loop(ErlNifEnv*        env,
                                                     SocketDescriptor* descP,
                                                     ERL_NIF_TERM      eVal);
 #endif
+#if defined(IPV6_RECVERR)
+static ERL_NIF_TERM nsetopt_lvl_ipv6_recverr(ErlNifEnv*        env,
+                                             SocketDescriptor* descP,
+                                             ERL_NIF_TERM      eVal);
+#endif
 #if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
 static ERL_NIF_TERM nsetopt_lvl_ipv6_recvpktinfo(ErlNifEnv*        env,
                                                  SocketDescriptor* descP,
@@ -1617,6 +1623,10 @@ static ERL_NIF_TERM ngetopt_lvl_ipv6_multicast_if(ErlNifEnv*        env,
 static ERL_NIF_TERM ngetopt_lvl_ipv6_multicast_loop(ErlNifEnv*        env,
                                                     SocketDescriptor* descP);
 #endif
+#if defined(IPV6_RECVERR)
+static ERL_NIF_TERM ngetopt_lvl_ipv6_recverr(ErlNifEnv*        env,
+                                             SocketDescriptor* descP);
+#endif
 #if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
 static ERL_NIF_TERM ngetopt_lvl_ipv6_recvpktinfo(ErlNifEnv*        env,
                                                  SocketDescriptor* descP);
@@ -5726,6 +5736,12 @@ ERL_NIF_TERM nsetopt_lvl_ipv6(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IPV6_RECVERR)
+    case SOCKET_OPT_IPV6_RECVERR:
+        result = nsetopt_lvl_ipv6_recverr(env, descP, eVal);
+        break;
+#endif
+
 #if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
     case SOCKET_OPT_IPV6_RECVPKTINFO:
         result = nsetopt_lvl_ipv6_recvpktinfo(env, descP, eVal);
@@ -5975,6 +5991,17 @@ ERL_NIF_TERM nsetopt_lvl_ipv6_multicast_loop(ErlNifEnv*        env,
 #endif
 
 
+#if defined(IPV6_RECVERR)
+static
+ERL_NIF_TERM nsetopt_lvl_ipv6_recverr(ErlNifEnv*        env,
+                                      SocketDescriptor* descP,
+                                      ERL_NIF_TERM      eVal)
+{
+    return nsetopt_bool_opt(env, descP, SOL_IPV6, IPV6_RECVERR, eVal);
+}
+#endif
+
+
 #if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
 static
 ERL_NIF_TERM nsetopt_lvl_ipv6_recvpktinfo(ErlNifEnv*        env,
@@ -8438,6 +8465,12 @@ ERL_NIF_TERM ngetopt_lvl_ipv6(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IPV6_RECVERR)
+    case SOCKET_OPT_IPV6_RECVERR:
+        result = ngetopt_lvl_ipv6_recverr(env, descP);
+        break;
+#endif
+
 #if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
     case SOCKET_OPT_IPV6_RECVPKTINFO:
         result = ngetopt_lvl_ipv6_recvpktinfo(env, descP);
@@ -8601,6 +8634,16 @@ ERL_NIF_TERM ngetopt_lvl_ipv6_multicast_loop(ErlNifEnv*        env,
 #endif
 
 
+#if defined(IPV6_RECVERR)
+static
+ERL_NIF_TERM ngetopt_lvl_ipv6_recverr(ErlNifEnv*        env,
+                                      SocketDescriptor* descP)
+{
+    return ngetopt_bool_opt(env, descP, SOL_IPV6, IPV6_RECVERR);
+}
+#endif
+
+
 #if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
 static
 ERL_NIF_TERM ngetopt_lvl_ipv6_recvpktinfo(ErlNifEnv*        env,
-- 
cgit v1.2.3