Merge branch 'anders/diameter/avp_errors/OTP-10202' into maint

* anders/diameter/avp_errors/OTP-10202:
  Add a testcase
  Fix answer-message blunder

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 54594db292..725cccda1e 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -2617,9 +2617,15 @@ str(T) ->
 %% question. The third form allows messages to be sent as is, without
 %% a dictionary, which is needed in the case of relay agents, for one.
 
+%% Messages will be header/avps list as a relay and the only AVP's we
+%% look for are in the common dictionary. This is required since the
+%% relay dictionary doesn't inherit the common dictionary (which maybe
+%% it should).
 get_avp_value(?RELAY, Name, Msg) ->
     get_avp_value(?BASE, Name, Msg);
 
+%% Message sent as a header/avps list, probably a relay case but not
+%% necessarily.
 get_avp_value(Dict, Name, [#diameter_header{} | Avps]) ->
     try
         {Code, _, VId} = Dict:avp_header(Name),
@@ -2633,6 +2639,7 @@ get_avp_value(Dict, Name, [#diameter_header{} | Avps]) ->
             undefined
     end;
 
+%% Outgoing message as a name/values list.
 get_avp_value(_, Name, [_MsgName | Avps]) ->
     case lists:keyfind(Name, 1, Avps) of
         {_, V} ->
@@ -2641,6 +2648,11 @@ get_avp_value(_, Name, [_MsgName | Avps]) ->
             undefined
     end;
 
+%% Record might be an answer message in the common dictionary.
+get_avp_value(Dict, Name, Rec)
+  when Dict /= ?BASE, element(1, Rec) == 'diameter_base_answer-message' ->
+    get_avp_value(?BASE, Name, Rec);
+
 %% Message is typically a record but not necessarily: diameter:call/4
 %% can be passed an arbitrary term.
 get_avp_value(Dict, Name, Rec) ->