Merge pull request #558 from openweave/bug/emargolis/fix-get-weave-node-id-from-addr-function

Jay Logue · web-flow · commit 80a2ffe80c3e · 2020-04-20T22:06:39.000-07:00
Fixed GetWeaveNodeIdFromAddr() Function Implementation.
diff --git a/src/lib/support/logging/DecodedIPPacket.cpp b/src/lib/support/logging/DecodedIPPacket.cpp
@@ -1,5 +1,6 @@
 /*
  *
+ *    Copyright (c) 2020 Google LLC.
  *    Copyright (c) 2014-2017 Nest Labs, Inc.
  *    All rights reserved.
  *
@@ -182,7 +183,7 @@ uint64_t DecodedIPPacket::GetWeaveNodeIdFromAddr(const uint8_t *addr)
     {
         nodeId = ((static_cast<uint64_t>(addr[8] << 24 | addr[9] << 16 | addr[10] << 8 | addr[11]) << 32) |
                   static_cast<uint64_t>(addr[12] << 24 | addr[13] << 16 | addr[14] << 8 | addr[15]))
-                  & ~(0x0200000000000000ULL);
+                  ^ kEUI64_UL_Mask;
     }
 
     return nodeId;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`*`
	`3`	`+ * Copyright (c) 2020 Google LLC.`
`3`	`4`	`* Copyright (c) 2014-2017 Nest Labs, Inc.`
`4`	`5`	`* All rights reserved.`
`5`	`6`	`*`
`@@ -182,7 +183,7 @@ uint64_t DecodedIPPacket::GetWeaveNodeIdFromAddr(const uint8_t *addr)`
`182`	`183`	`{`
`183`	`184`	`nodeId = ((static_cast<uint64_t>(addr[8] << 24 \| addr[9] << 16 \| addr[10] << 8 \| addr[11]) << 32) \|`
`184`	`185`	`static_cast<uint64_t>(addr[12] << 24 \| addr[13] << 16 \| addr[14] << 8 \| addr[15]))`
`185`		`- & ~(0x0200000000000000ULL);`
	`186`	`+ ^ kEUI64_UL_Mask;`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`return nodeId;`