diff options
| author | Anders Svensson <[email protected]> | 2015-03-05 01:27:13 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-05 01:27:13 +0100 |
| commit | 60954931caea08ae05f56db698877d70ee977655 (patch) | |
| tree | a47ae1b4d97e2f1a46c178383fb79edfd1fc8d9c /lib | |
| parent | 81e0fab00242b6ed5936bd056ce05fa181482b4f (diff) | |
| parent | bf351d224810e95330c8d317b6d54cc010c5f8f0 (diff) | |
| download | otp-60954931caea08ae05f56db698877d70ee977655.tar.gz otp-60954931caea08ae05f56db698877d70ee977655.tar.bz2 otp-60954931caea08ae05f56db698877d70ee977655.zip | |
Merge branch 'anders/diameter/retransmission/OTP-12415' into maint
* anders/diameter/retransmission/OTP-12415:
Fix retransmission of messages sent as header/avps list
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diameter/src/base/diameter_codec.erl | 3 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_traffic.erl | 19 |
2 files changed, 19 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl index a2b04bfd63..f9bc44cf61 100644 --- a/lib/diameter/src/base/diameter_codec.erl +++ b/lib/diameter/src/base/diameter_codec.erl @@ -390,6 +390,9 @@ sequence_numbers(#diameter_packet{bin = Bin}) sequence_numbers(#diameter_packet{header = #diameter_header{} = H}) -> sequence_numbers(H); +sequence_numbers(#diameter_packet{msg = [#diameter_header{} = H | _]}) -> + sequence_numbers(H); + sequence_numbers(#diameter_header{hop_by_hop_id = H, end_to_end_id = E}) -> {H,E}; diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl index e3ecd9c930..0b503338a6 100644 --- a/lib/diameter/src/base/diameter_traffic.erl +++ b/lib/diameter/src/base/diameter_traffic.erl @@ -1392,6 +1392,21 @@ make_request_packet(#diameter_packet{header = Hdr} = Pkt, make_request_packet(Msg, Pkt) -> Pkt#diameter_packet{msg = Msg}. +%% make_retransmit_packet/2 + +make_retransmit_packet(#diameter_packet{msg = [#diameter_header{} = Hdr + | Avps]} + = Pkt) -> + Pkt#diameter_packet{msg = [make_retransmit_header(Hdr) | Avps]}; + +make_retransmit_packet(#diameter_packet{header = Hdr} = Pkt) -> + Pkt#diameter_packet{header = make_retransmit_header(Hdr)}. + +%% make_retransmit_header/1 + +make_retransmit_header(Hdr) -> + Hdr#diameter_header{is_retransmitted = true}. + %% fold_record/2 fold_record(undefined, R) -> @@ -1678,9 +1693,7 @@ retransmit({TPid, Caps, App} have_request(Pkt0, TPid) %% Don't failover to a peer we've andalso ?THROW(timeout), %% already sent to. - #diameter_packet{header = Hdr0} = Pkt0, - Hdr = Hdr0#diameter_header{is_retransmitted = true}, - Pkt = Pkt0#diameter_packet{header = Hdr}, + Pkt = make_retransmit_packet(Pkt0), retransmit(cb(App, prepare_retransmit, [Pkt, SvcName, {TPid, Caps}]), Transport, |