aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-01-17 11:39:29 +0100
committerAnders Svensson <[email protected]>2013-01-17 11:39:29 +0100
commit3bfdf85c503df603920f7a4b77ccb2a2dc438455 (patch)
tree32dc41c00cea9c154565c88ba2d9bad74f2bf643 /lib/diameter/src
parentd57c79b4cabf527102e86dd572d01cf8291e2cdc (diff)
parent8952d974a72d49ff26ca8111d967ed4940e5a4c4 (diff)
downloadotp-3bfdf85c503df603920f7a4b77ccb2a2dc438455.tar.gz
otp-3bfdf85c503df603920f7a4b77ccb2a2dc438455.tar.bz2
otp-3bfdf85c503df603920f7a4b77ccb2a2dc438455.zip
Merge branch 'anders/diameter/application_id/OTP-10655'
* anders/diameter/application_id/OTP-10655: Check application id in answers in traffic suite Fix setting of Application-ID
Diffstat (limited to 'lib/diameter/src')
-rw-r--r--lib/diameter/src/base/diameter_codec.erl8
1 files changed, 5 insertions, 3 deletions
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).