From 656322a21eb5412f3c58573fa167bc74ed991231 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 20 Dec 2012 16:34:02 +0100
Subject: Fix setting of Application-ID

An answer message with the E flag erroneously set the value to 0.
---
 lib/diameter/src/base/diameter_codec.erl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/diameter/src/base/diameter_codec.erl')

diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index a94d37f7a8..0b0bfe3f0a 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -193,9 +193,11 @@ encode_avps(Avps) ->
 
 msg_header(Mod, 'answer-message' = MsgName, Header) ->
     ?BASE = Mod,
-    #diameter_header{cmd_code = Code} = Header,
-    {_, Flags, ApplId} = ?BASE:msg_header(MsgName),
-    {Code, Flags, ApplId};
+    #diameter_header{application_id = Aid,
+                     cmd_code = Code}
+        = Header,
+    {-1, Flags, ?DIAMETER_APP_ID_COMMON} = ?BASE:msg_header(MsgName),
+    {Code, Flags, Aid};
 
 msg_header(Mod, MsgName, _) ->
     Mod:msg_header(MsgName).
-- 
cgit v1.2.3