diff options
| -rw-r--r-- | alarm-manager.c | 67 | ||||
| -rw-r--r-- | alarm_mgr.xml | 82 | ||||
| -rw-r--r-- | include/alarm-internal.h | 1 | ||||
| -rw-r--r-- | src/alarm-lib-stub.c | 22 | ||||
| -rw-r--r-- | src/alarm-lib.c | 48 |
5 files changed, 96 insertions, 124 deletions
diff --git a/alarm-manager.c b/alarm-manager.c index ec73125..68848f2 100644 --- a/alarm-manager.c +++ b/alarm-manager.c @@ -1811,7 +1811,7 @@ void __reschedule_alarms_with_newtime(int cur_time, int new_time, double diff_ti return; } -gboolean alarm_manager_alarm_set_rtc_time(AlarmManager *pObj, GDBusMethodInvocation *invoc, int pid, +gboolean alarm_manager_alarm_set_rtc_time(AlarmManager *pObj, GDBusMethodInvocation *invoc, int year, int mon, int day, int hour, int min, int sec, gpointer user_data) { @@ -1820,14 +1820,13 @@ gboolean alarm_manager_alarm_set_rtc_time(AlarmManager *pObj, GDBusMethodInvocat int retval = 0; int return_code = ALARMMGR_RESULT_SUCCESS; struct tm *alarm_tm = NULL; - #ifdef _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif - /*extract day of the week, day in the year & daylight saving time from system*/ time_t current_time; + current_time = time(NULL); alarm_tm = localtime(¤t_time); @@ -2028,7 +2027,6 @@ done: } gboolean alarm_manager_alarm_create_appsvc(AlarmManager *pObject, GDBusMethodInvocation *invoc, - int pid, int start_year, int start_month, int start_day, int start_hour, int start_min, @@ -2048,6 +2046,10 @@ gboolean alarm_manager_alarm_create_appsvc(AlarmManager *pObject, GDBusMethodInv char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif bool ret = true; + int pid; + const char *name = g_dbus_method_invocation_get_sender(invoc); + + pid = __get_caller_pid(name); alarm_info.start.year = start_year; alarm_info.start.month = start_month; @@ -2090,7 +2092,7 @@ gboolean alarm_manager_alarm_create_appsvc(AlarmManager *pObject, GDBusMethodInv return ret; } -gboolean alarm_manager_alarm_create(AlarmManager *obj, GDBusMethodInvocation *invoc, int pid, +gboolean alarm_manager_alarm_create(AlarmManager *obj, GDBusMethodInvocation *invoc, char *app_service_name, char *app_service_name_mod, int start_year, int start_month, int start_day, int start_hour, int start_min, @@ -2110,6 +2112,10 @@ gboolean alarm_manager_alarm_create(AlarmManager *obj, GDBusMethodInvocation *in char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif bool ret = true; + int pid; + const char *name = g_dbus_method_invocation_get_sender(invoc); + + pid = __get_caller_pid(name); alarm_info.start.year = start_year; alarm_info.start.month = start_month; @@ -2242,8 +2248,7 @@ gboolean alarm_manager_alarm_create_periodic(AlarmManager *obj, GDBusMethodInvoc } gboolean alarm_manager_alarm_delete(AlarmManager *obj, GDBusMethodInvocation *invoc, - int pid, alarm_id_t alarm_id, - gpointer user_data) + alarm_id_t alarm_id, gpointer user_data) { int retval = 0; int return_code = ALARMMGR_RESULT_SUCCESS; @@ -2252,6 +2257,11 @@ gboolean alarm_manager_alarm_delete(AlarmManager *obj, GDBusMethodInvocation *in char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif bool ret = true; + int pid; + const char *name = g_dbus_method_invocation_get_sender(invoc); + + pid = __get_caller_pid(name); + if (!__alarm_delete(pid, alarm_id, &return_code)) { ALARM_MGR_EXCEPTION_PRINT("Unable to delete the alarm! alarm_id[%d], return_code[%d]", alarm_id, return_code); @@ -2277,7 +2287,7 @@ gboolean alarm_manager_alarm_delete(AlarmManager *obj, GDBusMethodInvocation *in } gboolean alarm_manager_alarm_delete_all(AlarmManager *obj, GDBusMethodInvocation *invoc, - int pid, gpointer user_data) + gpointer user_data) { GSList* gs_iter = NULL; char app_name[512] = { 0 }; @@ -2289,6 +2299,10 @@ gboolean alarm_manager_alarm_delete_all(AlarmManager *obj, GDBusMethodInvocation #ifdef _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif + int pid; + const char *name = g_dbus_method_invocation_get_sender(invoc); + + pid = __get_caller_pid(name); if (!__get_caller_unique_name(pid, app_name)) { return_code = ERR_ALARM_SYSTEM_FAIL; @@ -2353,7 +2367,7 @@ gboolean alarm_manager_alarm_delete_all(AlarmManager *obj, GDBusMethodInvocation return true; } -gboolean alarm_manager_alarm_update(AlarmManager *pObj, GDBusMethodInvocation *invoc, int pid, +gboolean alarm_manager_alarm_update(AlarmManager *pObj, GDBusMethodInvocation *invoc, char *app_service_name, alarm_id_t alarm_id, int start_year, int start_month, int start_day, int start_hour, @@ -2370,6 +2384,10 @@ gboolean alarm_manager_alarm_update(AlarmManager *pObj, GDBusMethodInvocation *i char log_tag[ALARMMGR_LOG_TAG_SIZE] = {0,}; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; #endif + int pid; + const char *name = g_dbus_method_invocation_get_sender(invoc); + + pid = __get_caller_pid(name); alarm_info.start.year = start_year; alarm_info.start.month = start_month; @@ -2412,7 +2430,7 @@ gboolean alarm_manager_alarm_update(AlarmManager *pObj, GDBusMethodInvocation *i return ret; } -gboolean alarm_manager_alarm_get_number_of_ids(AlarmManager *pObject, GDBusMethodInvocation *invoc, int pid, +gboolean alarm_manager_alarm_get_number_of_ids(AlarmManager *pObject, GDBusMethodInvocation *invoc, gpointer user_data) { GSList *gs_iter = NULL; @@ -2421,6 +2439,10 @@ gboolean alarm_manager_alarm_get_number_of_ids(AlarmManager *pObject, GDBusMetho int retval = 0; int num_of_ids = 0; int return_code = ALARMMGR_RESULT_SUCCESS; + int pid; + const char *name = g_dbus_method_invocation_get_sender(invoc); + + pid = __get_caller_pid(name); if (!__get_caller_unique_name(pid, app_name)) { return_code = ERR_ALARM_SYSTEM_FAIL; @@ -2444,7 +2466,7 @@ gboolean alarm_manager_alarm_get_number_of_ids(AlarmManager *pObject, GDBusMetho return true; } -gboolean alarm_manager_alarm_get_list_of_ids(AlarmManager *pObject, GDBusMethodInvocation *invoc, int pid, +gboolean alarm_manager_alarm_get_list_of_ids(AlarmManager *pObject, GDBusMethodInvocation *invoc, int max_number_of_ids, gpointer user_data) { GSList *gs_iter = NULL; @@ -2455,6 +2477,10 @@ gboolean alarm_manager_alarm_get_list_of_ids(AlarmManager *pObject, GDBusMethodI GVariantBuilder* builder = NULL; int num_of_ids = 0; int return_code = ALARMMGR_RESULT_SUCCESS; + int pid; + const char *name = g_dbus_method_invocation_get_sender(invoc); + + pid = __get_caller_pid(name); if (max_number_of_ids <= 0) { SECURE_LOGE("called for pid(%d), but max_number_of_ids(%d) is less than 0.", pid, max_number_of_ids); @@ -2490,9 +2516,8 @@ gboolean alarm_manager_alarm_get_list_of_ids(AlarmManager *pObject, GDBusMethodI return true; } -gboolean alarm_manager_alarm_get_appsvc_info(AlarmManager *pObject, GDBusMethodInvocation *invoc , - int pid, alarm_id_t alarm_id, - gpointer user_data) +gboolean alarm_manager_alarm_get_appsvc_info(AlarmManager *pObject, GDBusMethodInvocation *invoc, + alarm_id_t alarm_id, gpointer user_data) { bool found = false; GSList *gs_iter = NULL; @@ -2501,7 +2526,7 @@ gboolean alarm_manager_alarm_get_appsvc_info(AlarmManager *pObject, GDBusMethodI int return_code = ALARMMGR_RESULT_SUCCESS; gchar *b_data = NULL; - SECURE_LOGD("called for pid(%d) and alarm_id(%d)\n", pid, alarm_id); + SECURE_LOGD("called for alarm_id(%d)\n", alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { entry = gs_iter->data; @@ -2527,17 +2552,16 @@ gboolean alarm_manager_alarm_get_appsvc_info(AlarmManager *pObject, GDBusMethodI return true; } -gboolean alarm_manager_alarm_get_info(AlarmManager *pObject, GDBusMethodInvocation *invoc, int pid, +gboolean alarm_manager_alarm_get_info(AlarmManager *pObject, GDBusMethodInvocation *invoc, alarm_id_t alarm_id, gpointer user_data) { - SECURE_LOGD("called for pid(%d) and alarm_id(%d)\n", pid, alarm_id); - GSList *gs_iter = NULL; __alarm_info_t *entry = NULL; alarm_info_t *alarm_info = NULL; int retval = 0; int return_code = ALARMMGR_RESULT_SUCCESS; + SECURE_LOGD("called for alarm_id(%d)\n", alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { entry = gs_iter->data; if (entry->alarm_id == alarm_id) { @@ -2560,11 +2584,9 @@ gboolean alarm_manager_alarm_get_info(AlarmManager *pObject, GDBusMethodInvocati return true; } -gboolean alarm_manager_alarm_get_next_duetime(AlarmManager *pObject, GDBusMethodInvocation *invoc, int pid, +gboolean alarm_manager_alarm_get_next_duetime(AlarmManager *pObject, GDBusMethodInvocation *invoc, alarm_id_t alarm_id, gpointer user_data) { - SECURE_LOGD("called for pid(%d) and alarm_id(%d)\n", pid, alarm_id); - GSList *gs_iter = NULL; __alarm_info_t *entry = NULL; __alarm_info_t *find_item = NULL; @@ -2572,6 +2594,7 @@ gboolean alarm_manager_alarm_get_next_duetime(AlarmManager *pObject, GDBusMethod int return_code = ALARMMGR_RESULT_SUCCESS; time_t duetime = 0; + SECURE_LOGD("called for alarm_id(%d)\n", alarm_id); for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter)) { entry = gs_iter->data; if (entry->alarm_id == alarm_id) { @@ -2594,7 +2617,7 @@ gboolean alarm_manager_alarm_get_next_duetime(AlarmManager *pObject, GDBusMethod return true; } -gboolean alarm_manager_alarm_get_all_info(AlarmManager *pObject, GDBusMethodInvocation *invoc, int pid, gpointer user_data) +gboolean alarm_manager_alarm_get_all_info(AlarmManager *pObject, GDBusMethodInvocation *invoc, gpointer user_data) { sqlite3 *alarmmgr_tool_db; char *db_path = NULL; diff --git a/alarm_mgr.xml b/alarm_mgr.xml index 566c589..4facb9d 100644 --- a/alarm_mgr.xml +++ b/alarm_mgr.xml @@ -11,7 +11,6 @@ <arg type="i" name="return_code" direction="out" /> </method> <method name="alarm_create"> - <arg type="i" name="pid" direction="in" /> <arg type="s" name="app_service_name" direction="in" /> <arg type="s" name="app_service_name_mod" direction="in" /> <arg type="i" name="alarm_info_start_year" direction="in" /> @@ -32,8 +31,7 @@ <arg type="i" name="alarm_id" direction="out" /> <arg type="i" name="return_code" direction="out" /> </method> - <method name="alarm_create_appsvc"> - <arg type="i" name="pid" direction="in" /> + <method name="alarm_create_appsvc"> <arg type="i" name="alarm_info_start_year" direction="in" /> <arg type="i" name="alarm_info_start_month" direction="in" /> <arg type="i" name="alarm_info_start_day" direction="in" /> @@ -52,18 +50,15 @@ <arg type="i" name="return_code" direction="out" /> </method> <method name="alarm_delete"> - <arg type="i" name="pid" direction="in" /> <arg type="i" name="alarm_id" direction="in" /> <arg type="i" name="alarm_info_return_code" direction="out" /> </method> <method name="alarm_delete_all"> - <arg type="i" name="pid" direction="in" /> <arg type="i" name="alarm_info_return_code" direction="out" /> </method> - <method name="alarm_update"> - <arg type="i" name="pid" direction="in" /> - <arg type="s" name="app_service_name" direction="in" /> - <arg type="i" name="alarm_id" direction="in" /> + <method name="alarm_update"> + <arg type="s" name="app_service_name" direction="in" /> + <arg type="i" name="alarm_id" direction="in" /> <arg type="i" name="alarm_info_start_year" direction="in" /> <arg type="i" name="alarm_info_start_month" direction="in" /> <arg type="i" name="alarm_info_start_day" direction="in" /> @@ -75,31 +70,27 @@ <arg type="i" name="alarm_info_end_day" direction="in" /> <arg type="i" name="alarm_info_mode_day_of_week" direction="in" /> <arg type="i" name="alarm_info_mode_repeat" direction="in" /> - <arg type="i" name="alarm_info_alarm_type" direction="in" /> + <arg type="i" name="alarm_info_alarm_type" direction="in" /> <arg type="i" name="alarm_info_reserved_info" direction="in" /> <arg type="i" name="return_code" direction="out" /> </method> - <method name="alarm_get_number_of_ids"> - <arg type="i" name="pid" direction="in" /> - <arg type="i" name="number_of_ids" direction="out" /> - <arg type="i" name="return_code" direction="out" /> + <method name="alarm_get_number_of_ids"> + <arg type="i" name="number_of_ids" direction="out" /> + <arg type="i" name="return_code" direction="out" /> </method> - <method name="alarm_get_list_of_ids"> - <arg type="i" name="pid" direction="in" /> - <arg type="i" name="max_number_of_ids" direction="in" /> - <arg type="ai" name="alarm_id" direction="out" /> - <arg type="i" name="number_of_ids" direction="out" /> - <arg type="i" name="return_code" direction="out" /> + <method name="alarm_get_list_of_ids"> + <arg type="i" name="max_number_of_ids" direction="in" /> + <arg type="ai" name="alarm_id" direction="out" /> + <arg type="i" name="number_of_ids" direction="out" /> + <arg type="i" name="return_code" direction="out" /> </method> - <method name="alarm_get_appsvc_info"> - <arg type="i" name="pid" direction="in" /> - <arg type="i" name="alarm_id" direction="in" /> - <arg type="s" name="b_data" direction="out" /> - <arg type="i" name="return_code" direction="out" /> + <method name="alarm_get_appsvc_info"> + <arg type="i" name="alarm_id" direction="in" /> + <arg type="s" name="b_data" direction="out" /> + <arg type="i" name="return_code" direction="out" /> </method> <method name="alarm_get_info"> - <arg type="i" name="pid" direction="in" /> - <arg type="i" name="alarm_id" direction="in" /> + <arg type="i" name="alarm_id" direction="in" /> <arg type="i" name="alarm_info_start_year" direction="out" /> <arg type="i" name="alarm_info_start_month" direction="out" /> <arg type="i" name="alarm_info_start_day" direction="out" /> @@ -115,8 +106,7 @@ <arg type="i" name="alarm_info_reserved_info" direction="out" /> <arg type="i" name="return_code" direction="out" /> </method> - <method name="alarm_set_rtc_time"> - <arg type="i" name="pid" direction="in" /> + <method name="alarm_set_rtc_time"> <arg type="i" name="alarm_info_year" direction="in" /> <arg type="i" name="alarm_info_month" direction="in" /> <arg type="i" name="alarm_info_day" direction="in" /> @@ -125,31 +115,29 @@ <arg type="i" name="alarm_info_sec" direction="in" /> <arg type="i" name="return_code" direction="out" /> </method> - <method name="alarm_get_next_duetime"> - <arg type="i" name="pid" direction="in" /> - <arg type="i" name="alarm_id" direction="in" /> - <arg type="i" name="duetime" direction="out" /> - <arg type="i" name="return_code" direction="out" /> + <method name="alarm_get_next_duetime"> + <arg type="i" name="alarm_id" direction="in" /> + <arg type="i" name="duetime" direction="out" /> + <arg type="i" name="return_code" direction="out" /> </method> - <method name="alarm_get_all_info"> - <arg type="i" name="pid" direction="in" /> - <arg type="s" name="db_path" direction="out" /> - <arg type="i" name="return_code" direction="out" /> + <method name="alarm_get_all_info"> + <arg type="s" name="db_path" direction="out" /> + <arg type="i" name="return_code" direction="out" /> </method> <method name="alarm_set_time"> <arg type="i" name="time" direction="in" /> <arg type="i" name="return_code" direction="out" /> </method> <method name="alarm_set_time_with_propagation_delay"> - <arg type="u" name="new_sec" direction="in" /> - <arg type="u" name="new_nsec" direction="in" /> - <arg type="u" name="req_sec" direction="in" /> - <arg type="u" name="req_nsec" direction="in" /> - <arg type="i" name="return_code" direction="out" /> - </method> - <method name="alarm_set_timezone"> - <arg type="s" name="tzpath_str" direction="in" /> - <arg type="i" name="return_code" direction="out" /> + <arg type="u" name="new_sec" direction="in" /> + <arg type="u" name="new_nsec" direction="in" /> + <arg type="u" name="req_sec" direction="in" /> + <arg type="u" name="req_nsec" direction="in" /> + <arg type="i" name="return_code" direction="out" /> + </method> + <method name="alarm_set_timezone"> + <arg type="s" name="tzpath_str" direction="in" /> + <arg type="i" name="return_code" direction="out" /> </method> </interface> </node> diff --git a/include/alarm-internal.h b/include/alarm-internal.h index 60b2d3a..e0071a7 100644 --- a/include/alarm-internal.h +++ b/include/alarm-internal.h @@ -72,7 +72,6 @@ typedef struct { GDBusProxy *proxy; alarm_cb_t alarm_handler; void *user_param; - int pid; /* this specifies pid*/ GQuark quark_app_service_name; /*dbus_service_name is converted to quark value*/ GQuark quark_app_service_name_mod; diff --git a/src/alarm-lib-stub.c b/src/alarm-lib-stub.c index 3a899df..e51aae2 100644 --- a/src/alarm-lib-stub.c +++ b/src/alarm-lib-stub.c @@ -72,7 +72,7 @@ bool _send_alarm_create_appsvc(alarm_context_t context, alarm_info_t *alarm_info return false; } - if (!alarm_manager_call_alarm_create_appsvc_sync((AlarmManager*)context.proxy, context.pid, + if (!alarm_manager_call_alarm_create_appsvc_sync((AlarmManager*)context.proxy, alarm_info->start.year, alarm_info->start.month, alarm_info->start.day, @@ -130,7 +130,7 @@ bool _send_alarm_create(alarm_context_t context, alarm_info_t *alarm_info, return false; } - if (!alarm_manager_call_alarm_create_sync((AlarmManager*)context.proxy, context.pid, + if (!alarm_manager_call_alarm_create_sync((AlarmManager*)context.proxy, g_quark_to_string(context.quark_app_service_name), g_quark_to_string(context.quark_app_service_name_mod), alarm_info->start.year, @@ -217,7 +217,7 @@ bundle *_send_alarm_get_appsvc_info(alarm_context_t context, alarm_id_t alarm_id int len = 0; if (!alarm_manager_call_alarm_get_appsvc_info_sync - ((AlarmManager*)context.proxy, context.pid, alarm_id, &b_data, &return_code, NULL, &error)) { + ((AlarmManager*)context.proxy, alarm_id, &b_data, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_get_appsvc_info_sync() failed. alarm_id[%d], return_code[%d].", alarm_id, return_code); @@ -255,7 +255,7 @@ bool _send_alarm_set_rtc_time(alarm_context_t context, alarm_date_t *time, int * int return_code = 0; if (!alarm_manager_call_alarm_set_rtc_time_sync - ((AlarmManager*)context.proxy, context.pid, time->year, time->month, time->day, + ((AlarmManager*)context.proxy, time->year, time->month, time->day, time->hour, time->min, time->sec, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ @@ -283,7 +283,7 @@ bool _send_alarm_delete(alarm_context_t context, alarm_id_t alarm_id, int *error int return_code = 0; if (!alarm_manager_call_alarm_delete_sync - ((AlarmManager*)context.proxy, context.pid, alarm_id, &return_code, NULL, &error)) { + ((AlarmManager*)context.proxy, alarm_id, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_delete_sync() failed. alarm_id[%d], return_code[%d]", alarm_id, return_code); @@ -310,7 +310,7 @@ bool _send_alarm_delete_all(alarm_context_t context, int *error_code) int return_code = 0; if (!alarm_manager_call_alarm_delete_all_sync - ((AlarmManager*)context.proxy, context.pid, &return_code, NULL, &error)) { + ((AlarmManager*)context.proxy, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_delete_all_sync() failed. return_code[%d]", return_code); @@ -340,7 +340,7 @@ bool _send_alarm_get_list_of_ids(alarm_context_t context, int maxnum_of_ids, int return_code = 0; if (!alarm_manager_call_alarm_get_list_of_ids_sync((AlarmManager*)context.proxy, - context.pid, maxnum_of_ids, &alarm_array, + maxnum_of_ids, &alarm_array, num_of_ids, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ @@ -383,7 +383,7 @@ bool _send_alarm_get_number_of_ids(alarm_context_t context, int *num_of_ids, GError *error = NULL; gint return_code = 0; - if (!alarm_manager_call_alarm_get_number_of_ids_sync((AlarmManager*)context.proxy, context.pid, num_of_ids, &return_code, NULL, &error)) { + if (!alarm_manager_call_alarm_get_number_of_ids_sync((AlarmManager*)context.proxy, num_of_ids, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /* error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( @@ -413,7 +413,7 @@ bool _send_alarm_get_info(alarm_context_t context, alarm_id_t alarm_id, int return_code = 0; if (!alarm_manager_call_alarm_get_info_sync((AlarmManager*)context.proxy, - context.pid, alarm_id, &alarm_info->start.year, + alarm_id, &alarm_info->start.year, &alarm_info->start.month, &alarm_info->start.day, &alarm_info->start.hour, &alarm_info->start.min, &alarm_info->start.sec, &alarm_info->end.year, @@ -449,7 +449,7 @@ bool _send_alarm_get_next_duetime(alarm_context_t context, int return_code = 0; if (!alarm_manager_call_alarm_get_next_duetime_sync((AlarmManager*)context.proxy, - context.pid, alarm_id, (gint *)duetime, &return_code, NULL, &error)) { + alarm_id, (gint *)duetime, &return_code, NULL, &error)) { /*g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( @@ -475,7 +475,7 @@ bool _send_alarm_get_all_info(alarm_context_t context, char ** db_path, int *err GError *error = NULL; int return_code = 0; - if (!alarm_manager_call_alarm_get_all_info_sync((AlarmManager*)context.proxy, context.pid, db_path, &return_code, NULL, &error)) { + if (!alarm_manager_call_alarm_get_all_info_sync((AlarmManager*)context.proxy, db_path, &return_code, NULL, &error)) { /*g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_get_all_info_sync() failed by dbus. return_code[%d][%s]", return_code, error->message); diff --git a/src/alarm-lib.c b/src/alarm-lib.c index c282bec..a697b80 100644 --- a/src/alarm-lib.c +++ b/src/alarm-lib.c @@ -38,9 +38,6 @@ #include <aul.h> #include <gio/gio.h> -#define MAX_KEY_SIZE 256 -#define MAX_PROC_NAME_LEN 512 - #ifndef EXPORT_API #define EXPORT_API __attribute__ ((visibility("default"))) #endif @@ -241,11 +238,8 @@ static bool __alarm_validate_time(alarm_date_t *date, int *error_code) static int __sub_init() { GError *error = NULL; - char proc_file[MAX_PROC_NAME_LEN] = {0, }; - char process_name[MAX_PROC_NAME_LEN] = {0, }; int fd = 0; int ret = 0; - const int MAX_LEN = MAX_PROC_NAME_LEN; pthread_mutex_lock(&init_lock); @@ -283,38 +277,6 @@ static int __sub_init() return ERR_ALARM_SYSTEM_FAIL; } - // Only webapp which has a pid of WebProcess uses the sid. Otherwise, the pid is used. - snprintf(proc_file, MAX_LEN, "/proc/%d/cmdline", getpid()); - fd = open(proc_file, O_RDONLY); - if (fd < 0) { - SECURE_LOGE("Unable to get the proc file(%d).\n", getpid()); - g_object_unref(alarm_context.proxy); - g_object_unref(alarm_context.connection); - pthread_mutex_unlock(&init_lock); - return ERR_ALARM_SYSTEM_FAIL; - } - else { - ret = read(fd, process_name, MAX_LEN - 1); - close(fd); - if (ret < 0) { - ALARM_MGR_EXCEPTION_PRINT("Unable to read the proc file(%d).", getpid()); - g_object_unref(alarm_context.proxy); - g_object_unref(alarm_context.connection); - pthread_mutex_unlock(&init_lock); - return ERR_ALARM_SYSTEM_FAIL; - } - else { - if (strncmp(process_name, "/usr/bin/WebProcess", strlen("/usr/bin/WebProcess")) == 0) { - alarm_context.pid = getsid(getpid()); - SECURE_LOGD("alarm_context.pid is set to sessionID, %d.", alarm_context.pid); - } - else { - alarm_context.pid = getpid(); - SECURE_LOGD("alarm_context.pid is set to processID, %d.", alarm_context.pid); - } - } - } - sub_initialized = true; pthread_mutex_unlock(&init_lock); @@ -1233,7 +1195,7 @@ EXPORT_API int alarmmgr_enum_alarm_ids(alarm_enum_fn_t fn, void *user_param) SECURE_LOGD("alarm_manager_call_alarm_get_number_of_ids_sync() is called"); if (!alarm_manager_call_alarm_get_number_of_ids_sync( - (AlarmManager*)alarm_context.proxy, alarm_context.pid, &maxnum_of_ids, &return_code, NULL, &error)) { + (AlarmManager*)alarm_context.proxy, &maxnum_of_ids, &return_code, NULL, &error)) { /* dbus error. error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( "alarm_manager_call_alarm_get_number_of_ids_sync() is failed by dbus. return_code[%d], err message[%s]", @@ -1250,7 +1212,7 @@ EXPORT_API int alarmmgr_enum_alarm_ids(alarm_enum_fn_t fn, void *user_param) SECURE_LOGD("alarm_manager_call_alarm_get_list_of_ids_sync() is called"); if (!alarm_manager_call_alarm_get_list_of_ids_sync( - (AlarmManager*)alarm_context.proxy, alarm_context.pid, maxnum_of_ids, &alarm_array, &num_of_ids, &return_code, NULL, &error)) { + (AlarmManager*)alarm_context.proxy, maxnum_of_ids, &alarm_array, &num_of_ids, &return_code, NULL, &error)) { /* dbus error. error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( "alarm_manager_call_alarm_get_list_of_ids_sync() failed by dbus. num_of_ids[%d], return_code[%d].", num_of_ids, return_code); @@ -1516,7 +1478,7 @@ EXPORT_API int alarmmgr_set_systime(int new_time) return error_code; } - ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time(%d) by pid(%d).", new_time, alarm_context.pid); + ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time(%d) by pid(%d).", new_time, getpid()); return ALARMMGR_RESULT_SUCCESS; } @@ -1535,7 +1497,7 @@ EXPORT_API int alarmmgr_set_systime_with_propagation_delay(struct timespec new_t return error_code; } - ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time by pid(%d).", alarm_context.pid); + ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time by pid(%d).", getpid()); return ALARMMGR_RESULT_SUCCESS; } @@ -1556,6 +1518,6 @@ EXPORT_API int alarmmgr_set_timezone(char *tzpath_str) return error_code; } - ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the timezone(%s) by pid(%d)", tzpath_str, alarm_context.pid); + ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the timezone(%s) by pid(%d)", tzpath_str, getpid()); return ALARMMGR_RESULT_SUCCESS; } |