Merge branch 'maint'

5 files changed, 28 insertions, 12 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.
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 597f2f14d7..f3fbbee609 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -80,7 +80,7 @@
 
 %% Accepting/connecting transport process state.
 -record(transport,
-        {socket  :: inet:socket(),  %% accept or connect socket
+        {socket  :: inet:socket() | ssl:sslsock(), %% accept or connect socket
          parent  :: pid(),          %% of process that started us
          module  :: module(),       %% gen_tcp-like module
          frag = <<>> :: binary() | {tref(), frag()},  %% message fragment
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl
index f8ee3dc1d7..ded50bf6c5 100644
--- a/lib/diameter/test/diameter_ct.erl
+++ b/lib/diameter/test/diameter_ct.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,15 +25,14 @@
 
 -export([run/1]).
 
-%% ct:run_test/1 is currently documented as returning a list of test
-%% results ... but no. Instead it returns 'ok' regardless of whether
-%% or not the suite in question has failed testcases.
+%% The makefile looks for signs of failure so ignore the ct:run_test/1
+%% return value.
 
 run([Suite]) ->
     Start = info(),
-    ok = ct:run_test([{suite, Suite},
-                      {logdir, "./log"},
-                      {auto_compile, false}]),
+    ct:run_test([{suite, Suite},
+                 {logdir, "./log"},
+                 {auto_compile, false}]),
     info(Start , info()).
 
 info() ->
diff --git a/lib/diameter/test/diameter_gen_sctp_SUITE.erl b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
index 5e65b84b56..2fde7b9fdb 100644
--- a/lib/diameter/test/diameter_gen_sctp_SUITE.erl
+++ b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -175,7 +175,8 @@ send(Sock, Id) ->
 
 send_from_multiple_clients(_) ->
     {S, Rs} = T = send_from_multiple_clients(8, 1024),
-    {false, [], _} = {?FOREVER < S,
+    Max = ?FOREVER*1000,
+    {false, [], _} = {Max < S,
                       Rs -- [OI || {O,_} = OI <- Rs, is_integer(O)],
                       T}.
 
@@ -223,6 +224,11 @@ send_from_multiple_clients(_) ->
 %%                {134,100},
 %%                {117,98},
 %%                {149,125}]}
+%%
+%% This turns out to have been due to SCTP resends as a consequence of
+%% the listener having an insufficient recbuf. Increasing the size
+%% solves the problem.
+%%
 
 send_from_multiple_clients(N, Sz)
   when is_integer(N), 0 < N, is_integer(Sz), 0 < Sz ->