BIND 10 master, updated. 6d42b333f446eccc9d0204bcc04df38fed0c31db [master] Merge branch 'trac2979'

[BIND 10 source code commits]

The branch, master has been updated
       via  6d42b333f446eccc9d0204bcc04df38fed0c31db (commit)
       via  9a2922daaac4af5b378144b518a1b1fec767c798 (commit)
      from  c18cb310851ea2f558fd2b6103c9f5badd4cd337 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6d42b333f446eccc9d0204bcc04df38fed0c31db
Merge: c18cb31 9a2922d
Author: Marcin Siodelski <marcin at isc.org>
Date:   Thu Jun 27 10:08:36 2013 +0200

    [master] Merge branch 'trac2979'

-----------------------------------------------------------------------

Summary of changes:
 tests/tools/perfdhcp/stats_mgr.h |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/stats_mgr.h b/tests/tools/perfdhcp/stats_mgr.h
index c51ba6d..a8b5d98 100644
--- a/tests/tools/perfdhcp/stats_mgr.h
+++ b/tests/tools/perfdhcp/stats_mgr.h
@@ -455,9 +455,16 @@ public:
                             packet_period.length().total_seconds() +
                             (static_cast<double>(packet_period.length().fractional_seconds())
                              / packet_period.length().ticks_per_second());
-                        if (drop_time_ > 0 &&
-                            (period_fractional > drop_time_)) {
-                            eraseSent(sent_packets_.template project<0>(it));
+                        if (drop_time_ > 0 && (period_fractional > drop_time_)) {
+                            // The packet pointed to by 'it' is timed out so we
+                            // have to remove it. Removal may invalidate the
+                            // next_sent_ pointer if it points to the packet
+                            // being removed. So, we set the next_sent_ to point
+                            // to the next packet after removed one. This
+                            // pointer will be further updated in the following
+                            // iterations, if the subsequent packets are also
+                            // timed out.
+                            next_sent_ = eraseSent(sent_packets_.template project<0>(it));
                             ++collected_;
                         }
                     }