[Pkg-voip-commits] [SCM] reSIProcate branch, master, updated. debian/1.8.11-4

[Daniel Pocock]

The following commit has been merged in the master branch:
commit aeb674549cd5ee04e4087cb1b53b5849bd7eec86
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Fri Jul 19 12:38:15 2013 +0200

    Fix for 64-bit IPv6 Tuple comparison issue

diff --git a/debian/changelog b/debian/changelog
index c92e822..298a12d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+resiprocate (1.8.11-4) unstable; urgency=high
+
+  * Fix for 64-bit IPv6 Tuple comparison issue
+
+ -- Daniel Pocock <daniel at pocock.com.au>  Fri, 19 Jul 2013 12:36:53 +0200
+
 resiprocate (1.8.11-3) unstable; urgency=low
 
   * Fix for big-endian build issues
diff --git a/debian/patches/0002-Fix-for-64-bit-IPv6-Tuple-issue.patch b/debian/patches/0002-Fix-for-64-bit-IPv6-Tuple-issue.patch
new file mode 100644
index 0000000..67f4085
--- /dev/null
+++ b/debian/patches/0002-Fix-for-64-bit-IPv6-Tuple-issue.patch
@@ -0,0 +1,34 @@
+From: Daniel Pocock <daniel at pocock.com.au>
+Date: Fri, 19 Jul 2013 12:36:18 +0200
+Subject: 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;
diff --git a/debian/patches/series b/debian/patches/series
index b855d6c..867fb36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-for-big-endian-build-issues.patch
+0002-Fix-for-64-bit-IPv6-Tuple-issue.patch

-- 
reSIProcate