resip/stack: Tuple: fix mask comparison for some platforms with 64 bi…

…t long git-svn-id: https://svn.resiprocate.org/rep/resiprocate/main@10296 ddefafc4-47db-0310-ae44-fa13212b10f2
TafThorne · Jul 19, 2013 · e72f9da · e72f9da
1 parent 4a445fe
commit e72f9da
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/resip/stack/Tuple.cxx b/resip/stack/Tuple.cxx
@@ -769,8 +769,8 @@ Tuple::isEqualWithMask(const Tuple& compare, short mask, bool ignorePort, bool i
 
          if(ignorePort || addr1->sin6_port == addr2->sin6_port)
          {
-            unsigned long mask6part;
-            unsigned long temp;
+            UInt32 mask6part;
+            UInt32 temp;
             bool match=true;
             for(int i = 3; i >= 0; i--)
             {
@@ -802,8 +802,8 @@ Tuple::isEqualWithMask(const Tuple& compare, short mask, bool ignorePort, bool i
                if((*((unsigned long*)&addr1->sin6_addr.__u6_addr.__u6_addr32[i]) & htonl(mask6part)) != 
                   (*((unsigned long*)&addr2->sin6_addr.__u6_addr.__u6_addr32[i]) & htonl(mask6part)))				  
 #else
-               if((*((unsigned long*)&addr1->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)) != 
-                  (*((unsigned long*)&addr2->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)))
+               if((*((UInt32*)&addr1->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)) != 
+                  (*((UInt32*)&addr2->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)))
 #endif
                {
                   match=false;