[Pkg-voip-commits] [resiprocate] 02/02: Fix for 64 bit IPv6 Tuple issue

[Daniel Pocock]

This is an automated email from the git hooks/post-receive script.

pocock pushed a commit to branch patch-queue/master
in repository resiprocate.

commit 4fad6347dbaffe093da7285d44fc5ab5dbabb25d
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Fri Jul 19 12:36:18 2013 +0200

    Fix for 64 bit IPv6 Tuple issue
---
 resip/stack/Tuple.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resip/stack/Tuple.cxx b/resip/stack/Tuple.cxx
index 3a18532..2652596 100644
--- 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/resiprocate.git