From 4921cb2d51464c1520b6e6383cb1180133569df2 Mon Sep 17 00:00:00 2001 From: Michal Nowikowski Date: Wed, 13 Feb 2019 12:39:33 +0100 Subject: [PATCH] perfdhcp avalanche: added ipv6 part --- src/bin/perfdhcp/avalanche_scen.cc | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/bin/perfdhcp/avalanche_scen.cc b/src/bin/perfdhcp/avalanche_scen.cc index e997f7494c..3c96946305 100644 --- a/src/bin/perfdhcp/avalanche_scen.cc +++ b/src/bin/perfdhcp/avalanche_scen.cc @@ -102,12 +102,23 @@ AvalancheScen::run() { now = microsec_clock::universal_time(); if (now - prev_cycle_time > milliseconds(200)) { // check if 0.2s elapsed prev_cycle_time = now; - auto still_left_cnt_do = resendPackets(ExchangeType::DO); - auto still_left_cnt_ra = resendPackets(ExchangeType::RA); - if (still_left_cnt_do + still_left_cnt_ra == 0) { + int still_left_cnt = 0; + if (options.getIpVersion() == 4) { + still_left_cnt += resendPackets(ExchangeType::DO); + still_left_cnt += resendPackets(ExchangeType::RA); + } else { + still_left_cnt += resendPackets(ExchangeType::SA); + still_left_cnt += resendPackets(ExchangeType::RR); + } + + if (still_left_cnt == 0) { break; } } + + if (tc_.interrupted()) { + break; + } } auto stop = microsec_clock::universal_time(); -- 2.47.2