Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-09-14 23:09:26 -07:00
committed by Android (Google) Code Review
parent cee0b97eed 88203cb111
commit 096df8197b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/sip/SipSessionGroup.java
View File

@@ -712,10 +712,16 @@ class SipSessionGroup implements SipListener {
case Response.UNAUTHORIZED: case Response.UNAUTHORIZED:
case Response.PROXY_AUTHENTICATION_REQUIRED: case Response.PROXY_AUTHENTICATION_REQUIRED:
if (!handleAuthentication(event)) { if (!handleAuthentication(event)) {
if (mLastNonce == null) {
onRegistrationFailed(SipErrorCode.SERVER_ERROR,
"server does not provide challenge");
} else {
Log.v(TAG, "Incorrect username/password"); Log.v(TAG, "Incorrect username/password");
onRegistrationFailed(SipErrorCode.INVALID_CREDENTIALS, onRegistrationFailed(
SipErrorCode.INVALID_CREDENTIALS,
"incorrect username or password"); "incorrect username or password");
} }
}
return true; return true;
default: default:
if (statusCode >= 500) { if (statusCode >= 500) {
@@ -869,6 +875,9 @@ class SipSessionGroup implements SipListener {
case Response.PROXY_AUTHENTICATION_REQUIRED: case Response.PROXY_AUTHENTICATION_REQUIRED:
if (handleAuthentication(event)) { if (handleAuthentication(event)) {
addSipSession(this); addSipSession(this);
} else if (mLastNonce == null) {
endCallOnError(SipErrorCode.SERVER_ERROR,
"server does not provide challenge");
} else { } else {
endCallOnError(SipErrorCode.INVALID_CREDENTIALS, endCallOnError(SipErrorCode.INVALID_CREDENTIALS,
"incorrect username or password"); "incorrect username or password");