From a58e4068f86c6ca3f9771d4ec8b2665d070a170e Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Wed, 30 Mar 2011 18:28:53 +0800
Subject: Fix the maddr issue for proxy authentication.

bug:4185114
Change-Id: I7832ffaa4383a84970293bcb921e3fb1fa1ccec4
---
 java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java b/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java
index aa29616..4dc39ef 100644
--- a/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java
+++ b/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java
@@ -212,7 +212,8 @@ public class AuthenticationHelperImpl implements AuthenticationHelper {
                 Hop hop   = ((SIPClientTransaction) challengedTransaction).getNextHop();
                 SipURI sipUri = (SipURI) reoriginatedRequest.getRequestURI();
                 // BEGIN android-added
-                if ( !hop.getHost().equalsIgnoreCase(sipUri.getHost()) )
+                if ( !hop.getHost().equalsIgnoreCase(sipUri.getHost())
+                        && !hop.equals(sipStack.getRouter(challengedRequest).getOutboundProxy()) )
                 // END android-added
                 sipUri.setMAddrParam(hop.getHost());
                 if ( hop.getPort() != -1 ) sipUri.setPort(hop.getPort());
-- 
cgit v1.2.3