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/inet_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/inet_udp.erl')
-rw-r--r-- | lib/kernel/src/inet_udp.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/inet_udp.erl b/lib/kernel/src/inet_udp.erl index 60bd96f332..80d930fe10 100644 --- a/lib/kernel/src/inet_udp.erl +++ b/lib/kernel/src/inet_udp.erl @@ -52,7 +52,7 @@ open(Port, Opts) -> ifaddr=BAddr={A,B,C,D}, port=BPort, opts=SockOpts}} when ?ip(A,B,C,D), ?port(BPort) -> - inet:open(Fd,BAddr,BPort,SockOpts,udp,inet,?MODULE); + inet:open(Fd,BAddr,BPort,SockOpts,udp,inet,dgram,?MODULE); {ok, _} -> exit(badarg) end. @@ -93,7 +93,7 @@ controlling_process(Socket, NewOwner) -> fdopen(Fd, Opts) -> inet:fdopen(Fd, optuniquify([{recbuf, ?RECBUF} | Opts]), - udp, inet, ?MODULE). + udp, inet, dgram, ?MODULE). %% Remove all duplicate options from an option list. |