espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-07-30 15:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update otLog*() to not require line separators. (#854)

Browse Source
This commit is contained in:
Jonathan Hui
2016-10-20 19:55:12 -07:00
committed by GitHub
parent 5346d81669
commit 35e7fbf733
25 changed files with 194 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+21 -21
View File
@@ -294,7 +294,7 @@ ThreadError Mle::Discover(uint32_t aScanChannels, uint16_t aScanDuration, uint16
mIsDiscoverInProgress = true;
otLogInfoMle("Sent discovery request\n");
otLogInfoMle("Sent discovery request");
exit:
@@ -391,7 +391,7 @@ ThreadError Mle::SetStateDetached(void)
mMleRouter.HandleDetachStart();
mNetif.GetIp6().SetForwardingEnabled(false);
otLogInfoMle("Mode -> Detached\n");
otLogInfoMle("Mode -> Detached");
return kThreadError_None;
}
@@ -430,7 +430,7 @@ ThreadError Mle::SetStateChild(uint16_t aRloc16)
mNetif.GetAnnounceBeginServer().SendAnnounce(1 << mPreviousChannel);
}
otLogInfoMle("Mode -> Child\n");
otLogInfoMle("Mode -> Child");
return kThreadError_None;
}
@@ -1253,11 +1253,11 @@ ThreadError Mle::SendParentRequest(void)
switch (mParentRequestState)
{
case kParentRequestRouter:
otLogInfoMle("Sent parent request to routers\n");
otLogInfoMle("Sent parent request to routers");
break;
case kParentRequestChild:
otLogInfoMle("Sent parent request to all devices\n");
otLogInfoMle("Sent parent request to all devices");
break;
default:
@@ -1305,7 +1305,7 @@ ThreadError Mle::SendChildIdRequest(void)
destination.mFields.m16[0] = HostSwap16(0xfe80);
destination.SetIid(mParent.mMacAddr);
SuccessOrExit(error = SendMessage(*message, destination));
otLogInfoMle("Sent Child ID Request\n");
otLogInfoMle("Sent Child ID Request");
if ((mDeviceMode & ModeTlv::kModeRxOnWhenIdle) == 0)
{
@@ -1337,7 +1337,7 @@ ThreadError Mle::SendDataRequest(const Ip6::Address &aDestination, const uint8_t
SuccessOrExit(error = SendMessage(*message, aDestination));
otLogInfoMle("Sent Data Request\n");
otLogInfoMle("Sent Data Request");
exit:
@@ -1414,7 +1414,7 @@ ThreadError Mle::SendChildUpdateRequest(void)
destination.SetIid(mParent.mMacAddr);
SuccessOrExit(error = SendMessage(*message, destination));
otLogInfoMle("Sent Child Update Request\n");
otLogInfoMle("Sent Child Update Request");
if ((mDeviceMode & ModeTlv::kModeRxOnWhenIdle) == 0)
{
@@ -1461,7 +1461,7 @@ ThreadError Mle::SendAnnounce(uint8_t aChannel)
destination.mFields.m16[7] = HostSwap16(0x0001);
SuccessOrExit(error = SendMessage(*message, destination));
otLogInfoMle("sent announce on channel %d\n", aChannel);
otLogInfoMle("sent announce on channel %d", aChannel);
exit:
@@ -1714,7 +1714,7 @@ void Mle::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageIn
{
if (frameCounter < neighbor->mValid.mMleFrameCounter)
{
otLogDebgMle("mle frame reject 1\n");
otLogDebgMle("mle frame reject 1");
ExitNow();
}
}
@@ -1722,7 +1722,7 @@ void Mle::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageIn
{
if (keySequence <= neighbor->mKeySequence)
{
otLogDebgMle("mle frame reject 2\n");
otLogDebgMle("mle frame reject 2");
ExitNow();
}
@@ -1744,7 +1744,7 @@ void Mle::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageIn
command == Header::kCommandChildUpdateRequest ||
command == Header::kCommandAnnounce))
{
otLogDebgMle("mle sequence unknown! %d\n", command);
otLogDebgMle("mle sequence unknown! %d", command);
ExitNow();
}
}
@@ -1830,7 +1830,7 @@ ThreadError Mle::HandleAdvertisement(const Message &aMessage, const Ip6::Message
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kLeaderData, sizeof(leaderData), leaderData));
VerifyOrExit(leaderData.IsValid(), error = kThreadError_Parse);
otLogInfoMle("Received advertisement from %04x\n", sourceAddress.GetRloc16());
otLogInfoMle("Received advertisement from %04x", sourceAddress.GetRloc16());
if (mDeviceState != kDeviceStateDetached)
{
@@ -1907,7 +1907,7 @@ ThreadError Mle::HandleDataResponse(const Message &aMessage, const Ip6::MessageI
bool dataRequest = false;
Tlv tlv;
otLogInfoMle("Received Data Response\n");
otLogInfoMle("Received Data Response");
// Leader Data
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kLeaderData, sizeof(leaderData), leaderData));
@@ -2093,7 +2093,7 @@ ThreadError Mle::HandleParentResponse(const Message &aMessage, const Ip6::Messag
ChallengeTlv challenge;
int8_t diff;
otLogInfoMle("Received Parent Response\n");
otLogInfoMle("Received Parent Response");
// Response
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kResponse, sizeof(response), response));
@@ -2232,7 +2232,7 @@ ThreadError Mle::HandleChildIdResponse(const Message &aMessage, const Ip6::Messa
uint16_t offset;
uint8_t numRouters = 0;
otLogInfoMle("Received Child ID Response\n");
otLogInfoMle("Received Child ID Response");
VerifyOrExit(mParentRequestState == kChildIdRequest, ;);
@@ -2346,7 +2346,7 @@ ThreadError Mle::HandleChildUpdateResponse(const Message &aMessage, const Ip6::M
NetworkDataTlv networkData;
uint8_t tlvs[] = {Tlv::kNetworkData};
otLogInfoMle("Received Child Update Response\n");
otLogInfoMle("Received Child Update Response");
// Status
if (Tlv::GetTlv(aMessage, Tlv::kStatus, sizeof(status), status) == kThreadError_None)
@@ -2457,7 +2457,7 @@ ThreadError Mle::HandleAnnounce(const Message &aMessage, const Ip6::MessageInfo
const MeshCoP::Timestamp *localTimestamp;
PanIdTlv panid;
otLogInfoMle("Received announce\n");
otLogInfoMle("Received announce");
SuccessOrExit(Tlv::GetTlv(aMessage, Tlv::kChannel, sizeof(channel), channel));
VerifyOrExit(channel.IsValid(),);
@@ -2504,7 +2504,7 @@ ThreadError Mle::HandleDiscoveryRequest(const Message &aMessage, const Ip6::Mess
uint16_t offset;
uint16_t end;
otLogInfoMle("Received discovery request\n");
otLogInfoMle("Received discovery request");
// only Routers and REEDs respond
VerifyOrExit((mDeviceMode & ModeTlv::kModeFFD) != 0, ;);
@@ -2636,7 +2636,7 @@ ThreadError Mle::SendDiscoveryResponse(const Ip6::Address &aDestination, uint16_
SuccessOrExit(error = SendMessage(*message, aDestination));
otLogInfoMle("Sent discovery response\n");
otLogInfoMle("Sent discovery response");
exit:
@@ -2663,7 +2663,7 @@ ThreadError Mle::HandleDiscoveryResponse(const Message &aMessage, const Ip6::Mes
uint16_t offset;
uint16_t end;
otLogInfoMle("Handle discovery response\n");
otLogInfoMle("Handle discovery response");
VerifyOrExit(mIsDiscoverInProgress, error = kThreadError_Drop);