Merge branch 'maint'

3 files changed, 108 insertions, 4 deletions

diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 1e909cb6f2..1049e72ffe 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -185,6 +185,22 @@
 
 </section>
 
+<section><title>Kernel 3.2.0.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The 'raw' socket option could not be used multiple times
+	    in one call to any e.g gen_tcp function because only one
+	    of the occurrences were used. This bug has been fixed,
+	    and also a small bug concerning propagating error codes
+	    from within inet:setopts/2.</p>
+          <p>Own Id: OTP-11482 Aux Id: seq12872 </p>
+          </item>
+        </list>
+      </section>
+    </section>
+
+
 <section><title>Kernel 3.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 855c6377a3..b573112445 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -692,6 +692,7 @@ connect_options(Opts, Family) ->
     case con_opt(Opts, BaseOpts, connect_options()) of
 	{ok, R} ->
 	    {ok, R#connect_opts {
+		   opts = lists:reverse(R#connect_opts.opts),
 		   ifaddr = translate_ip(R#connect_opts.ifaddr, Family)
 		  }};
 	Error -> Error	    
@@ -762,6 +763,7 @@ listen_options(Opts, Family) ->
     case list_opt(Opts, BaseOpts, listen_options()) of
 	{ok, R} ->
 	    {ok, R#listen_opts {
+		   opts = lists:reverse(R#listen_opts.opts),
 		   ifaddr = translate_ip(R#listen_opts.ifaddr, Family)
 		  }};
 	Error -> Error
@@ -820,6 +822,7 @@ udp_options(Opts, Family) ->
     case udp_opt(Opts, #udp_opts { }, udp_options()) of
 	{ok, R} ->
 	    {ok, R#udp_opts {
+		   opts = lists:reverse(R#udp_opts.opts),
 		   ifaddr = translate_ip(R#udp_opts.ifaddr, Family)
 		  }};
 	Error -> Error
@@ -893,9 +896,12 @@ sctp_options() ->
 sctp_options(Opts, Mod)  ->
     case sctp_opt(Opts, Mod, #sctp_opts{}, sctp_options()) of
 	{ok,#sctp_opts{ifaddr=undefined}=SO} -> 
-	    {ok,SO#sctp_opts{ifaddr=Mod:translate_ip(?SCTP_DEF_IFADDR)}};
-	{ok,_}=OK ->
-	    OK;
+	    {ok,
+	     SO#sctp_opts{
+	       opts=lists:reverse(SO#sctp_opts.opts),
+	       ifaddr=Mod:translate_ip(?SCTP_DEF_IFADDR)}};
+	{ok,SO} ->
+	    {ok,SO#sctp_opts{opts=lists:reverse(SO#sctp_opts.opts)}};
 	Error -> Error
     end.
 
@@ -967,6 +973,8 @@ add_opt(Name, Val, Opts, As) ->
     case lists:member(Name, As) of
 	true ->
 	    case prim_inet:is_sockopt_val(Name, Val) of
+		true when Name =:= raw ->
+		    {ok, [{Name,Val} | Opts]};
 		true ->
 		    Opts1 = lists:keydelete(Name, 1, Opts),
 		    {ok, [{Name,Val} | Opts1]};
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index 1262f36fae..cb522c8abe 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2015. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
 	 simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
+	 multiple_raw/1, multiple_raw_getbin/1,
 	 doc_examples_raw/1,doc_examples_raw_getbin/1,
 	 large_raw/1,large_raw_getbin/1,combined/1,combined_getbin/1,
 	 ipv6_v6only_udp/1, ipv6_v6only_tcp/1, ipv6_v6only_sctp/1,
@@ -65,6 +66,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [simple, loop_all, simple_raw, simple_raw_getbin,
+     multiple_raw, multiple_raw_getbin,
      doc_examples_raw, doc_examples_raw_getbin, large_raw,
      large_raw_getbin, combined, combined_getbin,
      ipv6_v6only_udp, ipv6_v6only_tcp, ipv6_v6only_sctp,
@@ -185,6 +187,84 @@ nintbin2int(<<Int:16/native>>) -> Int;
 nintbin2int(<<Int:8/native>>) -> Int;
 nintbin2int(<<>>) -> 0.
 
+
+
+multiple_raw(suite) -> [];
+multiple_raw(doc) -> "Test setopt/getopt of multiple raw options.";
+multiple_raw(Config) when is_list(Config) ->
+    do_multiple_raw(Config,false).
+multiple_raw_getbin(suite) -> [];
+multiple_raw_getbin(doc) -> "Test setopt/getopt of multiple raw options, "
+			      "with binaries in getopt.";
+multiple_raw_getbin(Config) when is_list(Config) ->
+    do_multiple_raw(Config,true).
+
+do_multiple_raw(Config, Binary) ->
+    Port = start_helper(Config),
+    SolSocket = ask_helper(Port, ?C_GET_SOL_SOCKET),
+    SoKeepalive = ask_helper(Port, ?C_GET_SO_KEEPALIVE),
+    SoKeepaliveTrue = {raw,SolSocket,SoKeepalive,<<1:32/native>>},
+    SoKeepaliveFalse = {raw,SolSocket,SoKeepalive,<<0:32/native>>},
+    SoReuseaddr = ask_helper(Port, ?C_GET_SO_REUSEADDR),
+    SoReuseaddrTrue = {raw,SolSocket,SoReuseaddr,<<1:32/native>>},
+    SoReuseaddrFalse = {raw,SolSocket,SoReuseaddr,<<0:32/native>>},
+    {S1,S2} =
+	create_socketpair(
+	  [SoReuseaddrFalse,SoKeepaliveTrue],
+	  [SoKeepaliveFalse,SoReuseaddrTrue]),
+    {ok,[{reuseaddr,false},{keepalive,true}]} =
+	inet:getopts(S1, [reuseaddr,keepalive]),
+    {ok,
+     [{raw,SolSocket,SoReuseaddr,S1R1},
+      {raw,SolSocket,SoKeepalive,S1K1}]} =
+	inet:getopts(
+	  S1,
+	  [{raw,SolSocket,SoReuseaddr,binarify(4, Binary)},
+	   {raw,SolSocket,SoKeepalive,binarify(4, Binary)}]),
+    true = nintbin2int(S1R1) =:= 0,
+    true = nintbin2int(S1K1) =/= 0,
+    {ok,[{keepalive,false},{reuseaddr,true}]} =
+	inet:getopts(S2, [keepalive,reuseaddr]),
+    {ok,
+     [{raw,SolSocket,SoKeepalive,S2K1},
+      {raw,SolSocket,SoReuseaddr,S2R1}]} =
+	inet:getopts(
+	  S2,
+	  [{raw,SolSocket,SoKeepalive,binarify(4, Binary)},
+	   {raw,SolSocket,SoReuseaddr,binarify(4, Binary)}]),
+    true = nintbin2int(S2K1) =:= 0,
+    true = nintbin2int(S2R1) =/= 0,
+    %%
+    ok = inet:setopts(
+	   S1, [SoReuseaddrTrue,SoKeepaliveFalse]),
+    ok = inet:setopts(
+	   S2, [SoKeepaliveTrue,SoReuseaddrFalse]),
+    {ok,
+     [{raw,SolSocket,SoReuseaddr,S1R2},
+      {raw,SolSocket,SoKeepalive,S1K2}]} =
+	inet:getopts(
+	  S1,
+	  [{raw,SolSocket,SoReuseaddr,binarify(4, Binary)},
+	   {raw,SolSocket,SoKeepalive,binarify(4, Binary)}]),
+    true = nintbin2int(S1R2) =/= 0,
+    true = nintbin2int(S1K2) =:= 0,
+    {ok,
+     [{raw,SolSocket,SoKeepalive,S2K2},
+      {raw,SolSocket,SoReuseaddr,S2R2}]} =
+	inet:getopts(
+	  S2,
+	  [{raw,SolSocket,SoKeepalive,binarify(4, Binary)},
+	   {raw,SolSocket,SoReuseaddr,binarify(4, Binary)}]),
+    true = nintbin2int(S2K2) =/= 0,
+    true = nintbin2int(S2R2) =:= 0,
+    %%
+    gen_tcp:close(S1),
+    gen_tcp:close(S2),
+    stop_helper(Port),
+    ok.
+
+
+
 doc_examples_raw(suite) -> [];
 doc_examples_raw(doc) -> "Test that the example code from the documentation "
 			     "works";