rhodes 3.0.2 → 3.1.0.beta.1

data/platform/shared/logging/RhoPlainLog.cpp

@@ -1,18 +1,46 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "RhoLog.h"
 
+using namespace rho;
+
 extern "C"{
-const char* __rawDefaultCategory = "";
+const char* _rawDefaultCategory = "";
 
-static rho::common::CMutex g_plainBufferLock;
+static common::CMutex g_plainBufferLock;
 static char g_plainBuffer[2000];
 
 void rhoPlainLogArg(const char* file, int line, LogSeverity severity, const char* szCategory,
                     const char* format, va_list ap ){
-    rho::LogMessage oLogMsg(file, line, severity, LOGCONF(), rho::LogCategory(szCategory) );
+    LogMessage oLogMsg(file, line, severity, LOGCONF(), LogCategory(szCategory) );
 
     if ( oLogMsg.isEnabled() )
     {
-        rho::common::CMutexLock oLock(g_plainBufferLock);
+        common::CMutexLock oLock(g_plainBufferLock);
 
         int buflen = sizeof(g_plainBuffer)-1;
         int len = vsnprintf(g_plainBuffer, buflen, format, ap);
@@ -37,11 +65,11 @@ void rhoPlainLogArg(const char* file, int line, LogSeverity severity, const char
 void rhoPlainLogArgW(const char* file, int line, int severity, const char* szCategory,
                      const wchar_t* format, va_list ap )
 {
-    rho::LogMessage oLogMsg(file, line, severity, LOGCONF(), rho::LogCategory(szCategory) );
+    LogMessage oLogMsg(file, line, severity, LOGCONF(), LogCategory(szCategory) );
 
     if ( oLogMsg.isEnabled() )
     {
-        rho::common::CMutexLock oLock(g_plainBufferLock);
+        common::CMutexLock oLock(g_plainBufferLock);
 
         int buflen = sizeof(g_plainBuffer)/2-1;
         wchar_t* buf = (wchar_t*)g_plainBuffer;
@@ -74,7 +102,7 @@ void rhoPlainLogVar(const char* file, int line, LogSeverity severity, const char
 int rhoPlainLog(const char* file, int line, LogSeverity severity, const char* szCategory,
                   const char* msg ){
 
-    rho::LogMessage(file, line, severity, LOGCONF(), rho::LogCategory(szCategory) ) + msg;
+    LogMessage(file, line, severity, LOGCONF(), LogCategory(szCategory) ) + msg;
 
     return 1;
 }
@@ -82,7 +110,7 @@ int rhoPlainLog(const char* file, int line, LogSeverity severity, const char* sz
 int rhoPlainLogData(const char* file, int line, LogSeverity severity, const char* szCategory,
 				const void* data, int len ){
 		
-	rho::LogMessage oMsg(file, line, severity, LOGCONF(), rho::LogCategory(szCategory) );
+	LogMessage oMsg(file, line, severity, LOGCONF(), LogCategory(szCategory) );
 	oMsg.addRawString( static_cast<const char*>(data),len);	
 	return 1;
 }

data/platform/shared/logging/test/TestLog.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "../RhoLog.h"
 #include "common/RhoConf.h"
 

data/platform/shared/logging/test/TestPlainLog.c

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "../RhoLog.h"
 
 #undef DEFAULT_LOGCATEGORY

data/platform/shared/logging/test/main.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 void runAllLogTests();
 
 #ifndef OS_SYMBIAN

data/platform/shared/net/AsyncHttp.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "net/AsyncHttp.h"
 #include "common/StringConverter.h"
 #include "net/URI.h"
@@ -178,6 +204,7 @@ void CAsyncHttp::CHttpCommand::execute()
             resp = getNet().pushMultipartData( m_params.getString("url"), arMultipartItems, null, &m_mapHeaders );
             break;
         }
+    default: ;
     }
 
     if ( !m_NetRequest.isCancelled())

data/platform/shared/net/AsyncHttp.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #ifdef __cplusplus
@@ -82,8 +108,9 @@ public:
                 return "Download";
             case hcUpload:
                 return "Upload";
+            default:
+                return "Unknown";
             }
-            return "Unknown";
         }
 
         virtual void cancel()

data/platform/shared/net/CURLNetRequest.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "net/CURLNetRequest.h"
 #include "logging/RhoLog.h"
 #include "common/RhoFile.h"
@@ -177,7 +203,7 @@ INetResponse* CURLNetRequest::doRequest(const char *method, const String& strUrl
 CURLcode CURLNetRequest::doCURLPerform(const String& strUrl)
 {
 	CURLcode err = m_curl.perform();
-	if ( err !=  CURLE_OK && !net::URI::isLocalHost(strUrl.c_str()) )
+	if ( err !=  CURLE_OK && !RHODESAPP().isBaseUrl(strUrl.c_str()) && err != CURLE_OBSOLETE4 )
 	{
 		long statusCode = 0;
 		curl_easy_getinfo(m_curl.curl(), CURLINFO_RESPONSE_CODE, &statusCode);
@@ -198,7 +224,7 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
     if (oFile)
         nStartFrom = oFile->size();
 
-	if( !net::URI::isLocalHost(strUrl.c_str()) )
+	if( !RHODESAPP().isBaseUrl(strUrl.c_str()) )
     {
         //Log every non localhost requests
         RAWLOG_INFO2("%s request (Pull): %s", method, strUrl.c_str());
@@ -260,7 +286,7 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
         break;
     }
 
-	if( !net::URI::isLocalHost(strUrl.c_str()) )		   
+	if( !RHODESAPP().isBaseUrl(strUrl.c_str()) )		   
 	   rho_net_impl_network_indicator(0);
 
     return makeResponse(respBody, nRespCode);
@@ -385,8 +411,14 @@ int CURLNetRequest::getResponseCode(CURLcode err, char const *body, size_t bodys
                 oSession->logout();
     }
     else {
+        if (err != CURLE_OK && err != CURLE_PARTIAL_FILE && statusCode != 0)
+            statusCode = 500;
+
         RAWTRACE1("RESPONSE----- (%d bytes)", bodysize);
-        RAWTRACE(body);
+        if ( !rho_conf_getBool("log_skip_post") )
+        {
+            RAWTRACE(body);
+        }
         RAWTRACE("END RESPONSE-----");
     }
 
@@ -486,6 +518,15 @@ static int curl_trace(CURL *curl, curl_infotype type, char *data, size_t size, v
 curl_slist *CURLNetRequest::CURLHolder::set_options(const char *method, const String& strUrl, const String& strBody,
                              IRhoSession* pSession, Hashtable<String,String>* pHeaders)
 {
+    if (method != NULL) {
+        mStrMethod = method;
+    }
+    else {
+        mStrMethod = "NULL";
+    }
+    mStrUrl = strUrl;
+    mStrBody = strBody;
+    
     curl_easy_setopt(m_curl, CURLOPT_BUFFERSIZE, CURL_MAX_WRITE_SIZE-1);
 
     if (strcasecmp(method, "GET") == 0)
@@ -510,7 +551,7 @@ curl_slist *CURLNetRequest::CURLHolder::set_options(const char *method, const St
         curl_easy_setopt(m_curl, CURLOPT_COOKIE, session.c_str());
     }
     
-    //curl_easy_setopt(m_curl, CURLOPT_TIMEOUT, timeout);
+    curl_easy_setopt(m_curl, CURLOPT_TIMEOUT, timeout);
     curl_easy_setopt(m_curl, CURLOPT_TCP_NODELAY, 0); //enable Nagle algorithm
     
     curl_easy_setopt(m_curl, CURLOPT_SSL_VERIFYPEER, (long)m_sslVerifyPeer);
@@ -518,7 +559,7 @@ curl_slist *CURLNetRequest::CURLHolder::set_options(const char *method, const St
     // Set very large timeout in case of local requests
     // It is required because otherwise requests (especially requests to writing!)
     // could repeated twice or more times
-    //if (net::URI::isLocalHost(strUrl))
+    if (RHODESAPP().isBaseUrl(strUrl))
         curl_easy_setopt(m_curl, CURLOPT_TIMEOUT, 10*24*60*60);
     
     curl_slist *hdrs = NULL;
@@ -573,14 +614,14 @@ curl_slist *CURLNetRequest::CURLHolder::set_options(const char *method, const St
 CURLNetRequest::CURLHolder::CURLHolder()
     :m_active(0)
 {
-    m_bTraceCalls = rho_conf_getBool("net_trace");
+    m_bTraceCalls = rho_conf_getBool("net_trace") && !rho_conf_getBool("log_skip_post");
     timeout = rho_conf_getInt("net_timeout");
     if (timeout == 0)
         timeout = 30; // 30 seconds by default
     m_sslVerifyPeer = true;
     
-    m_curlm = curl_multi_init();
     m_curl = curl_easy_init();
+    m_curlm = curl_multi_init();
     curl_easy_setopt(m_curl, CURLOPT_ERRORBUFFER, &errbuf);
 }
 
@@ -611,13 +652,29 @@ void CURLNetRequest::CURLHolder::deactivate()
 CURLcode CURLNetRequest::CURLHolder::perform()
 {
     activate();
+    if ( !rho_conf_getBool("log_skip_post") )
+        RAWTRACE3("   Activate CURLNetRequest: METHOD = [%s] URL = [%s] BODY = [%s]", mStrMethod.c_str(), mStrUrl.c_str(), mStrBody.c_str());
+    else
+        RAWTRACE1("   Activate CURLNetRequest: METHOD = [%s]", mStrMethod.c_str() );
     
     int const CHUNK = 1;
     
     long noactivity = 0;
     
     CURLcode result;
-    for(;;) {
+    for(;;)
+    {
+        common::CMutexLock guard(m_lock);
+        if (m_active <= 0) {
+            RAWLOG_INFO("CURLNetRequest: request was canceled from another thread !");
+            if ( !rho_conf_getBool("log_skip_post") )
+                RAWLOG_INFO3("   CURLNetRequest: METHOD = [%s] URL = [%s] BODY = [%s]", mStrMethod.c_str(), mStrUrl.c_str(), mStrBody.c_str());
+            else
+                RAWLOG_INFO1("   CURLNetRequest: METHOD = [%s]", mStrMethod.c_str());
+
+            return CURLE_OBSOLETE4;   
+        }
+    
         int running;
         CURLMcode err = curl_multi_perform(m_curlm, &running);
         if (err == CURLM_CALL_MULTI_PERFORM)
@@ -666,14 +723,27 @@ CURLcode CURLNetRequest::CURLHolder::perform()
             result = msg->data.result;
         if (result == CURLE_OK && noactivity >= timeout)
             result = CURLE_OPERATION_TIMEDOUT;
-        if (result == CURLE_OK || result == CURLE_PARTIAL_FILE)
+        if (result == CURLE_OK || result == CURLE_PARTIAL_FILE) {
             RAWTRACE("Operation completed successfully");
-        else
+        }
+        else {
             RAWLOG_ERROR2("Operation finished with error %d: %s", (int)result, curl_easy_strerror(result));
+
+            if ( !rho_conf_getBool("log_skip_post") )
+                RAWLOG_ERROR3("  CURLNetRequest: METHOD = [%s] URL = [%s] BODY = [%s]", mStrMethod.c_str(), mStrUrl.c_str(), mStrBody.c_str());
+            else
+                RAWLOG_ERROR1("  CURLNetRequest: METHOD = [%s]", mStrMethod.c_str());
+        }
         break;
     }
 
+    if ( !rho_conf_getBool("log_skip_post") )
+        RAWTRACE3("Deactivate CURLNetRequest: METHOD = [%s] URL = [%s] BODY = [%s]", mStrMethod.c_str(), mStrUrl.c_str(), mStrBody.c_str());
+    else
+        RAWTRACE1("Deactivate CURLNetRequest: METHOD = [%s]", mStrMethod.c_str() );
+
     deactivate();
+    RAWTRACE("     Deactivation is DONE");
     return result;
 }
 

data/platform/shared/net/CURLNetRequest.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #ifndef RHO_CURL_NET_REQUEST_041be6266e3e424c8a8e7b8a412f01f0
 #define RHO_CURL_NET_REQUEST_041be6266e3e424c8a8e7b8a412f01f0
 
@@ -47,6 +73,10 @@ class CURLNetRequest : public INetRequestImpl
         boolean m_bTraceCalls;
         long timeout;
         boolean m_sslVerifyPeer;
+        
+        String mStrMethod;
+        String mStrUrl;
+        String mStrBody;
     };
     
 public: