commit a58e4068f86c6ca3f9771d4ec8b2665d070a170e
author Chung-yih Wang <cywang@google.com> Wed Mar 30 18:28:53 2011 +0800
committer Jean-Baptiste Queru <jbq@google.com> Thu Apr 07 12:29:33 2011 -0700
tree 720eabd5fd655f22f8ed28f38879585b477afb89
parent 618ef6b2f5a2d3c29e4a76faa5abc5ebd5fa6fe3

Fix the maddr issue for proxy authentication.

bug:4185114
Change-Id: I7832ffaa4383a84970293bcb921e3fb1fa1ccec4

java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java

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 @@
                 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());