drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a936b256: Remove SIP realm/domain check

Browse Source 
* commit 'a936b256eb1611b5d8b88d0cd61f21225152cc82':
  Remove SIP realm/domain check
This commit is contained in:
Hung-ying Tyan
2010-12-20 11:29:58 -08:00
committed by Android Git Automerger
parent 877924912a a936b256eb
commit d90bc225b9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
voip/java/com/android/server/sip/SipSessionGroup.java
View File

@ -871,9 +871,14 @@ class SipSessionGroup implements SipListener {
+ mAuthenticationRetryCount); + mAuthenticationRetryCount);
} }
return true; return true;
} else {
if (crossDomainAuthenticationRequired(response)) {
onError(SipErrorCode.CROSS_DOMAIN_AUTHENTICATION,
getRealmFromResponse(response));
} else { } else {
onError(SipErrorCode.INVALID_CREDENTIALS, onError(SipErrorCode.INVALID_CREDENTIALS,
"incorrect username or password"); "incorrect username or password");
}
return false; return false;
} }
} }
@ -1025,10 +1030,7 @@ class SipSessionGroup implements SipListener {
return true; return true;
case Response.UNAUTHORIZED: case Response.UNAUTHORIZED:
case Response.PROXY_AUTHENTICATION_REQUIRED: case Response.PROXY_AUTHENTICATION_REQUIRED:
if (crossDomainAuthenticationRequired(response)) { if (handleAuthentication(event)) {
onError(SipErrorCode.CROSS_DOMAIN_AUTHENTICATION,
getRealmFromResponse(response));
} else if (handleAuthentication(event)) {
addSipSession(this); addSipSession(this);
} }
return true; return true;