Merge branch 'raimo/sctp-dev/OTP-9239'

* raimo/sctp-dev/OTP-9239: (21 commits)
  erts: Possible bugfix for error chunk on old Solaris 10
  kernel: Documented gen_sctp:peeloff/2
  kernel: Adjust SCTP test to SuSE quirk
  erts: Fixes for SCTP on old Solaris 10
  Update preloaded files
  erts,kernel: Return eprotonosupport when SCTP is not supported
  kernel: Adjust SCTP tests to Solaris quirks
  erts: Fix SCTP decoding byteorder bug for adaptation_ind
  kernel: Rewrite SCTP test socket handler
  kernel: Fix SCTP tests for the FreeBSD protocol stack
  kernel: Bugfix - SCTP connect with sndrcvinfo in assoc_change event
  erts: Default enable SCTP in configure
  Update primary bootstrap and preloaded files
  erts: Use SCTP functions in default libs
  erts: Improve SCTP message defragmenting
  erts,kernel: Bugfix - collect fragmented SCTP messages on recv
  kernel: Add tests for gen_sctp:peeloff/2
  erts,kernel: Implement gen_sctp:peeloff/2
  kernel: Add tests for SCTP stream sockets
  erts,kernel: Add type stream sockets to SCTP
  ...

1 files changed, 13 insertions, 4 deletions

diff --git a/lib/kernel/src/inet6_sctp.erl b/lib/kernel/src/inet6_sctp.erl
index 5bf3fca647..c47483bbdd 100644
--- a/lib/kernel/src/inet6_sctp.erl
+++ b/lib/kernel/src/inet6_sctp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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,8 @@
 
 -define(FAMILY, inet6).
 -export([getserv/1,getaddr/1,getaddr/2,translate_ip/1]).
--export([open/1,close/1,listen/2,connect/5,sendmsg/3,send/4,recv/2]).
+-export([open/1,close/1,listen/2,peeloff/2,connect/5]).
+-export([sendmsg/3,send/4,recv/2]).
 
 
 
@@ -54,8 +55,8 @@ translate_ip(IP) ->
     
 open(Opts) ->
     case inet:sctp_options(Opts, ?MODULE) of
-	{ok,#sctp_opts{fd=Fd,ifaddr=Addr,port=Port,opts=SOs}} ->
-	    inet:open(Fd, Addr, Port, SOs, sctp, ?FAMILY, ?MODULE);
+	{ok,#sctp_opts{fd=Fd,ifaddr=Addr,port=Port,type=Type,opts=SOs}} ->
+	    inet:open(Fd, Addr, Port, SOs, sctp, ?FAMILY, Type, ?MODULE);
 	Error -> Error
     end.
 
@@ -65,6 +66,14 @@ close(S) ->
 listen(S, Flag) ->
     prim_inet:listen(S, Flag).
 
+peeloff(S, AssocId) ->
+    case prim_inet:peeloff(S, AssocId) of
+	{ok, NewS}=Result ->
+	    inet_db:register_socket(NewS, ?MODULE),
+	    Result;
+	Error -> Error
+    end.
+
 connect(S, Addr, Port, Opts, Timer) ->
     inet_sctp:connect(S, Addr, Port, Opts, Timer).