projects / framework / osp / net.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
merge with master
[framework/osp/net.git] / src / FNet_NetStatisticsImpl.cpp
diff --git a/src/FNet_NetStatisticsImpl.cpp b/src/FNet_NetStatisticsImpl.cpp
index bd595da..b8e0940 100644 (file)
--- a/src/FNet_NetStatisticsImpl.cpp
+++ b/src/FNet_NetStatisticsImpl.cpp
@@ -25,6 +25,7 @@
 #include <FBaseSysLog.h>
 #include "FNet_NetTypes.h"
 #include "FNet_NetStatisticsImpl.h"
+#include "FNet_NetIpcProxy.h"
 
 using namespace Tizen::Base;
 
@@ -167,151 +168,35 @@ _NetStatisticsImpl::GetNetStatisticsInfo(NetBearerType operationMode, NetStatist
 result
 _NetStatisticsImpl::Reset(NetBearerType operationMode, NetStatisticsInfoType netStatType)
 {
-       int err = CONNECTION_ERROR_NONE;
-
        SysAssertf(__isConstructed, "Not yet constructed. Construct() should be called before use.");
 
-       SysTryReturnResult(NID_NET, (operationMode == NET_BEARER_WIFI || operationMode == NET_BEARER_PS),
-                       E_INVALID_ARG, "Invalid argument is used.");
-
-       //Reset net statistics info based on type
-       switch (netStatType)
-       {
-       //supported cases
-       case NET_STAT_RCVD_SIZE:
-               if (operationMode == NET_BEARER_PS)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA);
-               }
-               else if (operationMode == NET_BEARER_WIFI)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA);
-               }
-               else
-               {
-                       // should not reach here.
-                       SysLog(NID_NET, "_NetStatisticsImpl::Reset invalid mode: %d", operationMode);
-                       SysTryReturnResult(NID_NET, false, E_INVALID_ARG, "Invalid argument is used.");
-               }
-
-               break;
-
-       case NET_STAT_SENT_SIZE:
-               if (operationMode == NET_BEARER_PS)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA);
-               }
-               else if (operationMode == NET_BEARER_WIFI)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA);
-               }
-               else
-               {
-                       // should not reach here.
-                       SysLog(NID_NET, "_NetStatisticsImpl::Reset invalid mode: %d", operationMode);
-                       SysTryReturnResult(NID_NET, false, E_INVALID_ARG, "Invalid argument is used.");
-               }
-
-               break;
-
-       case NET_STAT_TOTAL_RCVD_SIZE:
-               if (operationMode == NET_BEARER_PS)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA);
-               }
-               else if (operationMode == NET_BEARER_WIFI)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA);
-               }
-               else
-               {
-                       // should not reach here.
-                       SysLog(NID_NET, "_NetStatisticsImpl::Reset invalid mode: %d", operationMode);
-                       SysTryReturnResult(NID_NET, false, E_INVALID_ARG, "Invalid argument is used.");
-               }
-
-               break;
-
-       case NET_STAT_TOTAL_SENT_SIZE:
-               if (operationMode == NET_BEARER_PS)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA);
-               }
-               else if (operationMode == NET_BEARER_WIFI)
-               {
-                       err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA);
-               }
-               else
-               {
-                       // should not reach here.
-                       SysLog(NID_NET, "_NetStatisticsImpl::Reset invalid mode: %d", operationMode);
-                       SysTryReturnResult(NID_NET, false, E_INVALID_ARG, "Invalid argument is used.");
-               }
-
-               break;
+       result r = E_SUCCESS;
 
-       default:
-               SysTryReturnResult(NID_NET, false, E_INVALID_ARG, "Invalid argument is used.");
+       _NetIpcProxy* pProxy = _NetIpcProxy::GetInstance();
+       SysTryReturnResult(NID_NET, pProxy != null, E_SYSTEM,
+                       "A system error has been occurred. Failed to get an IPC proxy.");
 
-               break;
-       }
+       r = pProxy->ResetNetStatistics(operationMode, netStatType);
+       SysTryReturnResult(NID_NET, r == E_SUCCESS, r, "Propagating.");
 
-       // make sure u catch error
-       SysLog(NID_NET, "_NetStatisticsImpl::Reset err code: %d", err);
-       SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM,     "A system error has been occurred. Operation failed .");
-
-       return E_SUCCESS;
+       return r;
 }
 
 result
 _NetStatisticsImpl::ResetAll(NetBearerType operationMode)
 {
-       int err = CONNECTION_ERROR_NONE;
-
        SysAssertf(__isConstructed, "Not yet constructed. Construct() should be called before use.");
 
-       //we support only PS and WIFI
-       if (operationMode == NET_BEARER_PS)
-       {
-               err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-
-               err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-
-               err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-
-               err = connection_reset_statistics(CONNECTION_TYPE_CELLULAR, CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-
-       }
-       else if (operationMode == NET_BEARER_WIFI)
-       {
-               err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-
-               err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-
-               err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-
-               err = connection_reset_statistics(CONNECTION_TYPE_WIFI, CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA);
-               SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
-       }
-       else
-       {
-               // we dont support other bearer types
-               SysTryReturnResult(NID_NET, false, E_INVALID_ARG, "Invalid argument is used.");
+       result r = E_SUCCESS;
 
-       }
+       _NetIpcProxy* pProxy = _NetIpcProxy::GetInstance();
+       SysTryReturnResult(NID_NET, pProxy != null, E_SYSTEM,
+                       "A system error has been occurred. Failed to get an IPC proxy.");
 
-       // make sure u catch error
-       SysLog(NID_NET, "_NetStatisticsImpl::ResetAll err code: %d", err);
-       SysTryReturnResult(NID_NET, err == CONNECTION_ERROR_NONE, E_SYSTEM, "A system error has been occurred. Operation failed .");
+       r = pProxy->ResetAllNetStatistics(operationMode);
+       SysTryReturnResult(NID_NET, r == E_SUCCESS, r, "Propagating.");
 
-       return E_SUCCESS;
+       return r;
 }
 
 _NetStatisticsImpl*
Domain: Network & Connectivity / Data Network;