commit 6a890545e08edc118ec4adde17d56fc54d1bb230
author Chia-chi Yeh <chiachi@android.com> Sun Dec 19 17:30:47 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Dec 19 17:30:47 2010 -0800
tree 87323aa22ae250034904f7f34c492e36a559e98f
parent 35e37a5fbffcdc05f9f43896f4e2c61f4466880d
parent 2ad6621ec6cbc10836ef05ca965077fc059b2bf8

am 2ad6621e: Only add maddr to the uri when it is different from the host.

* commit '2ad6621ec6cbc10836ef05ca965077fc059b2bf8':
  Only add maddr to the uri when it is different from the host.

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 c15b569..aa29616 100644
--- a/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java
+++ b/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java
@@ -211,6 +211,9 @@
             if ( challengedRequest.getRouteHeaders() == null ) {
                 Hop hop   = ((SIPClientTransaction) challengedTransaction).getNextHop();
                 SipURI sipUri = (SipURI) reoriginatedRequest.getRequestURI();
+                // BEGIN android-added
+                if ( !hop.getHost().equalsIgnoreCase(sipUri.getHost()) )
+                // END android-added
                 sipUri.setMAddrParam(hop.getHost());
                 if ( hop.getPort() != -1 ) sipUri.setPort(hop.getPort());
             }