diff options
author | Anders Svensson <anders@erlang.org> | 2012-08-28 15:07:17 +0200 |
---|---|---|
committer | Anders Svensson <anders@erlang.org> | 2012-08-28 15:07:17 +0200 |
commit | e3ba184dbd850ae43f43c9e4167120edc509a53e (patch) | |
tree | f161731738a0c6383307f1610c8a71638426ce16 /lib/diameter/src/base/diameter_codec.erl | |
parent | f6b0856e2fed9266e81878a6f780f6db2b80c7df (diff) | |
parent | ff76a60146dfa246efbfbed7f82de12df83bc862 (diff) | |
download | otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.tar.gz otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.tar.bz2 otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_codec.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_codec.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl index fe1212b7e0..421e280422 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 @@ -63,9 +63,9 @@ encode(Mod, #diameter_packet{} = Pkt) -> e(Mod, Pkt) catch error: Reason -> - %% Be verbose rather than letting the emulator truncate the - %% error report. - X = {Reason, ?STACK}, + %% Be verbose since a crash report may be truncated and + %% encode errors are self-inflicted. + X = {?MODULE, encode, {Reason, ?STACK}}, diameter_lib:error_report(X, {?MODULE, encode, [Mod, Pkt]}), exit(X) end; @@ -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, |