diff options
| author | Raimo Niskanen <[email protected]> | 2011-11-17 15:53:52 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2011-11-17 15:53:52 +0100 |
| commit | 067cfe79da2490d49288a50db73ad2a884411934 (patch) | |
| tree | 4a42d5214c13ed88c8d1bf88960db1411eba0336 /lib/kernel/src/inet6_udp.erl | |
| parent | 40790b549f870b61828e7590977faf827abd3a01 (diff) | |
| parent | 0cc982589f69b88fc18deb6ecfa3c7b5e9932e9d (diff) | |
| download | otp-067cfe79da2490d49288a50db73ad2a884411934.tar.gz otp-067cfe79da2490d49288a50db73ad2a884411934.tar.bz2 otp-067cfe79da2490d49288a50db73ad2a884411934.zip | |
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
...
Diffstat (limited to 'lib/kernel/src/inet6_udp.erl')
| -rw-r--r-- | lib/kernel/src/inet6_udp.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/src/inet6_udp.erl b/lib/kernel/src/inet6_udp.erl index e81d417151..ca43c94211 100644 --- a/lib/kernel/src/inet6_udp.erl +++ b/lib/kernel/src/inet6_udp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-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 @@ -45,7 +45,7 @@ open(Port, Opts) -> port=BPort, opts=SockOpts}} when ?ip6(A,B,C,D,E,F,G,H), ?port(BPort) -> - inet:open(Fd,BAddr,BPort,SockOpts,udp,inet6,?MODULE); + inet:open(Fd,BAddr,BPort,SockOpts,udp,inet6,dgram,?MODULE); {ok, _} -> exit(badarg) end. @@ -84,4 +84,4 @@ controlling_process(Socket, NewOwner) -> %% Create a port/socket from a file descriptor %% fdopen(Fd, Opts) -> - inet:fdopen(Fd, Opts, udp, inet6, ?MODULE). + inet:fdopen(Fd, Opts, udp, inet6, dgram, ?MODULE). |