table: reorganize PIT implementation
Merge pit-{face,in,out}-record.{cpp,hpp} into pit-entry.{cpp,hpp}
and merge pit-iterator.{cpp,hpp} into pit.{cpp,hpp}.
Rename get{In,Out}Record() to find{In,Out}Record(), following the
typical C++ pattern of using the verb "find" for functions that
return iterators.
No functional changes.
Change-Id: I6740dd6cfe92ca477938ab8dc2f6271fd8b6cc26
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 4aa78e2..993f773 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -453,7 +453,7 @@
}
// has out-record?
- auto outRecord = pitEntry->getOutRecord(ingress.face);
+ auto outRecord = pitEntry->findOutRecord(ingress.face);
// if no out-record found, drop
if (outRecord == pitEntry->out_end()) {
NFD_LOG_DEBUG("onIncomingNack in=" << ingress << " nack=" << nack.getInterest().getName()
@@ -495,7 +495,7 @@
}
// has in-record?
- auto inRecord = pitEntry->getInRecord(egress);
+ auto inRecord = pitEntry->findInRecord(egress);
// if no in-record found, drop
if (inRecord == pitEntry->in_end()) {
@@ -585,15 +585,14 @@
// Dead Nonce List insert
if (upstream == nullptr) {
// insert all outgoing Nonces
- const auto& outRecords = pitEntry.getOutRecords();
- std::for_each(outRecords.begin(), outRecords.end(), [&] (const auto& outRecord) {
+ std::for_each(pitEntry.out_begin(), pitEntry.out_end(), [&] (const auto& outRecord) {
m_deadNonceList.add(pitEntry.getName(), outRecord.getLastNonce());
});
}
else {
// insert outgoing Nonce of a specific face
- auto outRecord = pitEntry.getOutRecord(*upstream);
- if (outRecord != pitEntry.getOutRecords().end()) {
+ auto outRecord = pitEntry.findOutRecord(*upstream);
+ if (outRecord != pitEntry.out_end()) {
m_deadNonceList.add(pitEntry.getName(), outRecord->getLastNonce());
}
}