Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 102D127C7 for ; Sat, 7 May 2011 17:50:06 +0000 (UTC) Received: (qmail 22982 invoked by uid 500); 7 May 2011 17:50:05 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 22934 invoked by uid 500); 7 May 2011 17:50:05 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 22927 invoked by uid 99); 7 May 2011 17:50:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 17:50:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 17:50:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 844752388A36; Sat, 7 May 2011 17:49:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1100578 - /commons/sandbox/runtime/trunk/src/main/native/shared/netaddr.c Date: Sat, 07 May 2011 17:49:42 -0000 To: commits@commons.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110507174942.844752388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Sat May 7 17:49:42 2011 New Revision: 1100578 URL: http://svn.apache.org/viewvc?rev=1100578&view=rev Log: Fix address compare Modified: commons/sandbox/runtime/trunk/src/main/native/shared/netaddr.c Modified: commons/sandbox/runtime/trunk/src/main/native/shared/netaddr.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/netaddr.c?rev=1100578&r1=1100577&r2=1100578&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/shared/netaddr.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/shared/netaddr.c Sat May 7 17:49:42 2011 @@ -797,13 +797,19 @@ ACR_NET_EXPORT(jboolean, EndpointAddress if (addr1 != 0 && addr2 != 0) { if (addr1->iplen == addr2->iplen) { if (addr1->family == AF_INET && addr2->family == AF_INET && - memcmp(&addr1->sa.sin.sin_addr, &addr2->sa.sin.sin_addr, addr1->iplen) == 0) - rv = JNI_TRUE; - else if (addr1->family == AF_INET6 && addr2->family == AF_INET6 && - memcmp(&addr1->sa.sin6.sin6_addr, &addr2->sa.sin6.sin6_addr, addr1->iplen) == 0) - rv = JNI_TRUE; + memcmp(&addr1->sa.sin.sin_addr, &addr2->sa.sin.sin_addr, addr1->iplen) == 0) { + SOCKADDR_RELEASE(sa1, addr1); + SOCKADDR_RELEASE(sa2, addr2); + return JNI_TRUE; + } + if (addr1->family == AF_INET6 && addr2->family == AF_INET6 && + memcmp(&addr1->sa.sin6.sin6_addr, &addr2->sa.sin6.sin6_addr, addr1->iplen) == 0) { + SOCKADDR_RELEASE(sa1, addr1); + SOCKADDR_RELEASE(sa2, addr2); + return JNI_TRUE; + } } - else if (V4MAPPED_EQUAL(addr1, addr2)) + if (V4MAPPED_EQUAL(addr1, addr2)) rv = JNI_TRUE; else if (V4MAPPED_EQUAL(addr2, addr1)) rv = JNI_TRUE;