aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-03-21 13:01:15 +0100
committerAnders Svensson <[email protected]>2017-06-12 15:36:36 +0200
commitff367b200930d5107666e0a059d09e3218740567 (patch)
tree974060d0173751daca0169ca0bb5b7b5d4334396
parent636a719927b23751c12563b8e137ea8698e2abd5 (diff)
downloadotp-ff367b200930d5107666e0a059d09e3218740567.tar.gz
otp-ff367b200930d5107666e0a059d09e3218740567.tar.bz2
otp-ff367b200930d5107666e0a059d09e3218740567.zip
Remove upgrade from diameter_traffic
-rw-r--r--lib/diameter/src/base/diameter_traffic.erl14
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 96f3a307f9..ccfab22e9c 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -54,9 +54,6 @@
-define(RELAY, ?DIAMETER_DICT_RELAY).
-define(BASE, ?DIAMETER_DICT_COMMON). %% Note: the RFC 3588 dictionary
--define(DEFAULT_TIMEOUT, 5000). %% for outgoing requests
--define(DEFAULT_SPAWN_OPTS, []).
-
%% Table containing outgoing entries that live and die with
%% peer_up/down. The name is historic, since the table used to contain
%% information about outgoing requests for which an answer has yet to
@@ -67,7 +64,7 @@
-record(options,
{filter = none :: diameter:peer_filter(),
extra = [] :: list(),
- timeout = ?DEFAULT_TIMEOUT :: 0..16#FFFFFFFF,
+ timeout = 5000 :: 0..16#FFFFFFFF, %% for outgoing requests
detach = false :: boolean()}).
%% Term passed back to receive_message/6 with every incoming message.
@@ -211,11 +208,13 @@ incr_rc(Dir, Pkt, TPid, Dict0) ->
%% Handle an incoming Diameter message in a watchdog process.
%% ---------------------------------------------------------------------------
--spec receive_message(pid(), Route, #diameter_packet{}, module(), #recvdata{})
+-spec receive_message(pid(), Route, #diameter_packet{}, module(), RecvData)
-> pid()
| boolean()
when Route :: {Handler, RequestRef, Seqs}
| Ack,
+ RecvData :: {[SpawnOpt], #recvdata{}},
+ SpawnOpt :: term(),
Handler :: pid(),
RequestRef :: reference(),
Seqs :: {0..16#FFFFFFFF, 0..16#FFFFFFFF},
@@ -255,11 +254,6 @@ recv(false, false, TPid, Pkt, _, _) ->
%% spawn_request/5
spawn_request(Ack, TPid, Pkt, Dict0, {Opts, RecvData}) ->
- spawn_request(Ack, TPid, Pkt, Dict0, Opts, RecvData);
-spawn_request(Ack, TPid, Pkt, Dict0, RecvData) ->
- spawn_request(Ack, TPid, Pkt, Dict0, ?DEFAULT_SPAWN_OPTS, RecvData).
-
-spawn_request(Ack, TPid, Pkt, Dict0, Opts, RecvData) ->
spawn_opt(fun() ->
recv_request(Ack, TPid, Pkt, Dict0, RecvData)
end,