aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2016-03-09 08:26:41 +0100
committerAnders Svensson <[email protected]>2016-03-09 08:26:41 +0100
commitfa86be90274abf69451007db04fd4d21257c1843 (patch)
tree56bad6b6c848add475c3d6c3b72d113d16686638 /lib/diameter/src
parent5750206a0dc33e13913efef73e171e121c082635 (diff)
parentaafb2506a85b1bad11157f9786f2a834c9d76fae (diff)
downloadotp-fa86be90274abf69451007db04fd4d21257c1843.tar.gz
otp-fa86be90274abf69451007db04fd4d21257c1843.tar.bz2
otp-fa86be90274abf69451007db04fd4d21257c1843.zip
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src')
-rw-r--r--lib/diameter/src/base/diameter_service.erl19
-rw-r--r--lib/diameter/src/base/diameter_traffic.erl2
2 files changed, 11 insertions, 10 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 05a3fb6ded..efa4cc9108 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -137,16 +137,16 @@
peer = false :: match(boolean() | pid())}).
%% true at accepted, pid() at okay/reopen
-%% Record representing an Peer State Machine processes implemented by
+%% Record representing a Peer State Machine processes implemented by
%% diameter_peer_fsm.
-record(peer,
- {pid :: pid(),
- apps :: [{0..16#FFFFFFFF, diameter:app_alias()}] %% {Id, Alias}
- | [diameter:app_alias()], %% remote
- caps :: #diameter_caps{},
- started = diameter_lib:now(), %% at process start or sharing
- watchdog :: pid() %% key into watchdogT
- | undefined}). %% undefined if remote
+ {pid :: pid(),
+ apps :: match([{0..16#FFFFFFFF, diameter:app_alias()}] %% {Id, Alias}
+ | [diameter:app_alias()]), %% remote
+ caps :: match(#diameter_caps{}),
+ started = diameter_lib:now(), %% at process start or sharing
+ watchdog :: match(pid() %% key into watchdogT
+ | undefined)}). %% undefined if remote
%% ---------------------------------------------------------------------------
%% # start/1
@@ -583,8 +583,7 @@ init_peers({PeerT, _, _} = T, F)
PeerT);
%% Populate #peer{} table given a shared peers dict.
-init_peers({PeerT, _, _}, SDict)
- when is_integer(SDict) ->
+init_peers({PeerT, _, _}, SDict) ->
dict:fold(fun(P, As, N) ->
ets:update_element(PeerT, P, {#peer.apps, As}),
N+1
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 516353219a..c169d3fc2c 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1565,6 +1565,8 @@ answer(Pkt,
Req) ->
a(Pkt, SvcName, ModX, AE, Req).
+-spec a(_, _, _) -> no_return(). %% silence dialyzer
+
a(#diameter_packet{errors = Es}
= Pkt,
SvcName,