From 56c0af010d6da861b8e8675ba5309381d926c67e Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Tue, 26 Mar 2013 09:51:59 +0100
Subject: Deal with config errors detected at transport start less brutally

Crashing watchdog and peer_fsm processes was somewhat unseemly. Emit an
error report and die silently instead.
---
 lib/diameter/src/base/diameter_peer_fsm.erl | 25 +++++++++++++++++++++----
 lib/diameter/src/base/diameter_watchdog.erl |  3 ++-
 2 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'lib/diameter/src')

diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 3b8c49b7e8..bee3e507fd 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -844,8 +844,12 @@ a('DPR', #diameter_caps{origin_host = {Host, _},
 %% recv_CER/2
 
 recv_CER(CER, #state{service = Svc, dictionary = Dict}) ->
-    {ok, T} = diameter_capx:recv_CER(CER, Svc, Dict),
-    T.
+    case diameter_capx:recv_CER(CER, Svc, Dict) of
+        {ok, T} ->
+            T;
+        {error, Reason} ->
+            close({'CER', CER, Svc, Dict, Reason})
+    end.
 
 %% handle_CEA/1
 
@@ -905,8 +909,12 @@ recv_CEA(#diameter_packet{header = #diameter_header{version
                           errors = []},
          #state{service = Svc,
                 dictionary = Dict}) ->
-    {ok, T} = diameter_capx:recv_CEA(CEA, Svc, Dict),
-    T;
+    case diameter_capx:recv_CEA(CEA, Svc, Dict) of
+        {ok, T} ->
+            T;
+        {error, Reason} ->
+            close({'CEA', CEA, Svc, Dict, Reason})
+    end;
 
 recv_CEA(Pkt, S) ->
     close({'CEA', caps(S), Pkt}).
@@ -985,8 +993,17 @@ capz(#diameter_caps{} = L, #diameter_caps{} = R) ->
 %% close/1
 
 close(Reason) ->
+    report(Reason),
     throw({?MODULE, close, Reason}).
 
+%% Could possibly log more here.
+report({M, _, _, _, _} = T)
+  when M == 'CER';
+       M == 'CEA' ->
+    diameter_lib:error_report(failure, T);
+report(_) ->
+    ok.
+
 %% dwa/1
 
 dwa(#diameter_caps{origin_host = OH,
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 3cbf91c574..41c493ff20 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -225,7 +225,8 @@ dict0(_, _, Acc) ->
     Acc.
 
 config_error(T) ->
-    ?ERROR({configuration_error, T}).
+    diameter_lib:error_report(configuration_error, T),
+    exit({shutdown, {configuration_error, T}}).
 
 %% handle_call/3
 
-- 
cgit v1.2.3