diff options
| author | Anders Svensson <[email protected]> | 2011-12-07 16:52:03 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-12-07 16:52:03 +0100 |
| commit | 6004f23e77856b8182fae699789b994e55691138 (patch) | |
| tree | 9fc62fe3476321494479ade6c63d259305d6ecd5 /lib/diameter/test/diameter_tls_SUITE.erl | |
| parent | 24f0d3ee266d56cc83435401230a8bb85a0464d3 (diff) | |
| parent | 1c41ee4a931c2429d35205ae04a27dd92fdd8d5a (diff) | |
| download | otp-6004f23e77856b8182fae699789b994e55691138.tar.gz otp-6004f23e77856b8182fae699789b994e55691138.tar.bz2 otp-6004f23e77856b8182fae699789b994e55691138.zip | |
Merge branch 'anders/diameter/callback_redirection/OTP-9777'
* anders/diameter/callback_redirection/OTP-9777:
Update documentation
Use diameter_callback in relay and tls suites
Use diameter_callback in failover suite
Update app suite
Smarter diameter_callback
Diffstat (limited to 'lib/diameter/test/diameter_tls_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_tls_SUITE.erl | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl index 4abc7bb23f..7854411d2e 100644 --- a/lib/diameter/test/diameter_tls_SUITE.erl +++ b/lib/diameter/test/diameter_tls_SUITE.erl @@ -58,13 +58,9 @@ stop_ssl/1]). %% diameter callbacks --export([peer_up/3, - peer_down/3, - pick_peer/4, - prepare_request/3, +-export([prepare_request/3, prepare_retransmit/3, handle_answer/4, - handle_error/4, handle_request/3]). -include("diameter.hrl"). @@ -104,7 +100,11 @@ {'Auth-Application-Id', [Dict:id()]}, {application, [{alias, ?APP_ALIAS}, {dictionary, Dict}, - {module, ?MODULE}, + {module, #diameter_callback{peer_up = false, + peer_down = false, + pick_peer = false, + handle_error = false, + default = ?MODULE}}, {answer_errors, callback}]}]). %% Config for diameter:add_transport/2. In the listening case, listen @@ -245,21 +245,6 @@ send5(_Config) -> %% =========================================================================== %% diameter callbacks -%% peer_up/3 - -peer_up(_SvcName, _Peer, State) -> - State. - -%% peer_down/3 - -peer_down(_SvcName, _Peer, State) -> - State. - -%% pick_peer/4 - -pick_peer([Peer], _, ?CLIENT, _State) -> - {ok, Peer}. - %% prepare_request/3 prepare_request(#diameter_packet{msg = Req}, @@ -284,11 +269,6 @@ handle_answer(Pkt, _Req, ?CLIENT, _Peer) -> #diameter_packet{msg = Rec, errors = []} = Pkt, Rec. -%% handle_error/4 - -handle_error(Reason, _Req, ?CLIENT, _Peer) -> - {error, Reason}. - %% handle_request/3 handle_request(#diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId}}, |