diff options
| author | Raimo Niskanen <[email protected]> | 2010-09-02 11:36:37 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-09-02 11:36:37 +0200 |
| commit | 9ea58dff408c0c72f5a6ad0e11b521a80292b024 (patch) | |
| tree | baa9d1b156746ad1d1e0312ffb989218c54fd3d2 /lib/kernel/src/inet6_sctp.erl | |
| parent | 9a30a97f07a68fc5a2f1c0095bdd88818e94089a (diff) | |
| parent | 8a0e1429ef2099378cdab0288224207d4d64332d (diff) | |
| download | otp-9ea58dff408c0c72f5a6ad0e11b521a80292b024.tar.gz otp-9ea58dff408c0c72f5a6ad0e11b521a80292b024.tar.bz2 otp-9ea58dff408c0c72f5a6ad0e11b521a80292b024.zip | |
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
Diffstat (limited to 'lib/kernel/src/inet6_sctp.erl')
| -rw-r--r-- | lib/kernel/src/inet6_sctp.erl | 23 |
1 files changed, 21 insertions, 2 deletions
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). |