F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor changes in logging

Browse Source
This commit is contained in:
Nicola Baldo
2011-11-24 17:30:17 +01:00
parent 589a861c9c
commit 03a1cdebc6
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lte/model/eps-tft-classifier.cc
View File

@@ -67,7 +67,7 @@ EpsTftClassifier::Delete (uint32_t id)
uint32_t
EpsTftClassifier::Classify (Ptr<Packet> p, LteTft::Direction direction)
{
NS_LOG_FUNCTION (this << *p << direction);
NS_LOG_FUNCTION (this << p << direction);
Ptr<Packet> pCopy = p->Copy ();
@@ -139,7 +139,7 @@ EpsTftClassifier::Classify (Ptr<Packet> p, LteTft::Direction direction)
<< " remoteAddr=" << remoteAddress
<< " localPort=" << localPort
<< " remotePort=" << remotePort
<< " tos=0x" << std::hex << tos);
<< " tos=0x" << (uint16_t) tos );
// now it is possible to classify the packet!
// we use a reverse iterator since filter priority is not implemented properly.

13
src/lte/model/lte-tft.cc
View File

@@ -59,8 +59,8 @@ std::ostream& operator<< (std::ostream& os, LteTft::PacketFilter& f)
<< " remotePortEnd: " << f.remotePortEnd
<< " localPortStart: " << f.localPortStart
<< " localPortEnd: " << f.localPortEnd
<< " typeOfService: 0x" << std::hex << (uint16_t) f.typeOfService
<< " typeOfServiceMask: 0x" << std::hex << (uint16_t) f.typeOfServiceMask;
<< " typeOfService: 0x" << std::hex << (uint16_t) f.typeOfService << std::dec
<< " typeOfServiceMask: 0x" << std::hex << (uint16_t) f.typeOfServiceMask << std::dec;
return os;
}
@@ -72,7 +72,8 @@ LteTft::PacketFilter::PacketFilter ()
remotePortStart (0),
remotePortEnd (65535),
localPortStart (0),
localPortEnd (65535),
localPortEnd (65535),
typeOfService (0),
typeOfServiceMask (0)
{
NS_LOG_FUNCTION (this);
@@ -86,7 +87,7 @@ LteTft::PacketFilter::Matches (Direction d,
uint16_t lp,
uint8_t tos)
{
NS_LOG_FUNCTION (this << d << ra << la << rp << lp << tos);
NS_LOG_FUNCTION (this << d << ra << la << rp << lp << (uint16_t) tos);
if (d & direction)
{
NS_LOG_LOGIC ("d matches");
@@ -130,7 +131,7 @@ LteTft::PacketFilter::Matches (Direction d,
}
else
{
NS_LOG_LOGIC ("d doesn't match: d=0x" << std::hex << d << " f.d=0x" << std::hex << direction);
NS_LOG_LOGIC ("d doesn't match: d=0x" << std::hex << d << " f.d=0x" << std::hex << direction << std::dec);
}
return false;
}
@@ -177,7 +178,7 @@ LteTft::Matches (Direction direction,
uint16_t localPort,
uint8_t typeOfService)
{
NS_LOG_FUNCTION (this << direction << remoteAddress << localAddress << remotePort << localPort << typeOfService);
NS_LOG_FUNCTION (this << direction << remoteAddress << localAddress << std::dec << remotePort << localPort << (uint16_t) typeOfService);
for (std::list<PacketFilter>::iterator it = m_filters.begin ();
it != m_filters.end ();
++it)