static DBusConnection* g_conn_sender = NULL;
static DBusConnection* g_conn_listener = NULL;
+static DBusConnection* g_conn_custom = NULL;
static Ecore_Fd_Handler* g_dbus_fd_handler = NULL;
}
}
+void __sttd_dbus_connection_free()
+{
+ if (NULL != g_conn_listener) {
+ dbus_connection_close(g_conn_listener);
+ dbus_connection_unref(g_conn_listener);
+ g_conn_listener = NULL;
+ }
+ if (NULL != g_conn_sender) {
+ dbus_connection_close(g_conn_sender);
+ dbus_connection_unref(g_conn_sender);
+ g_conn_sender = NULL;
+ }
+ if (NULL != g_conn_custom) {
+ dbus_connection_close(g_conn_custom);
+ dbus_connection_unref(g_conn_custom);
+ g_conn_custom = NULL;
+ }
+}
+
int __sttd_get_buxtonkey()
{
/* request our name on the bus and check for errors */
bux_cli = NULL;
bux_layer = NULL;
bux_val = NULL;
+
+ __sttd_dbus_service_free();
return STTD_ERROR_OPERATION_FAILED;
}
int __sttd_request_custom_dbus_name()
{
- static DBusConnection* g_conn_custom = NULL;
DBusError err;
dbus_error_init(&err);
if (dbus_error_is_set(&err)) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail dbus_bus_get : %s", err.message);
dbus_error_free(&err);
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
int ret = dbus_bus_request_name(g_conn_custom, STT_SERVER_CUSTOM_SERVICE_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to be primary owner");
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
if (dbus_error_is_set(&err)) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_request_name() : %s", err.message);
dbus_error_free(&err);
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
if (dbus_error_is_set(&err)) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message);
dbus_error_free(&err);
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
if (NULL == g_conn_listener) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get dbus connection");
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
ret = __sttd_get_buxtonkey();
if (0 != ret) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get buxton key");
+ __sttd_dbus_service_free();
+ __sttd_dbus_connection_free();
return ret;
}
ret = __sttd_request_custom_dbus_name();
if (0 != ret) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to request custom dbus name");
+ __sttd_dbus_service_free();
+ __sttd_dbus_connection_free();
return ret;
}
if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to be primary owner");
+ __sttd_dbus_service_free();
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
if (dbus_error_is_set(&err)) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_request_name() : %s", err.message);
dbus_error_free(&err);
+ __sttd_dbus_service_free();
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
if (dbus_error_is_set(&err)) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_add_match() : %s", err.message);
dbus_error_free(&err);
+ __sttd_dbus_service_free();
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
g_dbus_fd_handler = ecore_main_fd_handler_add(fd, ECORE_FD_READ, (Ecore_Fd_Cb)listener_event_callback, g_conn_listener, NULL, NULL);
if (NULL == g_dbus_fd_handler) {
SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get fd handler");
+ __sttd_dbus_service_free();
+ __sttd_dbus_connection_free();
return STTD_ERROR_OPERATION_FAILED;
}
g_dbus_fd_handler = NULL;
}
- dbus_bus_release_name(g_conn_listener, g_server_service_name, &err);
-
- if (dbus_error_is_set(&err)) {
- SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message);
- dbus_error_free(&err);
+ if (NULL != g_conn_listener) {
+ dbus_bus_release_name(g_conn_listener, g_server_service_name, &err);
+ if (dbus_error_is_set(&err)) {
+ SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message);
+ dbus_error_free(&err);
+ }
}
- dbus_connection_close(g_conn_listener);
- dbus_connection_close(g_conn_sender);
-
- dbus_connection_unref(g_conn_sender);
- dbus_connection_unref(g_conn_listener);
-
- g_conn_listener = NULL;
- g_conn_sender = NULL;
-
+ __sttd_dbus_connection_free();
__sttd_dbus_service_free();
SLOG(LOG_DEBUG, TAG_STTD, "[Server] Close dbus connection");