aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2012-08-29 16:23:42 +0200
committerAnders Svensson <[email protected]>2012-08-29 16:23:42 +0200
commitf9732dbbfa30d0af503054775733779d8e556927 (patch)
treec37a6f8d942739a0402145125e59c249cc737d3d
parent0ef045f553099e92d7ad343756d29c1a7b2e9105 (diff)
parent63a18ced84eab9cad3e5394efe614ff61fd0e5e1 (diff)
downloadotp-f9732dbbfa30d0af503054775733779d8e556927.tar.gz
otp-f9732dbbfa30d0af503054775733779d8e556927.tar.bz2
otp-f9732dbbfa30d0af503054775733779d8e556927.zip
Merge branch 'anders/diameter/multiple_transport_modules/OTP-9885' into maint
* anders/diameter/multiple_transport_modules/OTP-9885: Dialyzer spec fixes
-rw-r--r--lib/diameter/src/base/diameter.erl2
-rw-r--r--lib/diameter/src/base/diameter_peer.erl13
2 files changed, 13 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 6703841f80..789a5db5f0 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -312,7 +312,7 @@ call(SvcName, App, Message) ->
-type transport_opt()
:: {transport_module, atom()}
| {transport_config, any()}
- | {transport_timeout, non_neg_integer() | infinity}
+ | {transport_config, any(), non_neg_integer() | infinity}
| {applications, [app_alias()]}
| {capabilities, [capability()]}
| {capabilities_cb, evaluable()}
diff --git a/lib/diameter/src/base/diameter_peer.erl b/lib/diameter/src/base/diameter_peer.erl
index a2a1c567d8..74ba709aac 100644
--- a/lib/diameter/src/base/diameter_peer.erl
+++ b/lib/diameter/src/base/diameter_peer.erl
@@ -91,10 +91,21 @@ start(_T, _Opts, #diameter_service{}) ->
Opt :: diameter:transport_opt(),
TPid :: pid(),
Addr :: inet:ip_address(),
- Tmo :: non_neg_integer(),
+ Tmo :: non_neg_integer() | infinity,
Data :: {{T, Mod, Cfg}, [Mod], [{T, [Mod], Cfg}], [Err]},
Mod :: module(),
Cfg :: term(),
+ Err :: term()
+ ; ({#diameter_service{}, Tmo, Data})
+ -> {TPid, [Addr], Tmo, Data}
+ | {error, [term()]}
+ when TPid :: pid(),
+ Addr :: inet:ip_address(),
+ Tmo :: non_neg_integer() | infinity,
+ Data :: {{T, Mod, Cfg}, [Mod], [{T, [Mod], Cfg}], [Err]},
+ T :: {connect|accept, diameter:transport_ref()},
+ Mod :: module(),
+ Cfg :: term(),
Err :: term().
%% Initial start.