diff options
| author | Erlang/OTP <[email protected]> | 2015-05-29 12:40:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-05-29 12:40:17 +0200 |
| commit | 35ca4282c5bd8a91f80397d0b5c53b661811a374 (patch) | |
| tree | aae8899a8b1a555f2c7ac197a2904094497fbe40 /lib/diameter/src | |
| parent | d55c8c8d6e56849bab20797bf35bd5dc69cfcd07 (diff) | |
| parent | f99b944f5d6faf3e8c56c10e3e81668bb44160e0 (diff) | |
| download | otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.tar.gz otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.tar.bz2 otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.zip | |
Merge branch 'anders/diameter/sctp/OTP-12744' into maint-17
* anders/diameter/sctp/OTP-12744:
Fix diameter_sctp listener race
Tweak transport suite failures
Run traffic suite over SCTP
Diffstat (limited to 'lib/diameter/src')
| -rw-r--r-- | lib/diameter/src/transport/diameter_sctp.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl index 2c8d6f0a14..f80de0a816 100644 --- a/lib/diameter/src/transport/diameter_sctp.erl +++ b/lib/diameter/src/transport/diameter_sctp.erl @@ -223,9 +223,9 @@ init(T) -> i({listen, Ref, {Opts, Addrs}}) -> {[Matches], Rest} = proplists:split(Opts, [accept]), {LAs, Sock} = AS = open(Addrs, Rest, ?DEFAULT_PORT), - proc_lib:init_ack({ok, self(), LAs}), ok = gen_sctp:listen(Sock, true), true = diameter_reg:add_new({?MODULE, listener, {Ref, AS}}), + proc_lib:init_ack({ok, self(), LAs}), start_timer(#listener{ref = Ref, socket = Sock, accept = accept(Matches)}); |