From 31ed3b1d9cff6171432459bf2de2b761e987ac97 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 12 Jul 2018 17:00:34 +0200
Subject: [socket-nif] Add support for socket (level ip) open recvif

Added support for the IP option RECVIF.

OTP-14831
---
 erts/emulator/nifs/common/socket_nif.c |  50 +++++++++++++++++++++++++++++++++
 erts/preloaded/ebin/socket.beam        | Bin 45672 -> 45720 bytes
 erts/preloaded/src/socket.erl          |  10 +++++--
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index 109d1a2d5c..a851dc94b4 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -374,6 +374,7 @@ typedef union {
 #define SOCKET_OPT_IP_MULTICAST_LOOP         15
 #define SOCKET_OPT_IP_MULTICAST_TTL          16
 #define SOCKET_OPT_IP_NODEFRAG               17
+#define SOCKET_OPT_IP_RECVIF                 21
 #define SOCKET_OPT_IP_RECVTOS                25
 #define SOCKET_OPT_IP_RECVTTL                26
 #define SOCKET_OPT_IP_ROUTER_ALERT           28
@@ -4164,6 +4165,12 @@ ERL_NIF_TERM nsetopt_lvl_ip(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IP_RECVIF)
+    case SOCKET_OPT_IP_RECVIF:
+        result = nsetopt_lvl_ip_recvif(env, descP, eVal);
+        break;
+#endif
+
 #if defined(IP_RECVTOS)
     case SOCKET_OPT_IP_RECVTOS:
         result = nsetopt_lvl_ip_recvtos(env, descP, eVal);
@@ -4470,6 +4477,25 @@ ERL_NIF_TERM nsetopt_lvl_ip_nodefrag(ErlNifEnv*        env,
 #endif
 
 
+/* nsetopt_lvl_ip_recvif - Level IP RECVIFxs option
+ */
+#if defined(IP_RECVIF)
+static
+ERL_NIF_TERM nsetopt_lvl_ip_recvif(ErlNifEnv*        env,
+                                   SocketDescriptor* descP,
+                                   ERL_NIF_TERM      eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return nsetopt_bool_opt(env, descP, level, IP_RECVIF, eVal);
+}
+#endif
+
+
 /* nsetopt_lvl_ip_recvtos - Level IP RECVTOS option
  */
 #if defined(IP_RECVTOS)
@@ -5899,6 +5925,12 @@ ERL_NIF_TERM ngetopt_lvl_ip(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IP_RECVIF)
+    case SOCKET_OPT_IP_RECVIF:
+        result = ngetopt_lvl_ip_recvif(env, descP);
+        break;
+#endif
+
 #if defined(IP_RECVTOS)
     case SOCKET_OPT_IP_RECVTOS:
         result = ngetopt_lvl_ip_recvtos(env, descP);
@@ -6117,6 +6149,24 @@ ERL_NIF_TERM ngetopt_lvl_ip_recvtos(ErlNifEnv*        env,
 #endif
 
 
+/* ngetopt_lvl_ip_recvif - Level IP RECVIF option
+ */
+#if defined(IP_RECVIF)
+static
+ERL_NIF_TERM ngetopt_lvl_ip_recvif(ErlNifEnv*        env,
+                                   SocketDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return ngetopt_bool_opt(env, descP, level, IP_RECVIF);
+}
+#endif
+
+
 /* ngetopt_lvl_ip_recvttl - Level IP RECVTTL option
  */
 #if defined(IP_RECVTTL)
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index 4502ff6530..57a32cfbad 100644
Binary files a/erts/preloaded/ebin/socket.beam and b/erts/preloaded/ebin/socket.beam differ
diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl
index 7efe91146b..f70c45b42e 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -543,7 +543,7 @@
 %% -define(SOCKET_OPT_IP_OPTIONS,               18).
 %% -define(SOCKET_OPT_IP_PKTINFO,               19).
 %% -define(SOCKET_OPT_IP_RECVERR,               20).
-%% -define(SOCKET_OPT_IP_RECVIF,                21).
+-define(SOCKET_OPT_IP_RECVIF,                21).
 %% -define(SOCKET_OPT_IP_RECVDSTADDR,           22).
 %% -define(SOCKET_OPT_IP_RECVOPTS,              23).
 %% -define(SOCKET_OPT_IP_RECVORIGDSTADDR,       24).
@@ -2036,6 +2036,9 @@ enc_setopt_value(ip, multicast_ttl, V, _D, _T, _P)
 enc_setopt_value(ip, nodefrag, V, _D, _T, _P)
   when is_boolean(V) ->
     V;
+enc_setopt_value(ip, recvif, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
 enc_setopt_value(ip, recvtos, V, _D, _T, _P)
   when is_boolean(V) ->
     V;
@@ -2352,8 +2355,9 @@ enc_sockopt_key(ip = L, pktinfo = Opt, _Dir, _D, _T, _P) ->
 %% via calling the recvmsg with the MSG_ERRQUEUE flag set,
 enc_sockopt_key(ip = L, recverr = Opt, _Dir, _D, _T, _P) ->
     not_supported({L, Opt});
-enc_sockopt_key(ip = L, recvif = Opt, _Dir, _D, dgram = _T, _P) ->
-    not_supported({L, Opt});
+enc_sockopt_key(ip = _L, recvif = _Opt, _Dir, _D, T, _P)
+  when (T =:= dgram) orelse (T =:= raw) ->
+    ?SOCKET_OPT_IP_RECVIF;
 enc_sockopt_key(ip = L, recvdstaddr = Opt, _Dir, _D, _T, _P) ->
     not_supported({L, Opt});
 enc_sockopt_key(ip = L, recvopts = Opt, _Dir, _D, T, _P) when (T =/= stream) ->
-- 
cgit v1.2.3