diff -r 630d2f34d719 -r 07a122eea281 telephonyprotocols/rawipnif/src/IPv6Binder.cpp --- a/telephonyprotocols/rawipnif/src/IPv6Binder.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyprotocols/rawipnif/src/IPv6Binder.cpp Wed Sep 01 12:40:21 2010 +0100 @@ -20,12 +20,6 @@ @file */ - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "IPv6BinderTraces.h" -#endif - #include #include #include "RawIPFlow.h" @@ -39,6 +33,8 @@ #include #endif +#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8(" " desc " = %d:%d:%d:%d from context"), \ + addr.u.iAddr32[3], addr.u.iAddr32[2], addr.u.iAddr32[1], addr.u.iAddr32[0]); #ifdef __EABI__ // Patch data is used and KMtuIPv6 and KRMtuIPv6 can be modified to a different value in RawIpNif.iby file @@ -46,11 +42,12 @@ extern const TInt KRMtuIPv6 = KDefaultMtu; #endif -CIPv6Binder::CIPv6Binder(CRawIPFlow& aFlow) +CIPv6Binder::CIPv6Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger) /** * Constructor */ - : CBinderBase(aFlow), + : CBinderBase(aFlow,aTheLogger), + iTheLogger(aTheLogger), iSpeedMetric(KDefaultSpeedMetric) { } @@ -86,7 +83,8 @@ * @return Standard error codes */ { - OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_CONTROL_1, "CIPv6Binder::Control [aLevel=%u, aName=%u]",aLevel, aName); + _LOG_L1C3(_L8("CIPv6Binder::Control [aLevel=%d, aName=%d]"), + aLevel, aName); if (aLevel == KSOLInterface) { @@ -207,7 +205,7 @@ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_DELETECONTEXT_1, "CIPv6Binder::DeleteContext"); + _LOG_L1C1(_L8("CIPv6Binder::DeleteContext")); if (aContextParameters.Length() != sizeof(TContextParameters)) { @@ -241,7 +239,7 @@ */ void CIPv6Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_1, "CIPv6Binder::UpdateContextConfig"); + _LOG_L1C1(_L8("CIPv6Binder::UpdateContextConfig")); // Get our IP address from the GPRS context config. TInetAddr address; @@ -270,11 +268,12 @@ iSettings.iLocalIfId.SetAddr(addrTable, 8); - OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address = %u:%u:%u:%u from context", address.Ip6Address().u.iAddr32[3], address.Ip6Address().u.iAddr32[2], address.Ip6Address().u.iAddr32[1], address.Ip6Address().u.iAddr32[0]); + LOG_IP_ADDRESS("Got local IP address", address.Ip6Address()); } else { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_3, "Couldn't get IP address from GPRS config (err: %d)",ret); + _LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"), + ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -296,11 +295,12 @@ if (ret == KErrNone) { iSettings.iPrimaryDns = address.Ip6Address(); - OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_4, "Got primary DNS = %u:%u:%u:%u from context", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]); + LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns); } else { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_5, "Couldn't get primary DNS address from GPRS config (err: %d)",ret); + _LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"), + ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -312,11 +312,12 @@ if (ret == KErrNone) { iSettings.iSecondaryDns = address.Ip6Address(); - OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_6, "Got secondary DNS = %u:%u:%u:%u from context", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]); + LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns); } else { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_7, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret); + _LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"), + ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -324,8 +325,8 @@ } else { - OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_8, "Using CommDB DNS address - Primary = %u:%u:%u:%u", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]); - OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_9, " - Secondary = %u:%u:%u:%u", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]); + LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns); + LOG_IP_ADDRESS(" - Secondary ", iSettings.iSecondaryDns); } } @@ -336,7 +337,7 @@ * @param aConnectionSpeed Our connection speed */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONNECTIONSPEED_1, "CIPv6Binder::UpdateConnectionSpeed"); + _LOG_L1C1(_L8("CIPv6Binder::UpdateConnectionSpeed")); iSpeedMetric = aConnectionSpeed; } @@ -350,7 +351,7 @@ * @return MLowerDataSender::ESendBlocked or ESendAccepted based on state of flow. */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_SEND_1, "CIPv6Binder::Send"); + _LOG_L1C1(_L8("CIPv6Binder::Send")); #ifdef __BTT_LOGGING__ LogPacket(aPdu); @@ -371,7 +372,7 @@ * @param aInfo Not used */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_NOTIFICATION_1, "CIPv6Binder::Notification"); + _LOG_L1C1(_L8("CIPv6Binder::Notification")); return KErrNone; } @@ -383,7 +384,7 @@ * @param aProtocol A pointer to a protocol */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_STARTSENDING_1, "CIPv6Binder::StartSending()"); + _LOG_L1C1(_L8("CIPv6Binder::StartSending()")); CBinderBase::StartSending(); } @@ -395,7 +396,8 @@ * @param aProtocolCode The protocol type */ { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_WANTSPROTOCOL_1, "CIPv6Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode); + _LOG_L1C2(_L8("CIPv6Binder::WantsProtocol [aProtocolCode=%X]"), + aProtocolCode); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS return ((aProtocolCode & 0x00FF) == KIp6FrameType); @@ -413,7 +415,7 @@ * @param aPdu The incoming packet */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_1, "CIPv6Binder::Process"); + _LOG_L1C1(_L8("CIPv6Binder::Process")); #ifdef __BTT_LOGGING__ LogPacket(aPdu); @@ -423,12 +425,12 @@ // been bound yet. if (iUpperReceiver) // ASSERT(iUpperReceiver) ? { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_2, "CIPv6Binder: Packet Sent to TCP/IP Protocol!!!"); + _LOG_L1C1(_L8("CIPv6Binder: Packet Sent to TCP/IP Protocol!!!")); iUpperReceiver->Process(aPdu); } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_3, "WARNING: dumping incoming packet, no protocol bound"); + _LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound")); aPdu.Free(); } } @@ -506,18 +508,19 @@ * @param aPacket The packet */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_1, "CIPv6Binder::LogPacket"); + _LOG_L1C1(_L8("CIPv6Binder::LogPacket")); TInt mBufLength = aPacket.Length() - aPacket.First()->Length(); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength); + _LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength); //Note: All the constants used on this method are a pragmatic guess of the //IP header fields. The only porpose of this method is logging. if (mBufLength < 40) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv6 packet (length=%d)", mBufLength); + _LOG_L3C2(_L8(" -doesn't appear to be a valid IPv6 packet (length=%d)") + , mBufLength); return; } @@ -526,14 +529,18 @@ if ((payloadPtr[0] & 0xF0) != 0x60) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_4, " - doesn't appear to be an IPv6 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4); + _LOG_L3C2(_L8(" - doesn't appear to be an IPv6 packet (version=0x%X)"), + (payloadPtr[0] & 0xF0) >> 4); return; } - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_5, " - traffic class: 0x%X", ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4)); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_6, " - flow label: 0x%X", ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_7, " - payload length: 0x%X", (payloadPtr[4] << 16) | payloadPtr[5]); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_8, " - next header: 0x%08X", payloadPtr[6]); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_9, " - hop limit: 0x%08X", payloadPtr[7]); + _LOG_L3C2(_L8(" - traffic class: 0x%X"), + ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4)); + _LOG_L3C2(_L8(" - flow label: 0x%X"), + ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]); + _LOG_L3C2(_L8(" - payload length: 0x%X"), + (payloadPtr[4] << 16) | payloadPtr[5]); + _LOG_L3C2(_L8(" - next header: 0x%08X"), payloadPtr[6]); + _LOG_L3C2(_L8(" - hop limit: 0x%08X"), payloadPtr[7]); } #endif // __BTT_LOGGING__