Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions server/gdialserver_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,6 @@ class gdialServiceTest: public GDialNotifier
GDIAL_LOGINFO("App:%s appID:%s",appName.c_str(),appID.c_str());
}

virtual void onStopped() override
{
GDIAL_LOGINFO("~~~~~~~~~~~");
}

virtual void updatePowerState(string powerState) override
{
GDIAL_LOGINFO("powerState : %s",powerState.c_str());
Expand Down
115 changes: 59 additions & 56 deletions server/gdialservice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
soup_server_add_handler(ssdp_http_server, "/", gdial_http_server_throttle_callback, NULL, NULL);

GSocketAddress *listen_address = g_inet_socket_address_new_from_string(iface_ipv4_address_, GDIAL_REST_HTTP_PORT);
SoupServerListenOptions option = 0;
SoupServerListenOptions option = (SoupServerListenOptions)0;
gboolean success = soup_server_listen(rest_http_server, listen_address, option, &error);
g_object_unref (listen_address);
if (!success)
Expand Down Expand Up @@ -376,7 +376,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
if (g_strstr_len(app_list_low, app_list_len, "netflix"))
{
GDIAL_LOGINFO("netflix is enabled from cmdline");
GList *allowed_origins = g_list_prepend(NULL, ".netflix.com");
GList *allowed_origins = g_list_prepend(NULL, (gpointer)".netflix.com");
gdial_rest_server_register_app(dial_rest_server, "Netflix", NULL, NULL, TRUE, TRUE, allowed_origins);
g_list_free(allowed_origins);
}
Expand All @@ -388,7 +388,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
if (g_strstr_len(app_list_low, app_list_len, "youtube"))
{
GDIAL_LOGINFO("youtube is enabled from cmdline");
GList *allowed_origins = g_list_prepend(NULL, ".youtube.com");
GList *allowed_origins = g_list_prepend(NULL, (gpointer)".youtube.com");
gdial_rest_server_register_app(dial_rest_server, "YouTube", NULL, NULL, TRUE, TRUE, allowed_origins);
g_list_free(allowed_origins);
}
Expand All @@ -400,7 +400,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
if (g_strstr_len(app_list_low, app_list_len, "youtubetv"))
{
GDIAL_LOGINFO("youtubetv is enabled from cmdline");
GList *allowed_origins = g_list_prepend(NULL, ".youtube.com");
GList *allowed_origins = g_list_prepend(NULL, (gpointer)".youtube.com");
gdial_rest_server_register_app(dial_rest_server, "YouTubeTV", NULL, NULL, TRUE, TRUE, allowed_origins);
g_list_free(allowed_origins);
}
Expand All @@ -412,7 +412,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
if (g_strstr_len(app_list_low, app_list_len, "youtubekids"))
{
GDIAL_LOGINFO("youtubekids is enabled from cmdline");
GList *allowed_origins = g_list_prepend(NULL, ".youtube.com");
GList *allowed_origins = g_list_prepend(NULL, (gpointer)".youtube.com");
gdial_rest_server_register_app(dial_rest_server, "YouTubeKids", NULL, NULL, TRUE, TRUE, allowed_origins);
g_list_free(allowed_origins);
}
Expand All @@ -424,7 +424,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
if (g_strstr_len(app_list_low, app_list_len, "amazoninstantvideo"))
{
GDIAL_LOGINFO("AmazonInstantVideo is enabled from cmdline");
GList *allowed_origins = g_list_prepend(NULL, ".amazonprime.com");
GList *allowed_origins = g_list_prepend(NULL, (gpointer)".amazonprime.com");
gdial_rest_server_register_app(dial_rest_server, "AmazonInstantVideo", NULL, NULL, TRUE, TRUE, allowed_origins);
g_list_free(allowed_origins);
}
Expand All @@ -436,8 +436,8 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
if (g_strstr_len(app_list_low, app_list_len, "spotify"))
{
GDIAL_LOGINFO("spotify is enabled from cmdline");
GList *app_prefixes= g_list_prepend(NULL, "com.spotify");
GList *allowed_origins = g_list_prepend(NULL, ".spotify.com");
GList *app_prefixes= g_list_prepend(NULL, (gpointer)"com.spotify");
GList *allowed_origins = g_list_prepend(NULL, (gpointer)".spotify.com");
gdial_rest_server_register_app(dial_rest_server, "com.spotify.Spotify.TV", app_prefixes, NULL, TRUE, TRUE, allowed_origins);
g_list_free(allowed_origins);
g_list_free(app_prefixes);
Expand All @@ -450,7 +450,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[])
if (g_strstr_len(app_list_low, app_list_len, "pairing"))
{
GDIAL_LOGINFO("pairing is enabled from cmdline");
GList *allowed_origins = g_list_prepend(NULL, ".comcast.com");
GList *allowed_origins = g_list_prepend(NULL, (gpointer)".comcast.com");
gdial_rest_server_register_app(dial_rest_server, "Pairing", NULL, NULL, TRUE, TRUE, allowed_origins);
g_list_free(allowed_origins);
}
Expand Down Expand Up @@ -625,7 +625,7 @@ void *gdialServiceImpl::requestHandlerThread(void *ctx)
{
GDIAL_LOGTRACE("Entering ...");
gdialServiceImpl *_instance = (gdialServiceImpl *)ctx;
RequestHandlerPayload reqHdlrPayload;
RequestHandlerPayload reqHdlrPayload = {};
while(!_instance->m_RequestHandlerThreadExit)
{
reqHdlrPayload.appNameOrfriendlyname = "";
Expand Down Expand Up @@ -773,47 +773,47 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx)
payload.c_str(),
query.c_str(),
AddDataUrl.c_str());
_instance->m_observer->onApplicationLaunchRequestWithLaunchParam(appName,payload,query,AddDataUrl);
_instance->m_observer->onApplicationLaunchRequestWithLaunchParam(std::move(appName),std::move(payload),std::move(query),std::move(AddDataUrl));
}
break;
case APP_LAUNCH_REQUEST:
{
std::string appName = response_data.appName,
parameter = response_data.parameterOrPayload;
GDIAL_LOGINFO("AppLaunch : appName:%s parameter:%s",appName.c_str(),parameter.c_str());
_instance->m_observer->onApplicationLaunchRequest(appName,parameter);
_instance->m_observer->onApplicationLaunchRequest(std::move(appName),std::move(parameter));
}
break;
case APP_STOP_REQUEST:
{
std::string appName = response_data.appName,
appId = response_data.appIdOrQuery;
GDIAL_LOGINFO("AppStop : appName:%s appId:%s",appName.c_str(),appId.c_str());
_instance->m_observer->onApplicationStopRequest(appName,appId);
_instance->m_observer->onApplicationStopRequest(std::move(appName),std::move(appId));
}
break;
case APP_HIDE_REQUEST:
{
std::string appName = response_data.appName,
appId = response_data.appIdOrQuery;
GDIAL_LOGINFO("AppHide : appName:%s appId:%s",appName.c_str(),appId.c_str());
_instance->m_observer->onApplicationHideRequest(appName,appId);
_instance->m_observer->onApplicationHideRequest(std::move(appName),std::move(appId));
}
break;
case APP_STATE_REQUEST:
{
std::string appName = response_data.appName,
appId = response_data.appIdOrQuery;
GDIAL_LOGINFO("AppState : appName:%s appId:%s",appName.c_str(),appId.c_str());
_instance->m_observer->onApplicationStateRequest(appName,appId);
_instance->m_observer->onApplicationStateRequest(std::move(appName),std::move(appId));
}
break;
case APP_RESUME_REQUEST:
{
std::string appName = response_data.appName,
appId = response_data.appIdOrQuery;
GDIAL_LOGINFO("AppResume : appName:%s appId:%s",appName.c_str(),appId.c_str());
_instance->m_observer->onApplicationResumeRequest(appName,appId);
_instance->m_observer->onApplicationResumeRequest(std::move(appName),std::move(appId));
}
break;
default:
Expand All @@ -825,7 +825,6 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx)
}
}
_instance->m_gdialserver_response_handler_thread = 0;
_instance->m_observer->onStopped();
pthread_exit(nullptr);
}

Expand Down Expand Up @@ -982,13 +981,14 @@ GDIAL_SERVICE_ERROR_CODES gdialService::ApplicationStateChanged(string applicati
error.c_str());
if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance))
{
RequestHandlerPayload payload;
RequestHandlerPayload payload = {};
payload.event = APP_STATE_CHANGED;

payload.appNameOrfriendlyname = applicationName;
payload.appIdOractivation = applicationId;
payload.state = appState;
payload.error = error;
payload.appNameOrfriendlyname = std::move(applicationName);
payload.appIdOractivation = std::move(applicationId);
payload.state = std::move(appState);
payload.error = std::move(error);
payload.data_param = nullptr;
payload.user_param1 = false;
gdialImplInstance->sendRequest(payload);
}
GDIAL_LOGTRACE("Exiting ...");
Expand All @@ -1002,11 +1002,12 @@ GDIAL_SERVICE_ERROR_CODES gdialService::ActivationChanged(string activation, str
GDIAL_LOGINFO("activation[%s] friendlyname[%s]",activation.c_str(),friendlyname.c_str());
if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance))
{
RequestHandlerPayload payload;
RequestHandlerPayload payload = {};
payload.event = ACTIVATION_CHANGED;

payload.appNameOrfriendlyname = friendlyname;
payload.appIdOractivation = activation;
payload.appNameOrfriendlyname = std::move(friendlyname);
payload.appIdOractivation = std::move(activation);
payload.data_param = nullptr;
payload.user_param1 = false;
GDIAL_LOGINFO("ACTIVATION_CHANGED request sent");
gdialImplInstance->sendRequest(payload);
}
Expand All @@ -1021,10 +1022,11 @@ GDIAL_SERVICE_ERROR_CODES gdialService::FriendlyNameChanged(string friendlyname)
GDIAL_LOGINFO("friendlyname[%s]",friendlyname.c_str());
if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance))
{
RequestHandlerPayload payload;
RequestHandlerPayload payload = {};
payload.event = FRIENDLYNAME_CHANGED;

payload.appNameOrfriendlyname = friendlyname;
payload.appNameOrfriendlyname = std::move(friendlyname);
payload.data_param = nullptr;
payload.user_param1 = false;
gdialImplInstance->sendRequest(payload);
}
GDIAL_LOGTRACE("Exiting ...");
Expand All @@ -1051,9 +1053,10 @@ GDIAL_SERVICE_ERROR_CODES gdialService::RegisterApplications(RegisterAppEntryLis
GDIAL_LOGINFO("appConfigList[%p]",appConfigList);
if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance))
{
RequestHandlerPayload payload;
RequestHandlerPayload payload = {};
payload.event = REGISTER_APPLICATIONS;
payload.data_param = appConfigList;
payload.user_param1 = false;
gdialImplInstance->sendRequest(payload);
}
GDIAL_LOGTRACE("Exiting ...");
Expand All @@ -1067,9 +1070,10 @@ void gdialService::setNetworkStandbyMode(bool nwStandbymode)
GDIAL_LOGINFO("nwStandbymode[%u]",nwStandbymode);
if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance))
{
RequestHandlerPayload payload;
RequestHandlerPayload payload = {};
payload.event = UPDATE_NW_STANDBY;
payload.user_param1 = (bool)nwStandbymode;
payload.data_param = nullptr;
gdialImplInstance->sendRequest(payload);
}
GDIAL_LOGTRACE("Exiting ...");
Expand All @@ -1083,9 +1087,11 @@ GDIAL_SERVICE_ERROR_CODES gdialService::setManufacturerName(string manufacturer)
GDIAL_LOGINFO("Manufacturer[%s]",manufacturer.c_str());
if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance))
{
RequestHandlerPayload payload;
RequestHandlerPayload payload = {};
payload.event = UPDATE_MANUFACTURER_NAME;
payload.manufacturer = manufacturer;
payload.manufacturer = std::move(manufacturer);
payload.data_param = nullptr;
payload.user_param1 = false;
gdialImplInstance->sendRequest(payload);
}
GDIAL_LOGTRACE("Exiting ...");
Expand All @@ -1099,9 +1105,11 @@ GDIAL_SERVICE_ERROR_CODES gdialService::setModelName(string model)
GDIAL_LOGINFO("Model[%s]",model.c_str());
if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance))
{
RequestHandlerPayload payload;
RequestHandlerPayload payload = {};
payload.event = UPDATE_MODEL_NAME;
payload.model = model;
payload.model = std::move(model);
payload.data_param = nullptr;
payload.user_param1 = false;
gdialImplInstance->sendRequest(payload);
}
GDIAL_LOGTRACE("Exiting ...");
Expand Down Expand Up @@ -1134,10 +1142,10 @@ void gdialServiceImpl::onApplicationLaunchRequestWithLaunchParam(string appName,
GDIAL_LOGTRACE("Entering ...");
payload.event = APP_LAUNCH_REQUEST_WITH_PARAMS;

payload.appName = appName;
payload.parameterOrPayload = strPayLoad;
payload.appIdOrQuery = strQuery;
payload.AddDataUrl = strAddDataUrl;
payload.appName = std::move(appName);
payload.parameterOrPayload = std::move(strPayLoad);
payload.appIdOrQuery = std::move(strQuery);
payload.AddDataUrl = std::move(strAddDataUrl);
notifyResponse(payload);
GDIAL_LOGTRACE("Exiting ...");
}
Expand All @@ -1148,8 +1156,8 @@ void gdialServiceImpl::onApplicationLaunchRequest(string appName, string paramet
GDIAL_LOGTRACE("Entering ...");
payload.event = APP_LAUNCH_REQUEST;

payload.appName = appName;
payload.parameterOrPayload = parameter;
payload.appName = std::move(appName);
payload.parameterOrPayload = std::move(parameter);
notifyResponse(payload);
GDIAL_LOGTRACE("Exiting ...");
}
Expand All @@ -1160,8 +1168,8 @@ void gdialServiceImpl::onApplicationStopRequest(string appName, string appID)
GDIAL_LOGTRACE("Entering ...");
payload.event = APP_STOP_REQUEST;

payload.appName = appName;
payload.appIdOrQuery = appID;
payload.appName = std::move(appName);
payload.appIdOrQuery = std::move(appID);
notifyResponse(payload);
GDIAL_LOGTRACE("Exiting ...");
}
Expand All @@ -1172,8 +1180,8 @@ void gdialServiceImpl::onApplicationHideRequest(string appName, string appID)
GDIAL_LOGTRACE("Entering ...");
payload.event = APP_HIDE_REQUEST;

payload.appName = appName;
payload.appIdOrQuery = appID;
payload.appName = std::move(appName);
payload.appIdOrQuery = std::move(appID);
notifyResponse(payload);
GDIAL_LOGTRACE("Exiting ...");
}
Expand All @@ -1184,8 +1192,8 @@ void gdialServiceImpl::onApplicationResumeRequest(string appName, string appID)
GDIAL_LOGTRACE("Entering ...");
payload.event = APP_RESUME_REQUEST;

payload.appName = appName;
payload.appIdOrQuery = appID;
payload.appName = std::move(appName);
payload.appIdOrQuery = std::move(appID);
notifyResponse(payload);
GDIAL_LOGTRACE("Exiting ...");
}
Expand All @@ -1196,24 +1204,19 @@ void gdialServiceImpl::onApplicationStateRequest(string appName, string appID)
GDIAL_LOGTRACE("Entering ...");
payload.event = APP_STATE_REQUEST;

payload.appName = appName;
payload.appIdOrQuery = appID;
payload.appName = std::move(appName);
payload.appIdOrQuery = std::move(appID);
notifyResponse(payload);
GDIAL_LOGTRACE("Exiting ...");
}

void gdialServiceImpl::onStopped()
{
//
}

void gdialServiceImpl::updatePowerState(string powerState)
{
GDIAL_LOGTRACE("Entering ...");
GDIAL_LOGINFO("powerState : %s",powerState.c_str());
if (m_observer)
{
m_observer->updatePowerState(powerState);
m_observer->updatePowerState(std::move(powerState));
}
GDIAL_LOGTRACE("Exiting ...");
}
1 change: 0 additions & 1 deletion server/include/gdialservicecommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ class GDialNotifier
virtual void onApplicationHideRequest(string appName, string appID)=0;
virtual void onApplicationResumeRequest(string appName, string appID)=0;
virtual void onApplicationStateRequest(string appName, string appID)=0;
virtual void onStopped(void)=0;
virtual void updatePowerState(string powerState)=0;
};
#endif /* _GDIAL_SERVICE_COMMON_H_ */
3 changes: 1 addition & 2 deletions server/include/gdialserviceimpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,13 @@ class gdialServiceImpl: public GDialNotifier
virtual void onApplicationHideRequest(string appName, string appID) override;
virtual void onApplicationResumeRequest(string appName, string appID) override;
virtual void onApplicationStateRequest(string appName, string appID) override;
virtual void onStopped() override;
virtual void updatePowerState(string powerState) override;

private:
gdialServiceImpl(){};
virtual ~gdialServiceImpl(){};

GDialNotifier *m_observer;
GDialNotifier *m_observer{nullptr};
pthread_t m_gdialserver_main_thread{0};

static void *mainThread(void *ctx);
Expand Down