rename log macros to comply with ISO C++ standard
refs: #4341
Change-Id: Idb05f59660f42c01a7bf014c6fff4125a28327f2
diff --git a/src/hello-protocol.cpp b/src/hello-protocol.cpp
index 4a3d06b..b28620b 100644
--- a/src/hello-protocol.cpp
+++ b/src/hello-protocol.cpp
@@ -41,7 +41,7 @@
void
HelloProtocol::expressInterest(const ndn::Name& interestName, uint32_t seconds)
{
- _LOG_DEBUG("Expressing Interest :" << interestName);
+ NLSR_LOG_DEBUG("Expressing Interest :" << interestName);
ndn::Interest i(interestName);
i.setInterestLifetime(ndn::time::seconds(seconds));
i.setMustBeFresh(true);
@@ -73,7 +73,7 @@
interestName.append(m_nlsr.getConfParameter().getRouterPrefix().wireEncode());
expressInterest(interestName,
m_nlsr.getConfParameter().getInterestResendTime());
- _LOG_DEBUG("Sending scheduled interest: " << interestName);
+ NLSR_LOG_DEBUG("Sending scheduled interest: " << interestName);
}
}
scheduleInterest(m_nlsr.getConfParameter().getInfoInterestInterval());
@@ -82,7 +82,7 @@
void
HelloProtocol::scheduleInterest(uint32_t seconds)
{
- _LOG_DEBUG("Scheduling HELLO Interests in " << ndn::time::seconds(seconds));
+ NLSR_LOG_DEBUG("Scheduling HELLO Interests in " << ndn::time::seconds(seconds));
m_scheduler.scheduleEvent(ndn::time::seconds(seconds),
std::bind(&HelloProtocol::sendScheduledInterest, this, seconds));
@@ -98,16 +98,16 @@
// increment RCV_HELLO_INTEREST
hpIncrementSignal(Statistics::PacketType::RCV_HELLO_INTEREST);
- _LOG_DEBUG("Interest Received for Name: " << interestName);
+ NLSR_LOG_DEBUG("Interest Received for Name: " << interestName);
if (interestName.get(-2).toUri() != INFO_COMPONENT) {
- _LOG_DEBUG("INFO_COMPONENT not found or interestName: " << interestName
+ NLSR_LOG_DEBUG("INFO_COMPONENT not found or interestName: " << interestName
<< " does not match expression");
return;
}
ndn::Name neighbor;
neighbor.wireDecode(interestName.get(-1).blockFromValue());
- _LOG_DEBUG("Neighbor: " << neighbor);
+ NLSR_LOG_DEBUG("Neighbor: " << neighbor);
if (m_nlsr.getAdjacencyList().isNeighbor(neighbor)) {
std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>();
data->setName(ndn::Name(interest.getName()).appendVersion());
@@ -115,7 +115,7 @@
data->setContent(reinterpret_cast<const uint8_t*>(INFO_COMPONENT.c_str()),
INFO_COMPONENT.size());
m_nlsr.getKeyChain().sign(*data, m_nlsr.getDefaultCertName());
- _LOG_DEBUG("Sending out data for name: " << interest.getName());
+ NLSR_LOG_DEBUG("Sending out data for name: " << interest.getName());
m_nlsr.getNlsrFace().put(*data);
// increment SENT_HELLO_DATA
hpIncrementSignal(Statistics::PacketType::SENT_HELLO_DATA);
@@ -142,27 +142,27 @@
{
// interest name: /<neighbor>/NLSR/INFO/<router>
const ndn::Name interestName(interest.getName());
- _LOG_DEBUG("Interest timed out for Name: " << interestName);
+ NLSR_LOG_DEBUG("Interest timed out for Name: " << interestName);
if (interestName.get(-2).toUri() != INFO_COMPONENT) {
return;
}
ndn::Name neighbor = interestName.getPrefix(-3);
- _LOG_DEBUG("Neighbor: " << neighbor);
+ NLSR_LOG_DEBUG("Neighbor: " << neighbor);
m_nlsr.getAdjacencyList().incrementTimedOutInterestCount(neighbor);
Adjacent::Status status = m_nlsr.getAdjacencyList().getStatusOfNeighbor(neighbor);
uint32_t infoIntTimedOutCount =
m_nlsr.getAdjacencyList().getTimedOutInterestCount(neighbor);
- _LOG_DEBUG("Status: " << status);
- _LOG_DEBUG("Info Interest Timed out: " << infoIntTimedOutCount);
+ NLSR_LOG_DEBUG("Status: " << status);
+ NLSR_LOG_DEBUG("Info Interest Timed out: " << infoIntTimedOutCount);
if (infoIntTimedOutCount < m_nlsr.getConfParameter().getInterestRetryNumber()) {
// interest name: /<neighbor>/NLSR/INFO/<router>
ndn::Name interestName(neighbor);
interestName.append(NLSR_COMPONENT);
interestName.append(INFO_COMPONENT);
interestName.append(m_nlsr.getConfParameter().getRouterPrefix().wireEncode());
- _LOG_DEBUG("Resending interest: " << interestName);
+ NLSR_LOG_DEBUG("Resending interest: " << interestName);
expressInterest(interestName,
m_nlsr.getConfParameter().getInterestResendTime());
}
@@ -170,7 +170,7 @@
(infoIntTimedOutCount == m_nlsr.getConfParameter().getInterestRetryNumber())) {
m_nlsr.getAdjacencyList().setStatusOfNeighbor(neighbor, Adjacent::STATUS_INACTIVE);
- _LOG_DEBUG("Neighbor: " << neighbor << " status changed to INACTIVE");
+ NLSR_LOG_DEBUG("Neighbor: " << neighbor << " status changed to INACTIVE");
m_nlsr.getLsdb().scheduleAdjLsaBuild();
}
@@ -182,10 +182,10 @@
void
HelloProtocol::onContent(const ndn::Interest& interest, const ndn::Data& data)
{
- _LOG_DEBUG("Received data for INFO(name): " << data.getName());
+ NLSR_LOG_DEBUG("Received data for INFO(name): " << data.getName());
if (data.getSignature().hasKeyLocator()) {
if (data.getSignature().getKeyLocator().getType() == ndn::KeyLocator::KeyLocator_Name) {
- _LOG_DEBUG("Data signed with: " << data.getSignature().getKeyLocator().getName());
+ NLSR_LOG_DEBUG("Data signed with: " << data.getSignature().getKeyLocator().getName());
}
}
m_nlsr.getValidator().validate(data,
@@ -199,7 +199,7 @@
{
// data name: /<neighbor>/NLSR/INFO/<router>/<version>
ndn::Name dataName = data->getName();
- _LOG_DEBUG("Data validation successful for INFO(name): " << dataName);
+ NLSR_LOG_DEBUG("Data validation successful for INFO(name): " << dataName);
if (dataName.get(-3).toUri() == INFO_COMPONENT) {
ndn::Name neighbor = dataName.getPrefix(-4);
@@ -208,8 +208,8 @@
m_nlsr.getAdjacencyList().setTimedOutInterestCount(neighbor, 0);
Adjacent::Status newStatus = m_nlsr.getAdjacencyList().getStatusOfNeighbor(neighbor);
- _LOG_DEBUG("Neighbor : " << neighbor);
- _LOG_DEBUG("Old Status: " << oldStatus << " New Status: " << newStatus);
+ NLSR_LOG_DEBUG("Neighbor : " << neighbor);
+ NLSR_LOG_DEBUG("Old Status: " << oldStatus << " New Status: " << newStatus);
// change in Adjacency list
if ((oldStatus - newStatus) != 0) {
if (m_nlsr.getConfParameter().getHyperbolicState() == HYPERBOLIC_STATE_ON) {
@@ -228,7 +228,7 @@
HelloProtocol::onContentValidationFailed(const std::shared_ptr<const ndn::Data>& data,
const std::string& msg)
{
- _LOG_DEBUG("Validation Error: " << msg);
+ NLSR_LOG_DEBUG("Validation Error: " << msg);
}
} // namespace nlsr