CR fix 3
Change-Id: If6802a52f48870a1fe3c42d57d7797a5f5248b26
diff --git a/tools/ndncert-client.cpp b/tools/ndncert-client.cpp
index 3a9a2b6..844a192 100644
--- a/tools/ndncert-client.cpp
+++ b/tools/ndncert-client.cpp
@@ -46,7 +46,7 @@
shared_ptr<RequestState> requesterState = nullptr;
static void
-captureParams(std::vector<std::tuple<std::string, std::string>>& requirement)
+captureParams(std::multimap<std::string, std::string>& requirement)
{
std::list<std::string> results;
for (auto& item : requirement) {
@@ -61,12 +61,12 @@
}
}
-static std::vector<std::tuple<std::string, std::string>>
+static std::multimap<std::string, std::string>
captureParams(const std::list<std::string>& requirement)
{
- std::vector<std::tuple<std::string, std::string>> results;
+ std::multimap<std::string, std::string> results;
for (const auto& r : requirement) {
- results.emplace_back(r, "Please input: " + r);
+ results.emplace(r, "Please input: " + r);
}
captureParams(results);
return results;
@@ -300,7 +300,7 @@
size_t count = 0;
std::cerr << "***************************************\n"
<< "Step " << nStep++ << ": CA SELECTION" << std::endl;
- for (auto item : profileStorage.m_caItems) {
+ for (auto item : profileStorage.getCaItems()) {
std::cerr << "> Index: " << count++ << std::endl
<< ">> CA prefix:" << item.m_caPrefix << std::endl
<< ">> Introduction: " << item.m_caInfo << std::endl;
@@ -341,7 +341,7 @@
std::cerr << "Your input is not an existing index. Exit" << std::endl;
return;
}
- auto itemIterator = profileStorage.m_caItems.cbegin();
+ auto itemIterator = profileStorage.getCaItems().cbegin();
std::advance(itemIterator, caIndex);
auto targetCaItem = *itemIterator;
runProbe(targetCaItem);
@@ -407,7 +407,7 @@
static void
runChallenge(const std::string& challengeType)
{
- std::vector<std::tuple<std::string, std::string>> requirement;
+ std::multimap<std::string, std::string> requirement;
try {
requirement = Requester::selectOrContinueChallenge(*requesterState, challengeType);
}