diff options
| author | Anders Svensson <[email protected]> | 2012-08-28 15:05:16 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-08-28 15:05:16 +0200 |
| commit | bc2b1d56047bd370dd6e1e5b5377601bfcd89d23 (patch) | |
| tree | d17e705244fdacdbec0bcef98f799f2c7e110d11 /lib/diameter/src/base/diameter_codec.erl | |
| parent | f7036408ed27781cc5d060d6966f07cb2a5e00f6 (diff) | |
| parent | de0cbe83cd96c17d75baf353e84c883b78980f98 (diff) | |
| download | otp-bc2b1d56047bd370dd6e1e5b5377601bfcd89d23.tar.gz otp-bc2b1d56047bd370dd6e1e5b5377601bfcd89d23.tar.bz2 otp-bc2b1d56047bd370dd6e1e5b5377601bfcd89d23.zip | |
Merge branch 'anders/diameter/avp_errors/OTP-10202' into maint
* anders/diameter/avp_errors/OTP-10202:
Allow an answer to opt out of setting Result-Code/Failed-AVP
Set Result-Code as an optional AVP in reply to request containing errors
Fix Destination-Host/Realm extraction for arbitrary dictionaries
Fix result code statistics for arbitrary dictionaries
Count incoming answers containing AVP decode errors
Fix counter typo
Encode fix
Diffstat (limited to 'lib/diameter/src/base/diameter_codec.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_codec.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl index fe1212b7e0..fb109fe271 100644 --- a/lib/diameter/src/base/diameter_codec.erl +++ b/lib/diameter/src/base/diameter_codec.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2011. All Rights Reserved. +%% Copyright Ericsson AB 2010-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -91,7 +91,8 @@ e(_, #diameter_packet{msg = [#diameter_header{} = Hdr | As]} = Pkt) -> Flags = make_flags(0, Hdr), - Pkt#diameter_packet{bin = <<Vsn:8, Length:24, + Pkt#diameter_packet{header = Hdr, + bin = <<Vsn:8, Length:24, Flags:8, Code:24, Aid:32, Hid:32, |