diff options
| author | Anders Svensson <[email protected]> | 2014-01-27 12:37:20 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-01-27 12:37:20 +0100 |
| commit | c922ea6f82bb3d95d05d1f212b91e13f97e972b8 (patch) | |
| tree | 84df8d5caf0031303d40e712f76285208576c824 /lib/diameter/src | |
| parent | 35d2de0a8c04543699e4f317f3f200d9046074e6 (diff) | |
| parent | ed6395a69435354c9d3d5accbd3adbfc45d5becf (diff) | |
| download | otp-c922ea6f82bb3d95d05d1f212b91e13f97e972b8.tar.gz otp-c922ea6f82bb3d95d05d1f212b91e13f97e972b8.tar.bz2 otp-c922ea6f82bb3d95d05d1f212b91e13f97e972b8.zip | |
Merge branch 'anders/diameter/sctp_streams/OTP-11593'
* anders/diameter/sctp_streams/OTP-11593:
Change interface for communicating outbound stream id to diameter_sctp
Diffstat (limited to 'lib/diameter/src')
| -rw-r--r-- | lib/diameter/src/transport/diameter_sctp.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl index 49a530b4eb..7a4830e40c 100644 --- a/lib/diameter/src/transport/diameter_sctp.erl +++ b/lib/diameter/src/transport/diameter_sctp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2014. 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 @@ -605,11 +605,13 @@ accept(_, Pid, #listener{ref = Ref, pending = {N,Q}} = S) -> %% send/2 %% Outbound Diameter message on a specified stream ... -send(#diameter_packet{bin = Bin, transport_data = {stream, SId}}, S) -> - send(SId, Bin, S), +send(#diameter_packet{bin = Bin, transport_data = {outstream, SId}}, + #transport{streams = {_, OS}} + = S) -> + send(SId rem OS, Bin, S), S; -%% ... or not: rotate through all steams. +%% ... or not: rotate through all streams. send(Bin, #transport{streams = {_, OS}, os = N} = S) |