diff options
| author | Anders Svensson <[email protected]> | 2012-08-28 15:05:09 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-08-28 15:05:09 +0200 |
| commit | f7036408ed27781cc5d060d6966f07cb2a5e00f6 (patch) | |
| tree | 078078420f98329f7a088043a17e1fb9686cb647 /lib/diameter/src/base/diameter.erl | |
| parent | d4eccdc4b544215f3706408bdeabe8c231780065 (diff) | |
| parent | a907e66c93e54ffd9b4c8c84f500cd267a28ddd8 (diff) | |
| download | otp-f7036408ed27781cc5d060d6966f07cb2a5e00f6.tar.gz otp-f7036408ed27781cc5d060d6966f07cb2a5e00f6.tar.bz2 otp-f7036408ed27781cc5d060d6966f07cb2a5e00f6.zip | |
Merge branch 'anders/diameter/multiple_transport_modules/OTP-9885' into maint
* anders/diameter/multiple_transport_modules/OTP-9885:
Maintain service_info callback data in process dictionary
Maintain pid of started transport process in process dictionary
Minor spec and backwards compatibility fix
Update example code
Update documentation
Add diameter_transport for transport start indirection
Allow multiple transport_module and transport_config
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 336f0c1f2d..6703841f80 100644 --- a/lib/diameter/src/base/diameter.erl +++ b/lib/diameter/src/base/diameter.erl @@ -312,6 +312,7 @@ call(SvcName, App, Message) -> -type transport_opt() :: {transport_module, atom()} | {transport_config, any()} + | {transport_timeout, non_neg_integer() | infinity} | {applications, [app_alias()]} | {capabilities, [capability()]} | {capabilities_cb, evaluable()} |