From f430c8c706de300122d10c64b316d18917e176b3 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Sun, 8 Jul 2012 21:04:25 +0200
Subject: Turn last field of #diameter_app{} into an options list

To make for easier adding of future options. The record is only passed
into transport modules so the only compatibility issue is with these.
(No issue for diameter_{tcp,sctp} and unlikely but theoretically
possible for any other implementations, which probably don't exist at
this point.)
---
 lib/diameter/include/diameter.hrl          | 3 +--
 lib/diameter/src/base/diameter_config.erl  | 2 +-
 lib/diameter/src/base/diameter_service.erl | 9 +++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/diameter/include/diameter.hrl b/lib/diameter/include/diameter.hrl
index 4273262015..47f9d1240f 100644
--- a/lib/diameter/include/diameter.hrl
+++ b/lib/diameter/include/diameter.hrl
@@ -139,7 +139,6 @@
          init_state, %% option 'state', initial callback state
          id,         %% 32-bit unsigned application identifier = Dict:id()
          mutable = false, %% boolean(), do traffic callbacks modify state?
-         answer_errors = report}). %% | callback | discard
-                                   %% how to handle containing errors?
+         options = [{answer_errors, report}]}).  %% | callback | discard
 
 -endif. %% -ifdef(diameter_hrl).
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index 9253af0de2..2095e926c3 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -600,7 +600,7 @@ app_acc({application, Opts}, Acc) ->
                    module = init_mod(Mod),
                    init_state = ModS,
                    mutable = init_mutable(M),
-                   answer_errors = init_answers(A)}
+                   options = [{answer_errors, init_answers(A)}]}
      | Acc];
 app_acc(_, Acc) ->
     Acc.
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 3dfdcee2b2..c7b216c6f7 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -953,7 +953,12 @@ init_conn(Id, Alias, TC, {SvcName, Apps}) ->
     peer_cb({ModX, peer_up, [SvcName, TC]}, Alias).
 
 find_app(Alias, Apps) ->
-    lists:keyfind(Alias, #diameter_app.alias, Apps).
+    case lists:keyfind(Alias, #diameter_app.alias, Apps) of
+        #diameter_app{options = E} = A when is_atom(E) ->  %% upgrade
+            A#diameter_app{options = [{answer_errors, E}]};
+        A ->
+            A
+    end.
 
 %% A failing peer callback brings down the service. In the case of
 %% peer_up we could just kill the transport and emit an error but for
@@ -1352,7 +1357,7 @@ send_request(Pkt, TPid, Caps, App, Opts, Caller, SvcName) ->
     #diameter_app{alias = Alias,
                   dictionary = Dict,
                   module = ModX,
-                  answer_errors = AE}
+                  options = [{answer_errors, AE} | _]}
         = App,
 
     EPkt = encode(Dict, Pkt),
-- 
cgit v1.2.3


From 4b6328306abd9fd55c1d83169350c0fbd35a8e3b Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 11 Jul 2012 02:19:25 +0200
Subject: Don't let peer_up/peer_down take down the service process

This would previously have resulted in all of a service's connections
going down, especially bad for a server.
---
 lib/diameter/src/base/diameter_service.erl | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index c7b216c6f7..77f7c6dd8e 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -945,12 +945,15 @@ ilp({Id, Alias}, {TC, SA}, LDict) ->
     init_conn(Id, Alias, TC, SA),
     ?Dict:append(Alias, TC, LDict).
 
-init_conn(Id, Alias, TC, {SvcName, Apps}) ->
+init_conn(Id, Alias, {TPid, _} = TC, {SvcName, Apps}) ->
     #diameter_app{module = ModX,
                   id = Id}  %% assert
         = find_app(Alias, Apps),
 
-    peer_cb({ModX, peer_up, [SvcName, TC]}, Alias).
+    peer_cb({ModX, peer_up, [SvcName, TC]}, Alias)
+        orelse exit(TPid, kill).  %% fake transport failure
+
+%% find_app/2
 
 find_app(Alias, Apps) ->
     case lists:keyfind(Alias, #diameter_app.alias, Apps) of
@@ -960,17 +963,17 @@ find_app(Alias, Apps) ->
             A
     end.
 
-%% A failing peer callback brings down the service. In the case of
-%% peer_up we could just kill the transport and emit an error but for
-%% peer_down we have no way to cleanup any state change that peer_up
-%% may have introduced.
+%% Don't bring down the service (and all associated connections)
+%% regardless of what happens.
 peer_cb(MFA, Alias) ->
     try state_cb(MFA, Alias) of
         ModS ->
-            mod_state(Alias, ModS)
+            mod_state(Alias, ModS),
+            true
     catch
-        E: Reason ->
-            ?ERROR({E, Reason, MFA, ?STACK})
+        E:R ->
+            diameter_lib:error_report({failure, {E, R, Alias, ?STACK}}, MFA),
+            false
     end.
 
 %%% ---------------------------------------------------------------------------
-- 
cgit v1.2.3