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.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.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl index 1bbdf6e34d..a45d84f95b 100644 --- a/lib/diameter/src/base/diameter.erl +++ b/lib/diameter/src/base/diameter.erl @@ -343,6 +343,7 @@ call(SvcName, App, Message) -> | {capabilities_cb, evaluable()} | {capx_timeout, 'Unsigned32'()} | {disconnect_cb, evaluable()} + | {dpa_timeout, 'Unsigned32'()} | {length_errors, exit | handle | discard} | {connect_timer, 'Unsigned32'()} | {watchdog_timer, 'Unsigned32'() | {module(), atom(), list()}} |