Merge branch 'master' into httpc_fix

Author: itssundeep

erts/emulator/drivers/common/inet_drv.c

@@ -767,6 +767,13 @@ static size_t my_strnlen(const char *s, size_t maxlen)
 #define INET_TYPE_DGRAM     2
 #define INET_TYPE_SEQPACKET 3
 
+/* open protocol */
+#define INET_PROTO_DEFAULT  0
+#define INET_PROTO_TCP      1
+#define INET_PROTO_UDP      2
+#define INET_PROTO_SCTP     3
+#define INET_PROTO_MPTCP    4
+
 /* INET_LOPT_MODE options */
 #define INET_MODE_LIST      0
 #define INET_MODE_BINARY    1
@@ -1611,6 +1618,7 @@ static ErlDrvTermData am_sendfile;
 #endif
 
 static char str_eafnosupport[] = "eafnosupport";
+static char str_eprotonosupport[] = "eprotonosupport";
 static char str_einval[] = "einval";
 
 /* special errors for bad ports and sequences */
@@ -5078,11 +5086,12 @@ static int erl_inet_close(inet_descriptor* desc)
     return 0;
 }
 
-static ErlDrvSSizeT inet_ctl_open(inet_descriptor* desc, int domain, int type,
-				  char** rbuf, ErlDrvSizeT rsize)
+static
+ErlDrvSSizeT inet_ctl_open(inet_descriptor* desc,
+                           int domain, int type, int protocol,
+                           char** rbuf, ErlDrvSizeT rsize)
 {
     int save_errno;
-    int protocol;
 #ifdef HAVE_SETNS
     int current_ns, new_ns;
     current_ns = new_ns = 0;
@@ -5125,7 +5134,6 @@ static ErlDrvSSizeT inet_ctl_open(inet_descriptor* desc, int domain, int type,
 	}
     }
 #endif
-    protocol = desc->sprotocol;
 #ifdef HAVE_SYS_UN_H
     if (domain == AF_UNIX) protocol = 0;
 #endif
@@ -11843,13 +11851,13 @@ static ErlDrvSSizeT tcp_inet_ctl(ErlDrvData e, unsigned int cmd,
     switch(cmd) {
 
     case INET_REQ_OPEN: { /* open socket and return internal index */
-	int domain;
+	int domain, protocol;
 
 	DDBG(INETP(desc),
 	     ("INET-DRV-DBG[%d][%T] tcp_inet_ctl -> OPEN\r\n",
 	      __LINE__, driver_caller(desc->inet.port)) );
 
-	if (len != 2) return ctl_error(EINVAL, rbuf, rsize);
+	if (len != 3) return ctl_error(EINVAL, rbuf, rsize);
 	switch(buf[0]) {
 	case INET_AF_INET:
 	    domain = AF_INET;
@@ -11868,7 +11876,18 @@ static ErlDrvSSizeT tcp_inet_ctl(ErlDrvData e, unsigned int cmd,
 	    return ctl_xerror(str_eafnosupport, rbuf, rsize);
 	}
 	if (buf[1] != INET_TYPE_STREAM) return ctl_error(EINVAL, rbuf, rsize);
-	return inet_ctl_open(INETP(desc), domain, SOCK_STREAM, rbuf, rsize);
+        switch(buf[2]) {
+        case INET_PROTO_DEFAULT: protocol = 0; break;
+        case INET_PROTO_TCP: protocol = IPPROTO_TCP; break;
+#ifdef IPPROTO_MPTCP
+        case INET_PROTO_MPTCP: protocol = IPPROTO_MPTCP; break;
+#endif
+        default:
+            return ctl_xerror(str_eprotonosupport, rbuf, rsize);
+        }
+	return
+            inet_ctl_open(INETP(desc),
+                          domain, SOCK_STREAM, protocol, rbuf, rsize);
 	break;
     }
 
@@ -14360,8 +14379,9 @@ static ErlDrvSSizeT packet_inet_ctl(ErlDrvData e, unsigned int cmd, char* buf,
     ErlDrvSSizeT replen;
     udp_descriptor * udesc = (udp_descriptor *) e;
     inet_descriptor* desc  = INETP(udesc);
-    int type = SOCK_DGRAM;
     int af = AF_INET;
+    int type = SOCK_DGRAM;
+    int protocol;
 
     cmd -= ERTS_INET_DRV_CONTROL_MAGIC_NUMBER;
 
@@ -14370,7 +14390,7 @@ static ErlDrvSSizeT packet_inet_ctl(ErlDrvData e, unsigned int cmd, char* buf,
 	DDBG(desc,
 	     ("INET-DRV-DBG[%d][%T] packet_inet_ctl -> OPEN\r\n",
 	      __LINE__, driver_caller(desc->port)) );
-	if (len != 2) {
+	if (len != 3) {
 	    return ctl_error(EINVAL, rbuf, rsize);
 	}
 
@@ -14396,7 +14416,15 @@ static ErlDrvSSizeT packet_inet_ctl(ErlDrvData e, unsigned int cmd, char* buf,
 	    return ctl_error(EINVAL, rbuf, rsize);
 	}
 
-	replen = inet_ctl_open(desc, af, type, rbuf, rsize);
+        switch(buf[2]) {
+        case INET_PROTO_DEFAULT: protocol = 0; break;
+        case INET_PROTO_UDP: protocol = IPPROTO_UDP; break;
+        case INET_PROTO_SCTP: protocol = IPPROTO_SCTP; break;
+        default:
+            return ctl_xerror(str_eprotonosupport, rbuf, rsize);
+        }
+
+	replen = inet_ctl_open(desc, af, type, protocol, rbuf, rsize);
 
 	if ((*rbuf)[0] != INET_REP_ERROR) {
 	    if (desc->active)

erts/emulator/nifs/common/prim_socket_nif.c

@@ -2155,6 +2155,7 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(min_rtt);                         \
     GLOBAL_ATOM_DECL(monitor);			       \
     GLOBAL_ATOM_DECL(more);                            \
+    GLOBAL_ATOM_DECL(mptcp);                           \
     GLOBAL_ATOM_DECL(msfilter);                        \
     GLOBAL_ATOM_DECL(mss);                             \
     GLOBAL_ATOM_DECL(mtu);                             \
@@ -4912,6 +4913,13 @@ ERL_NIF_TERM esock_supports_protocols(ErlNifEnv* env)
           MKT2(env, MKL1(env, esock_atom_igmp), MKI(env, IPPROTO_IGMP)),
           protocols);
 
+#ifdef IPPROTO_MPTCP
+  protocols =
+      MKC(env,
+          MKT2(env, MKL1(env, esock_atom_mptcp), MKI(env, IPPROTO_MPTCP)),
+          protocols);
+#endif
+
   return protocols;
 }
 
@@ -12143,7 +12151,11 @@ void esock_dec_socket(int domain, int type, int protocol)
     /* *** Protocol counter *** */
     if (protocol == IPPROTO_IP)
         esock_cnt_dec(&data.numProtoIP, 1);
-    else if (protocol == IPPROTO_TCP)
+    else if (protocol == IPPROTO_TCP
+#ifdef IPPROTO_MPTCP
+             || protocol == IPPROTO_MPTCP
+#endif
+             )
         esock_cnt_dec(&data.numProtoTCP, 1);
     else if (protocol == IPPROTO_UDP)
         esock_cnt_dec(&data.numProtoUDP, 1);
@@ -12188,7 +12200,11 @@ void esock_inc_socket(int domain, int type, int protocol)
     /* *** Protocol counter *** */
     if (protocol == IPPROTO_IP)
         esock_cnt_inc(&data.numProtoIP, 1);
-    else if (protocol == IPPROTO_TCP)
+    else if (protocol == IPPROTO_TCP
+#ifdef IPPROTO_MPTCP
+             || protocol == IPPROTO_MPTCP
+#endif
+             )
         esock_cnt_inc(&data.numProtoTCP, 1);
     else if (protocol == IPPROTO_UDP)
         esock_cnt_inc(&data.numProtoUDP, 1);

erts/emulator/nifs/common/socket_int.h

@@ -431,6 +431,7 @@ typedef long ssize_t;
     GLOBAL_ATOM_DEF(min_rtt);                  \
     GLOBAL_ATOM_DEF(monitor);		       \
     GLOBAL_ATOM_DEF(more);                     \
+    GLOBAL_ATOM_DEF(mptcp);                    \
     GLOBAL_ATOM_DEF(msfilter);                 \
     GLOBAL_ATOM_DEF(mss);                      \
     GLOBAL_ATOM_DEF(mtu);                      \

erts/preloaded/ebin/prim_inet.beam

@@ -77,10 +77,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 open(Protocol, Family, Type) ->
-    open(Protocol, Family, Type, [], ?INET_REQ_OPEN, []).
+    P = enc_proto(Protocol),
+    open(Protocol, Family, Type, [], ?INET_REQ_OPEN, [P]).
 
 open(Protocol, Family, Type, Opts) ->
-    open(Protocol, Family, Type, Opts, ?INET_REQ_OPEN, []).
+    P = enc_proto(Protocol),
+    open(Protocol, Family, Type, Opts, ?INET_REQ_OPEN, [P]).
 
 %% FDOPEN(tcp|udp|sctp, inet|inet6|local, stream|dgram|seqpacket, integer())
 
@@ -126,15 +128,22 @@ enc_type(stream) -> ?INET_TYPE_STREAM;
 enc_type(dgram) -> ?INET_TYPE_DGRAM;
 enc_type(seqpacket) -> ?INET_TYPE_SEQPACKET.
 
-protocol2drv(tcp)  -> "tcp_inet";
-protocol2drv(udp)  -> "udp_inet";
-protocol2drv(sctp) -> "sctp_inet".
+protocol2drv(tcp)   -> "tcp_inet";
+protocol2drv(udp)   -> "udp_inet";
+protocol2drv(sctp)  -> "sctp_inet";
+protocol2drv(mptcp) -> "tcp_inet".
 
 drv2protocol("tcp_inet")  -> tcp;
 drv2protocol("udp_inet")  -> udp;
 drv2protocol("sctp_inet") -> sctp;
 drv2protocol(_)           -> undefined.
 
+enc_proto(default) -> ?INET_PROTO_DEFAULT;
+enc_proto(tcp)     -> ?INET_PROTO_TCP;
+enc_proto(udp)     -> ?INET_PROTO_UDP;
+enc_proto(sctp)    -> ?INET_PROTO_SCTP;
+enc_proto(mptcp)   -> ?INET_PROTO_MPTCP.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% Shutdown(insock(), atom()) -> ok

erts/preloaded/src/prim_inet.erl

@@ -514,6 +514,12 @@ on the host with IP address `Address`, that may also be a hostname.
 - **`{tcp_module, module()}`** - Overrides which callback module is used.
   Defaults to `inet_tcp` for IPv4 and `inet6_tcp` for IPv6.
 
+- **`{protocol, tcp|mptcp}`** - With `mptcp` creates the socket
+  with protocol IPPROTO_MPTCP, if that is defined on the system.
+  Other than that the socket is regarded as a `tcp` socket.
+  If IPPROTO_MPTCP is not defined, `{error, eprotonosupport}`
+  is returned. `tcp` is the default value.
+
 - **`t:option/0`** - See `inet:setopts/2`.
 
 ### Socket Data
@@ -661,6 +667,12 @@ The following options are available:
 - **`{tcp_module, module()}`** - Overrides which callback module is used.
   Defaults to `inet_tcp` for IPv4 and `inet6_tcp` for IPv6.
 
+- **`{protocol, tcp|mptcp}`** - With `mptcp` creates the socket
+  with protocol IPPROTO_MPTCP, if that is defined on the system.
+  Other than that the socket is regarded as a `tcp` socket.
+  If IPPROTO_MPTCP is not defined, `{error, eprotonosupport}`
+  is returned. `tcp` is the default value.
+
 - **`t:option/0`** - See `inet:setopts/2`.
 
 The returned socket `ListenSocket` should be used when calling

lib/kernel/src/gen_tcp.erl

@@ -3168,6 +3168,11 @@ con_opt([Opt | Opts], #connect_opts{ifaddr = IfAddr} = R, As) ->
 	{line_delimiter,C} when is_integer(C), C >= 0, C =< 255 ->
 	    con_add(line_delimiter, C, R, Opts, As);
 
+        {protocol, Proto}
+          when Proto =:= tcp;
+               Proto =:= mptcp ->
+            con_opt(Opts, R#connect_opts { protocol = Proto }, As);
+
 	{Name,Val} when is_atom(Name) -> con_add(Name, Val, R, Opts, As);
 
 	_ -> {error, badarg}
@@ -3257,6 +3262,10 @@ list_opt([Opt | Opts], #listen_opts{ifaddr = IfAddr} = R, As) ->
         {active,N} when is_integer(N), N < 32768, N >= -32768 ->
             NOpts = lists:keydelete(active, 1, R#listen_opts.opts),
             list_opt(Opts, R#listen_opts { opts = [{active,N}|NOpts] }, As);
+        {protocol, Proto}
+          when Proto =:= tcp;
+               Proto =:= mptcp ->
+            list_opt(Opts, R#listen_opts { protocol = Proto }, As);
 	{Name,Val} when is_atom(Name) -> list_add(Name, Val, R, Opts, As);
 	_ -> {error, badarg}
     end;
@@ -3961,7 +3970,7 @@ gethostbyaddr_tm_native(Addr, Timer, Opts) ->
 	     undefined, % Internal - no bind()
 	   BPort :: port_number(),
 	   Opts :: [socket_setopt()],
-	   Protocol :: socket_protocol(),
+	   Protocol :: socket_protocol() | 'mptcp',
 	   Family :: address_family(),
 	   Type :: socket_type(),
 	   Module :: atom()) ->
@@ -4016,7 +4025,7 @@ open(Fd_or_OpenOpts, BAddr, BPort, Opts, Protocol, Family, Type, Module) ->
                   undefined, % Internal - translated to 'any'
                 BPort :: port_number(),
                 Opts :: [socket_setopt()],
-                Protocol :: socket_protocol(),
+                Protocol :: socket_protocol() | 'mptcp',
                 Family :: address_family(),
                 Type :: socket_type(),
                 Module :: atom()) ->

lib/kernel/src/inet.erl

@@ -40,6 +40,8 @@
 
 %% -define(DBG(T), erlang:display({{self(), ?MODULE, ?LINE, ?FUNCTION_NAME}, T})).
 
+proto(undefined) -> ?PROTO;
+proto(Proto) -> Proto.
 
 %% my address family
 family() -> ?FAMILY.
@@ -134,17 +136,18 @@ do_connect2(SockAddr, Opts, Time) ->
     case inet:connect_options(Opts, ?MODULE) of
 	{error, Reason} -> exit(Reason);
 	{ok,
-	 #connect_opts{fd     = Fd,
-                       ifaddr = BAddr,
-                       port   = BPort,
-                       opts   = SockOpts}}
+	 #connect_opts{fd       = Fd,
+                       ifaddr   = BAddr,
+                       port     = BPort,
+                       opts     = SockOpts,
+                       protocol = Protocol}}
           when is_map(BAddr); % sockaddr_in6()
                ?port(BPort), ?ip6(BAddr);
                ?port(BPort), BAddr =:= undefined ->
 	    case
                 inet:open(
                   Fd, BAddr, BPort, SockOpts,
-                  ?PROTO, ?FAMILY, ?TYPE, ?MODULE)
+                  proto(Protocol), ?FAMILY, ?TYPE, ?MODULE)
             of
 		{ok, S} ->
 		    case prim_inet:connect(S, SockAddr, Time) of
@@ -165,13 +168,14 @@ do_connect(Addr = {A,B,C,D,E,F,G,H}, Port, Opts, Time)
 	    fd = Fd,
 	    ifaddr = BAddr,
 	    port = BPort,
-	    opts = SockOpts}}
+	    opts = SockOpts,
+            protocol = Protocol}}
           when ?port(BPort), ?ip6(BAddr);
                ?port(BPort), BAddr =:= undefined ->
 	    case
                 inet:open(
                   Fd, BAddr, BPort, SockOpts,
-                  ?PROTO, ?FAMILY, ?TYPE, ?MODULE)
+                  proto(Protocol), ?FAMILY, ?TYPE, ?MODULE)
             of
 		{ok, S} ->
 		    case prim_inet:connect(S, Addr, Port, Time) of
@@ -198,7 +202,8 @@ listen(Port, Opts) ->
 	    fd = Fd,
 	    ifaddr = BAddr,
 	    port = BPort,
-	    opts = SockOpts} = R}
+	    opts = SockOpts,
+            protocol = Protocol} = R}
           when is_map(BAddr); % sockaddr_in6()
                ?ip6(BAddr), ?port(BPort);
                BAddr =:= undefined, ?port(BPort) ->
@@ -209,7 +214,7 @@ listen(Port, Opts) ->
 	    case
                 inet:open_bind(
                   Fd, BAddr, BPort, SockOpts,
-                  ?PROTO, ?FAMILY, ?TYPE, ?MODULE)
+                  proto(Protocol), ?FAMILY, ?TYPE, ?MODULE)
             of
 		{ok, S} ->
 		    case prim_inet:listen(S, R#listen_opts.backlog) of

lib/kernel/src/inet6_tcp.erl

@@ -41,6 +41,13 @@
 -define(INET_TYPE_DGRAM,      2).
 -define(INET_TYPE_SEQPACKET,  3).
 
+%% protocols
+-define(INET_PROTO_DEFAULT,   0).
+-define(INET_PROTO_TCP,       1).
+-define(INET_PROTO_UDP,       2).
+-define(INET_PROTO_SCTP,      3).
+-define(INET_PROTO_MPTCP,     4).
+
 %% socket modes, INET_LOPT_MODE
 -define(INET_MODE_LIST,	      0).
 -define(INET_MODE_BINARY,     1).
@@ -415,22 +422,24 @@
 %% deliver = term
 %% active  = false
 %%
--record(connect_opts, 
-	{ 
+-record(connect_opts,
+	{
 	  ifaddr,           %% don't bind explicitly, let connect decide
 	  port   = 0,       %% bind to port (default is dynamic port)
 	  fd     = -1,      %% fd >= 0 => already bound
-	  opts   = []       %% [{active,true}] added in inet:connect_options
+	  opts   = [],      %% [{active,true}] added in inet:connect_options
+          protocol = undefined
 	 }).
 
--record(listen_opts, 
-	{ 
+-record(listen_opts,
+	{
 	  ifaddr,                    %% interpreted as 'any' in *_tcp.erl
 	  port   = 0,                %% bind to port (default is dynamic port)
 	  backlog = ?LISTEN_BACKLOG, %% backlog
 	  fd      = -1,              %% %% fd >= 0 => already bound
-	  opts   = []                %% [{active,true}] added in 
+	  opts   = [],               %% [{active,true}] added in
 	                             %% inet:listen_options
+          protocol = undefined
 	 }).
 
 -record(udp_opts,