From: Richard Whitehouse <github@richardwhiuk.com>
Date: Tue, 25 Jan 2011 03:26:24 +0000 (+0000)
Subject: Corrected implementation of GetInt for MOOSE Address Fragments.
X-Git-Url: https://git.richardwhiuk.com/?a=commitdiff_plain;h=2d75c3dd7bfee8d489c855c023d803b0d4c0e7b6;p=ns-moose.git

Corrected implementation of GetInt for MOOSE Address Fragments.
---

diff --git a/code/src/node/moose-prefix-address.cc b/code/src/node/moose-prefix-address.cc
index 5c8503c..1ac7177 100644
--- a/code/src/node/moose-prefix-address.cc
+++ b/code/src/node/moose-prefix-address.cc
@@ -32,8 +32,8 @@ MoosePrefixAddress::MoosePrefixAddress(const uint8_t buffer[2]){
 
 const uint16_t MoosePrefixAddress::GetInt() const{
   uint16_t i;
-  i = m_address[0];
-  i += m_address[1] << 8;
+  i = m_address[0] << 8;
+  i += m_address[1] << 0;
   return i;
 }
 
diff --git a/code/src/node/moose-suffix-address.cc b/code/src/node/moose-suffix-address.cc
index 512ffab..287d341 100644
--- a/code/src/node/moose-suffix-address.cc
+++ b/code/src/node/moose-suffix-address.cc
@@ -32,9 +32,9 @@ MooseSuffixAddress::MooseSuffixAddress(const uint8_t buffer[3]){
 
 uint32_t MooseSuffixAddress::GetInt() const {
   uint32_t val = 0;
-  val = m_address[0];
+  val = m_address[0] << 16;
   val += m_address[1] << 8;
-  val += m_address[2] << 16;
+  val += m_address[2] << 0;
   return val;
 }