diff options
| author | Anders Svensson <[email protected]> | 2015-03-23 12:37:26 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-23 12:37:26 +0100 |
| commit | 7d05e55951b4f3fc4af0febb965d3075e5ddf324 (patch) | |
| tree | 481788ecb55b80ae8b29bb7cf6608d03fed36791 /lib/diameter/src/base/diameter_config.erl | |
| parent | 88c8959a685ee5c296d57e9d50de46dbb19cc1df (diff) | |
| parent | 09e51b177e0b2c1528c99bdd1c354319e07bc421 (diff) | |
| download | otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.gz otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.bz2 otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.zip | |
Merge branch 'anders/diameter/dpr/OTP-12542' into maint
* anders/diameter/dpr/OTP-12542:
Discard CER or DWR sent with diameter:call/4
Allow DPR to be sent with diameter:call/4
Add transport_opt() dpa_timeout
Add testcase for sending DPR with diameter:call/4
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index c0a4f7df69..aa4d6e5a20 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -532,7 +532,9 @@ opt({applications, As}) -> opt({capabilities, Os}) -> is_list(Os) andalso ok == encode_CER(Os); -opt({capx_timeout, Tmo}) -> +opt({K, Tmo}) + when K == capx_timeout; + K == dpa_timeout -> ?IS_UINT32(Tmo); opt({length_errors, T}) -> |