From 4bbb59be72d9d81e33553e325b4e573fc3a7ad3e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 17 Oct 2013 14:45:38 -0700 Subject: [PATCH] fix use of htonl in constant outside function --- libraries/shared/src/NodeList.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index f533ad996c..12ad03e177 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -309,7 +309,7 @@ void NodeList::setNodeTypesOfInterest(const char* nodeTypesOfInterest, int numNo _nodeTypesOfInterest[numNodeTypesOfInterest] = '\0'; } -const uint32_t RFC_5389_MAGIC_COOKIE_NETWORK_ORDER = htonl(0x2112A442); +const uint32_t RFC_5389_MAGIC_COOKIE = 0x2112A442; const int NUM_BYTES_STUN_HEADER = 20; void NodeList::sendSTUNRequest() { @@ -319,6 +319,8 @@ void NodeList::sendSTUNRequest() { unsigned char stunRequestPacket[NUM_BYTES_STUN_HEADER]; int packetIndex = 0; + + const uint32_t RFC_5389_MAGIC_COOKIE_NETWORK_ORDER = htonl(RFC_5389_MAGIC_COOKIE); // leading zeros + message type const uint16_t REQUEST_MESSAGE_TYPE = htons(0x0001); @@ -364,6 +366,8 @@ void NodeList::processSTUNResponse(unsigned char* packetData, size_t dataBytes) const int NUM_BYTES_MESSAGE_TYPE_AND_LENGTH = 4; const uint16_t XOR_MAPPED_ADDRESS_TYPE = htons(0x0020); + const uint32_t RFC_5389_MAGIC_COOKIE_NETWORK_ORDER = htonl(RFC_5389_MAGIC_COOKIE); + int attributeStartIndex = NUM_BYTES_STUN_HEADER; if (memcmp(packetData + NUM_BYTES_MESSAGE_TYPE_AND_LENGTH,