diff options
| author | Anders Svensson <[email protected]> | 2015-03-24 11:02:56 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-24 11:02:56 +0100 |
| commit | 1ea921c277e69b6b0ffd49335b85e7bf36936d2d (patch) | |
| tree | 31c582bcb62cdfa0a1fbf51b47741af4eb94b521 /lib/diameter/src/base/diameter_peer_fsm.erl | |
| parent | b7d8668ea5a4215da900bfcd2a1dbd51384cb0c7 (diff) | |
| parent | b8a7df45c9e57a832f7db9b9b875b31d0ab7d29c (diff) | |
| download | otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.tar.gz otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.tar.bz2 otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.zip | |
Merge branch 'anders/diameter/DiameterURI/OTP-12589' into maint
* anders/diameter/DiameterURI/OTP-12589:
Adapt to changed DiameterURI defaults in RFC 6733
Reject transport=udp;protocol=diameter at DiameterURI encode
Diffstat (limited to 'lib/diameter/src/base/diameter_peer_fsm.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_peer_fsm.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl index af0fce57a8..0ee3986b97 100644 --- a/lib/diameter/src/base/diameter_peer_fsm.erl +++ b/lib/diameter/src/base/diameter_peer_fsm.erl @@ -187,7 +187,7 @@ i({Ack, WPid, {M, Ref} = T, Opts, {SvcOpts, Nodes, Dict0, Svc}}) -> erlang:monitor(process, WPid), wait(Ack, WPid), diameter_stats:reg(Ref), - diameter_codec:setopts(SvcOpts), + diameter_codec:setopts([{common_dictionary, Dict0} | SvcOpts]), {_,_} = Mask = proplists:get_value(sequence, SvcOpts), {[Cs,Ds], Rest} = proplists:split(Opts, [capabilities_cb, disconnect_cb]), putr(?CB_KEY, {Ref, [F || {_,F} <- Cs]}), |