[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-client-cvs
Subject:    [Client-cvs] core rtspprotocol.cpp,1.67.2.4,1.67.2.5
From:       anuj_dhamija () helixcommunity ! org
Date:       2008-06-23 20:35:44
Message-ID: 200806232037.m5NKb0rS027176 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/client/core
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv12849

Modified Files:
      Tag: hxclient_2_1_0_cayennes
	rtspprotocol.cpp 
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with \
RealNetworks, and I am authorized to contribute this code under said agreement."  
Modified by:  ext-anuj.dhamija@nokia.com

TSW ID: EGRS-7EWPV2
 
Reviewed by: 
 
Date: 06/19/2008
 
Project: SymbianMmf_rel
 
Synopsis: System Error Displayed when Server sends Alert Code 0

Overview: 
Server sends SET_PARAMETER message with Alert Code 0. Helix uses MAKE_SA macro to map \
Alert Code to Server Error Codes.

MAKE_SA is defined as following:
#define MAKE_SA(sa) HXR_SE_MIN_VALUE+sa+SA_OFFSET

SA_OFFSET is declared as two (2) which maps the Alert Codes as received from Server \
in the list of Server Alert Codes. It is observed that this mapping is off by one as \
the Alert Codes are getting mapped to the subsequent Sever Alert Code (ie incremented \
by one) of the correct Server Alert Code. So Alert Code 0 is mapped to \
HXR_SE_INVALID_VERSION (0x80041902) instead of HXR_SE_NO_ERROR (0x80041901); Alert \
Code 52 is mapped to HXR_SE_INTERNAL_ERROR (0x80041936) instead of \
HXR_PE_PROXY_ORIGIN_DISCONNECTED (0x80041935).

Currently Helix treats all kind of Alert Codes as Error and drops the connection. \
Correct behavior should be to ignore Alert Code 0 as it is not an error but just an \
info from server.

Server Alert Codes are not mapped to corresponding Symbian Errors and so UI displays \
System Error  
Fix:
- Change SA_OFFSET value to one (1).
- Ignore Alert Code zero if received from server as part of SET_PARAMETER message
- Add new mapping between Server Alert Code for Server BUSY to symbian Error Code \
                KErrServerBusy
- In method where Helix Error Codes are mapped to Symbian Error Codes, if no mapping \
is found for a server alert then return "Disconnected" symbian Error by default

Files modified & changes:
src\common\include\hxresult.h
src\clientapps\symbianMmf\common\hxmmfbasectrl.cpp
src\client\core\rtspprotocol.cpp

Image Size and Heap Use impact: None

Module Release testing (STIF, Audio) : Passed

Test case(s) Added  : No

Memory leak check performed : Passed, No leaks found
  
Platforms and Profiles Build Verified: helix-client-s60-32-mmf-mdf-arm

Platforms and Profiles Functionality verified: armv5
  
Branch: Head, 210CayS, 221Cays


Index: rtspprotocol.cpp
===================================================================
RCS file: /cvsroot/client/core/rtspprotocol.cpp,v
retrieving revision 1.67.2.4
retrieving revision 1.67.2.5
diff -u -d -r1.67.2.4 -r1.67.2.5
--- rtspprotocol.cpp	3 Feb 2007 01:30:25 -0000	1.67.2.4
+++ rtspprotocol.cpp	23 Jun 2008 20:35:41 -0000	1.67.2.5
@@ -2274,6 +2274,14 @@
                 {
                     theErr = HXR_SERVER_ALERT;
                 }
+                else
+                {
+                    //Ignore Alert Code 0
+                    if(theErr == HXR_SE_NO_ERROR)
+                    {
+                        theErr = HXR_OK;
+                    }
+                }
             }
             m_idleState = NULL_STATE;
         }


_______________________________________________
Client-cvs mailing list
Client-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/client-cvs


[prev in list] [next in list] [prev in thread] [next in thread]