diff options
| author | Anders Svensson <[email protected]> | 2013-01-17 11:39:02 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-01-17 11:39:02 +0100 |
| commit | 54366be1624b01efadbaada8d0c2f3fe590a6ebe (patch) | |
| tree | 444f2b713b3d783590f965484ae3f451b509a298 /lib | |
| parent | 5456bca05c06426bb8d45de77159734a264620e1 (diff) | |
| parent | ad4ff34da1b772fedce20cc12c76c6b7190513e4 (diff) | |
| download | otp-54366be1624b01efadbaada8d0c2f3fe590a6ebe.tar.gz otp-54366be1624b01efadbaada8d0c2f3fe590a6ebe.tar.bz2 otp-54366be1624b01efadbaada8d0c2f3fe590a6ebe.zip | |
Merge branch 'anders/diameter/make_packet/OTP-10609'
* anders/diameter/make_packet/OTP-10609:
Fix diameter_service:make_prepare_header/2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diameter/src/base/diameter_service.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl index 91384b8b91..92d1cfeba9 100644 --- a/lib/diameter/src/base/diameter_service.erl +++ b/lib/diameter/src/base/diameter_service.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2012. All Rights Reserved. +%% Copyright Ericsson AB 2010-2013. 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 @@ -1457,7 +1457,7 @@ make_prepare_packet(Mask, #diameter_packet{header = Hdr} = Pkt) -> make_prepare_packet(Mask, Msg) -> make_prepare_packet(Mask, #diameter_packet{msg = Msg}). -%% make_prepare_header/1 +%% make_prepare_header/2 make_prepare_header(Mask, undefined) -> Seq = diameter_session:sequence(Mask), @@ -1465,10 +1465,11 @@ make_prepare_header(Mask, undefined) -> hop_by_hop_id = Seq}); make_prepare_header(Mask, #diameter_header{end_to_end_id = undefined, - hop_by_hop_id = undefined}) -> + hop_by_hop_id = undefined} + = H) -> Seq = diameter_session:sequence(Mask), - make_prepare_header(#diameter_header{end_to_end_id = Seq, - hop_by_hop_id = Seq}); + make_prepare_header(H#diameter_header{end_to_end_id = Seq, + hop_by_hop_id = Seq}); make_prepare_header(Mask, #diameter_header{end_to_end_id = undefined} = H) -> Seq = diameter_session:sequence(Mask), |