Merge branch 'rani/sctp-sndrcvinfo/OTP-8795' into dev

* rani/sctp-sndrcvinfo/OTP-8795:
  Fix xfer_active close expection for Solaris behaviour
  Keep default #sctp_sndrcvinfo{} fields on gen_sctp:send/4
  Fill in sinfo_assoc_id in struct sctp_sndrcvinfo for getopt()

Conflicts:
	lib/kernel/test/gen_sctp_SUITE.erl

3 files changed, 43 insertions, 9 deletions

diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index 5a31e3976f..a1542ab507 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -166,18 +166,14 @@ send(S, #sctp_assoc_change{assoc_id=AssocId}, Stream, Data)
   when is_port(S), is_integer(Stream) ->
     case inet_db:lookup_socket(S) of
 	{ok,Mod} ->
-	    Mod:sendmsg(S, #sctp_sndrcvinfo{
-			  stream   = Stream,
-			  assoc_id = AssocId}, Data);
+	    Mod:send(S, AssocId, Stream, Data);
 	Error -> Error
     end;
 send(S, AssocId, Stream, Data)
   when is_port(S), is_integer(AssocId), is_integer(Stream) ->
     case inet_db:lookup_socket(S) of
 	{ok,Mod} ->
-	    Mod:sendmsg(S, #sctp_sndrcvinfo{
-			  stream   = Stream,
-			  assoc_id = AssocId}, Data);
+	    Mod:send(S, AssocId, Stream, Data);
 	Error -> Error
     end;
 send(S, AssocChange, Stream, Data) ->
diff --git a/lib/kernel/src/inet6_sctp.erl b/lib/kernel/src/inet6_sctp.erl
index 5c49c4fec3..5bf3fca647 100644
--- a/lib/kernel/src/inet6_sctp.erl
+++ b/lib/kernel/src/inet6_sctp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -32,7 +32,7 @@
 
 -define(FAMILY, inet6).
 -export([getserv/1,getaddr/1,getaddr/2,translate_ip/1]).
--export([open/1,close/1,listen/2,connect/5,sendmsg/3,recv/2]).
+-export([open/1,close/1,listen/2,connect/5,sendmsg/3,send/4,recv/2]).
 
 
 
@@ -71,5 +71,24 @@ connect(S, Addr, Port, Opts, Timer) ->
 sendmsg(S, SRI, Data) ->
     prim_inet:sendmsg(S, SRI, Data).
 
+send(S, AssocId, Stream, Data) ->
+    case prim_inet:getopts(
+	   S,
+	   [{sctp_default_send_param,#sctp_sndrcvinfo{assoc_id=AssocId}}]) of
+	{ok,
+	 [{sctp_default_send_param,
+	   #sctp_sndrcvinfo{
+	     flags=Flags, context=Context, ppid=PPID, timetolive=TTL}}]} ->
+	    prim_inet:sendmsg(
+	      S,
+	      #sctp_sndrcvinfo{
+		flags=Flags, context=Context, ppid=PPID, timetolive=TTL,
+		assoc_id=AssocId, stream=Stream},
+	      Data);
+	_ ->
+	    prim_inet:sendmsg(
+	      S, #sctp_sndrcvinfo{assoc_id=AssocId, stream=Stream}, Data)
+    end.
+
 recv(S, Timeout) ->
     prim_inet:recvfrom(S, 0, Timeout).
diff --git a/lib/kernel/src/inet_sctp.erl b/lib/kernel/src/inet_sctp.erl
index 795bf83807..de74b573bd 100644
--- a/lib/kernel/src/inet_sctp.erl
+++ b/lib/kernel/src/inet_sctp.erl
@@ -31,7 +31,7 @@
 
 -define(FAMILY, inet).
 -export([getserv/1,getaddr/1,getaddr/2,translate_ip/1]).
--export([open/1,close/1,listen/2,connect/5,sendmsg/3,recv/2]).
+-export([open/1,close/1,listen/2,connect/5,sendmsg/3,send/4,recv/2]).
 
 
 
@@ -141,5 +141,24 @@ connect_get_assoc(S, Addr, Port, Active, Timer) ->
 sendmsg(S, SRI, Data) ->
     prim_inet:sendmsg(S, SRI, Data).
 
+send(S, AssocId, Stream, Data) ->
+    case prim_inet:getopts(
+	   S,
+	   [{sctp_default_send_param,#sctp_sndrcvinfo{assoc_id=AssocId}}]) of
+	{ok,
+	 [{sctp_default_send_param,
+	   #sctp_sndrcvinfo{
+	     flags=Flags, context=Context, ppid=PPID, timetolive=TTL}}]} ->
+	    prim_inet:sendmsg(
+	      S,
+	      #sctp_sndrcvinfo{
+		flags=Flags, context=Context, ppid=PPID, timetolive=TTL,
+		assoc_id=AssocId, stream=Stream},
+	      Data);
+	_ ->
+	    prim_inet:sendmsg(
+	      S, #sctp_sndrcvinfo{assoc_id=AssocId, stream=Stream}, Data)
+    end.
+
 recv(S, Timeout) ->
     prim_inet:recvfrom(S, 0, Timeout).