Commit 42eb1eda authored by spiiroin's avatar spiiroin

Merge branch 'jb45312_sighup_corruption' into 'master'

Fix data corruption after SIGHUP config reload

See merge request !48
parents b6f0fdad 8a6390ec
......@@ -316,10 +316,24 @@ endif
# ----------------------------------------------------------------------------
.SUFFIXES: .q .p .g
%.q : %.c ; $(CC) -o $@ -E $< $(CPPFLAGS) $(MCE_CFLAGS)
%.p : %.q ; cproto -s < $< | prettyproto.py > $@
%.g : %.q ; cproto < $< | prettyproto.py > $@
.PRECIOUS: .q
PROTO_CPPFLAGS += -DAPP_SYNC
PROTO_CPPFLAGS += -DAPP_SYNC_DBUS
PROTO_CPPFLAGS += -DCONNMAN
PROTO_CPPFLAGS += -DDEAD_CODE
PROTO_CPPFLAGS += -DDEBIAN
PROTO_CPPFLAGS += -DMEEGOLOCK
PROTO_CPPFLAGS += -DOFONO
PROTO_CPPFLAGS += -DSYSTEMD
PROTO_CPPFLAGS += -DUSE_MER_SSU
PROTO_CPPFLAGS += -DCONNMAN_WORKS_BETTER=1
PROTO_CPPFLAGS += -DVERBOSE_WAKELOCKING=1
%.q : CPPFLAGS += $(PROTO_CPPFLAGS)
%.q : %.c ; $(CC) -o $@ -E $< $(CPPFLAGS) -O
%.p : %.q prettyproto.groups ; cproto -s < $< | prettyproto.py > $@
%.g : %.q prettyproto.groups ; cproto < $< | prettyproto.py > $@
clean::
$(RM) *.[qpg] src/*.[qpg] utils/*.[qpg]
......
/**
* @file usb_moded-android.c
*
* Copyright (C) 2013-2018 Jolla. All rights reserved.
* Copyright (C) 2013-2019 Jolla. All rights reserved.
*
* @author: Philippe De Swert <philippe.deswert@jollamobile.com>
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
......@@ -34,11 +34,14 @@
#include <stdlib.h>
/* ========================================================================= *
* Functions
* Prototypes
* ========================================================================= */
/* -- android -- */
/* ------------------------------------------------------------------------- *
* ANDROID
* ------------------------------------------------------------------------- */
static bool android_write_file (const char *path, const char *text);
bool android_in_use (void);
static bool android_probe (void);
gchar *android_get_serial (void);
......
/**
* @file usb_moded-android.h
*
* Copyright (C) 2013-2018 Jolla. All rights reserved.
* Copyright (C) 2013-2019 Jolla. All rights reserved.
*
* @author: Philippe De Swert <philippe.deswert@jollamobile.com>
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
......@@ -44,7 +44,9 @@
* Prototypes
* ========================================================================= */
/* -- android -- */
/* ------------------------------------------------------------------------- *
* ANDROID
* ------------------------------------------------------------------------- */
bool android_in_use (void);
gchar *android_get_serial (void);
......
/*
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2018 Jolla Ltd.
* Copyright (C) 2018-2019 Jolla Ltd.
*
* Author: Philippe De Swert <philippe.de-swert@nokia.com>
* Author: Philippe De Swert <phdeswer@lumi.maa>
......@@ -33,7 +33,9 @@
* Prototypes
* ========================================================================= */
/* -- dbusappsync -- */
/* ------------------------------------------------------------------------- *
* DBUSAPPSYNC
* ------------------------------------------------------------------------- */
gboolean dbusappsync_init_connection(void);
gboolean dbusappsync_init (void);
......
......@@ -2,7 +2,7 @@
* @file usb_moded-dbus.c
*
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd.
* Copyright (C) 2013-2019 Jolla Ltd.
*
* @author: Philippe De Swert <philippe.de-swert@nokia.com>
* @author: Philippe De Swert <phdeswer@lumi.maa>
......@@ -38,7 +38,9 @@
* Prototypes
* ========================================================================= */
/* -- dbusappsync -- */
/* ------------------------------------------------------------------------- *
* DBUSAPPSYNC
* ------------------------------------------------------------------------- */
static void dbusappsync_release_name (void);
static gboolean dbusappsync_obtain_name (void);
......
......@@ -2,7 +2,7 @@
* @file usb_moded-appsync.c
*
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd.
* Copyright (C) 2013-2019 Jolla Ltd.
*
* @author: Philippe De Swert <philippe.de-swert@nokia.com>
* @author: Philippe De Swert <phdeswer@lumi.maa>
......@@ -40,27 +40,27 @@
* Prototypes
* ========================================================================= */
/* -- appsync -- */
static void appsync_free_elem (list_elem_t *elem);
static void appsync_free_elem_cb (gpointer elem, gpointer user_data);
void appsync_free_appsync_list (void);
static gint appsync_list_sort_func (gconstpointer a, gconstpointer b);
void appsync_read_list (int diag);
static list_elem_t *appsync_read_file (const gchar *filename, int diag);
int appsync_activate_sync (const char *mode);
int appsync_activate_sync_post (const char *mode);
int appsync_mark_active (const gchar *name, int post);
/* ------------------------------------------------------------------------- *
* APPSYNC
* ------------------------------------------------------------------------- */
static void appsync_free_elem (list_elem_t *elem);
static void appsync_free_elem_cb (gpointer elem, gpointer user_data);
void appsync_free_appsync_list (void);
static gint appsync_list_sort_func (gconstpointer a, gconstpointer b);
void appsync_read_list (int diag);
static list_elem_t *appsync_read_file (const gchar *filename, int diag);
int appsync_activate_sync (const char *mode);
int appsync_activate_sync_post (const char *mode);
int appsync_mark_active (const gchar *name, int post);
#ifdef APP_SYNC_DBUS
static gboolean appsync_enumerate_usb_cb (gpointer data);
static void appsync_start_enumerate_usb_timer (void);
static void appsync_cancel_enumerate_usb_timer(void);
static void appsync_enumerate_usb (void);
#endif
void appsync_stop_apps (int post);
int appsync_stop (gboolean force);
static gboolean appsync_enumerate_usb_cb (gpointer data);
static void appsync_start_enumerate_usb_timer (void);
static void appsync_cancel_enumerate_usb_timer(void);
static void appsync_enumerate_usb (void);
#endif // APP_SYNC_DBUS
void appsync_stop_apps (int post);
int appsync_stop (gboolean force);
/* ========================================================================= *
* Data
......
/*
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd.
* Copyright (C) 2013-2019 Jolla Ltd.
*
* author: Philippe De Swert <philippe.de-swert@nokia.com>
* author: Philippe De Swert <phdeswer@lumi.maa>
......@@ -74,14 +74,16 @@ typedef struct list_elem_t
* Prototypes
* ========================================================================= */
/* -- appsync -- */
/* ------------------------------------------------------------------------- *
* APPSYNC
* ------------------------------------------------------------------------- */
void appsync_free_appsync_list (void);
void appsync_read_list (int diag);
int appsync_activate_sync (const char *mode);
int appsync_activate_sync_post(const char *mode);
int appsync_mark_active (const gchar *name, int post);
int appsync_stop (gboolean force);
void appsync_stop_apps (int post);
int appsync_stop (gboolean force);
#endif /* USB_MODED_APPSYNC_H_ */
......@@ -35,11 +35,15 @@ typedef struct modemapping_t
* Prototypes
* ========================================================================= */
/* -- cable -- */
/* ------------------------------------------------------------------------- *
* CABLE_STATE
* ------------------------------------------------------------------------- */
const char *cable_state_repr(cable_state_t state);
/* -- common -- */
/* ------------------------------------------------------------------------- *
* COMMON
* ------------------------------------------------------------------------- */
const char *common_map_mode_to_hardware (const char *internal_mode);
const char *common_map_mode_to_external (const char *internal_mode);
......@@ -55,6 +59,7 @@ FILE *common_popen_ (const char *file, int line, co
waitres_t common_wait (unsigned tot_ms, bool (*ready_cb)(void *aptr), void *aptr);
bool common_msleep_ (const char *file, int line, const char *func, unsigned msec);
static bool common_mode_in_list (const char *mode, char *const *modes);
bool common_modename_is_internal (const char *modename);
int common_valid_mode (const char *mode);
gchar *common_get_mode_list (mode_list_type_t type);
......@@ -439,6 +444,25 @@ static bool common_mode_in_list(const char *mode, char * const *modes)
return false;
}
/** Check if given usb mode is internal
*
* @param modename name of a more
*
* @return true if mode is internal, false otherwise
*/
bool
common_modename_is_internal(const char *modename)
{
LOG_REGISTER_CONTEXT;
return (!g_strcmp0(modename, MODE_UNDEFINED) ||
!g_strcmp0(modename, MODE_CHARGER) ||
!g_strcmp0(modename, MODE_CHARGING_FALLBACK) ||
!g_strcmp0(modename, MODE_ASK) ||
!g_strcmp0(modename, MODE_CHARGING) ||
!g_strcmp0(modename, MODE_BUSY));
}
/** check if a given usb_mode exists
*
* @param mode The mode to look for
......@@ -457,24 +481,21 @@ int common_valid_mode(const char *mode)
}
else
{
gchar *whitelist_value = 0;
gchar **whitelist_array = 0;
const modedata_t *data = usbmoded_get_modedata(mode);
if( (whitelist_value = config_get_mode_whitelist()) )
whitelist_array = g_strsplit(whitelist_value, ",", 0);
if( data ) {
gchar *whitelist_value = 0;
gchar **whitelist_array = 0;
for( GList *iter = usbmoded_get_modelist(); iter; iter = g_list_next(iter) ) {
mode_list_elem_t *data = iter->data;
if( strcmp(mode, data->mode_name) )
continue;
if( (whitelist_value = config_get_mode_whitelist()) )
whitelist_array = g_strsplit(whitelist_value, ",", 0);
if (!whitelist_array || common_mode_in_list(data->mode_name, whitelist_array))
valid = 0;
break;
}
g_strfreev(whitelist_array);
g_free(whitelist_value);
g_strfreev(whitelist_array);
g_free(whitelist_value);
}
}
return valid;
}
......@@ -521,7 +542,7 @@ gchar *common_get_mode_list(mode_list_type_t type)
for( GList *iter = usbmoded_get_modelist(); iter; iter = g_list_next(iter) )
{
mode_list_elem_t *data = iter->data;
modedata_t *data = iter->data;
/* skip items in the hidden list */
if (common_mode_in_list(data->mode_name, hidden_modes_array))
......
......@@ -34,14 +34,18 @@ typedef enum waitres_t
} waitres_t;
/* ========================================================================= *
* Functions
* Prototypes
* ========================================================================= */
/* -- cable -- */
/* ------------------------------------------------------------------------- *
* CABLE_STATE
* ------------------------------------------------------------------------- */
const char *cable_state_repr(cable_state_t state);
/* -- common -- */
/* ------------------------------------------------------------------------- *
* COMMON
* ------------------------------------------------------------------------- */
const char *common_map_mode_to_hardware (const char *internal_mode);
const char *common_map_mode_to_external (const char *internal_mode);
......@@ -55,6 +59,7 @@ int common_system_ (const char *file, int line, con
FILE *common_popen_ (const char *file, int line, const char *func, const char *command, const char *type);
waitres_t common_wait (unsigned tot_ms, bool (*ready_cb)(void *aptr), void *aptr);
bool common_msleep_ (const char *file, int line, const char *func, unsigned msec);
bool common_modename_is_internal (const char *modename);
int common_valid_mode (const char *mode);
gchar *common_get_mode_list (mode_list_type_t type);
......
/*
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2012-2018 Jolla. All rights reserved.
* Copyright (C) 2012-2019 Jolla. All rights reserved.
*
* Author: Philippe De Swert <philippe.de-swert@nokia.com>
* Author: Philippe De Swert <philippedeswert@gmail.com>
......@@ -53,7 +53,9 @@
* Prototypes
* ========================================================================= */
/* -- config -- */
/* ------------------------------------------------------------------------- *
* CONFIG
* ------------------------------------------------------------------------- */
char *config_find_mounts (void);
int config_find_sync (void);
......@@ -65,8 +67,8 @@ char *config_get_trigger_subsystem (void);
char *config_get_trigger_mode (void);
char *config_get_trigger_property (void);
char *config_get_trigger_value (void);
char *config_get_conf_string (const gchar *entry, const gchar *key);
char *config_get_mode_setting (void);
int config_value_changed (GKeyFile *settingsfile, const char *entry, const char *key, const char *new_value);
set_config_result_t config_set_config_setting (const char *entry, const char *key, const char *value);
set_config_result_t config_set_mode_setting (const char *mode);
set_config_result_t config_set_hide_mode_setting (const char *mode);
......@@ -83,7 +85,6 @@ char *config_get_android_product_id (void);
char *config_get_hidden_modes (void);
char *config_get_mode_whitelist (void);
int config_is_roaming_not_allowed (void);
char *config_get_conf_string (const gchar *entry, const gchar *key);
/* ========================================================================= *
* Macros
......
......@@ -2,7 +2,7 @@
* @file usb_moded-config.c
*
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2012-2018 Jolla. All rights reserved.
* Copyright (C) 2012-2019 Jolla. All rights reserved.
*
* @author: Philippe De Swert <philippe.de-swert@nokia.com>
* @author: Philippe De Swert <phdeswer@lumi.maa>
......@@ -57,7 +57,9 @@
* Prototypes
* ========================================================================= */
/* -- config -- */
/* ------------------------------------------------------------------------- *
* CONFIG
* ------------------------------------------------------------------------- */
static int config_validate_ip (const char *ipadd);
char *config_find_mounts (void);
......@@ -413,6 +415,7 @@ set_config_result_t config_set_config_setting(const char *entry, const char *key
if( g_strcmp0(prev, value) ) {
g_key_file_set_string(active_ini, entry, key, value);
ret = SET_CONFIG_UPDATED;
umdbus_send_config_signal(entry, key, value);
}
/* Filter out dynamic data that matches static values */
......@@ -434,7 +437,11 @@ set_config_result_t config_set_mode_setting(const char *mode)
if (strcmp(mode, MODE_ASK) && common_valid_mode(mode))
return SET_CONFIG_ERROR;
return config_set_config_setting(MODE_SETTING_ENTRY, MODE_SETTING_KEY, mode);
int ret = config_set_config_setting(MODE_SETTING_ENTRY,
MODE_SETTING_KEY, mode);
return ret;
}
/* Builds the string used for hidden modes, when hide set to one builds the
......@@ -586,9 +593,7 @@ set_config_result_t config_set_mode_in_whitelist(const char *mode, int allowed)
char *whitelist = config_make_modes_string(MODE_WHITELIST_KEY, mode, allowed);
if (whitelist) {
ret = config_set_mode_whitelist(whitelist);
}
ret = config_set_mode_whitelist(whitelist ?: "");
g_free(whitelist);
......@@ -615,55 +620,50 @@ set_config_result_t config_set_network_setting(const char *config, const char *s
return SET_CONFIG_ERROR;
}
char * config_get_network_setting(const char *config)
char *config_get_network_setting(const char *config)
{
LOG_REGISTER_CONTEXT;
char * ret = 0;
mode_list_elem_t *data;
char *ret = 0;
if(!strcmp(config, NETWORK_IP_KEY))
{
ret = config_get_network_ip();
if(!ret)
ret = strdup("192.168.2.15");
}
else if(!strcmp(config, NETWORK_INTERFACE_KEY))
{
modedata_t *data = 0;
if( !g_strcmp0(config, NETWORK_IP_KEY) ) {
if( !(ret = config_get_network_ip()) )
ret = g_strdup("192.168.2.15");
}
else if( !g_strcmp0(config, NETWORK_INTERFACE_KEY)) {
/* check main configuration before using
* the information from the specific mode */
ret = config_get_network_interface();
if( (ret = config_get_network_interface()) )
goto EXIT;
if(ret)
goto end;
/* no interface override specified, let's use the one
* from the mode config */
data = worker_get_usb_mode_data();
if(data)
{
if(data->network_interface)
{
ret = strdup(data->network_interface);
goto end;
}
if( (data = worker_dup_usb_mode_data()) ) {
if( (ret = g_strdup(data->network_interface)) )
goto EXIT;
}
ret = strdup("usb0");
ret = g_strdup("usb0");
}
else if(!strcmp(config, NETWORK_GATEWAY_KEY))
return config_get_network_gateway();
else if(!strcmp(config, NETWORK_NETMASK_KEY))
{
ret = config_get_network_netmask();
if(!ret)
ret = strdup("255.255.255.0");
else if( !g_strcmp0(config, NETWORK_GATEWAY_KEY) ) {
ret = config_get_network_gateway();
}
else if( !g_strcmp0(config, NETWORK_NETMASK_KEY) ) {
if( !(ret = config_get_network_netmask()) )
ret = g_strdup("255.255.255.0");
}
else if( !g_strcmp0(config, NETWORK_NAT_INTERFACE_KEY) ) {
ret = config_get_network_nat_interface();
}
else if(!strcmp(config, NETWORK_NAT_INTERFACE_KEY))
return config_get_network_nat_interface();
else
else {
/* no matching keys, return error */
return NULL;
end:
}
EXIT:
modedata_free(data);
return ret;
}
......
/**
* @file usb_moded-configfs.c
*
* Copyright (C) 2018 Jolla. All rights reserved.
* Copyright (C) 2018-2019 Jolla. All rights reserved.
*
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
*
......@@ -64,7 +64,9 @@
* Prototypes
* ========================================================================= */
/* -- configfs -- */
/* ------------------------------------------------------------------------- *
* CONFIGFS
* ------------------------------------------------------------------------- */
static gchar *configfs_get_conf (const char *key, const char *def);
static void configfs_read_configuration (void);
......@@ -75,6 +77,9 @@ static const char *configfs_config_path (char *buff, size_t size, con
static bool configfs_mkdir (const char *path);
static bool configfs_rmdir (const char *path);
static const char *configfs_register_function (const char *function);
#ifdef DEAD_CODE
static bool configfs_unregister_function (const char *function);
#endif //DEAD_CODE
static const char *configfs_add_unit (const char *function, const char *unit);
static bool configfs_remove_unit (const char *function, const char *unit);
static bool configfs_enable_function (const char *function);
......@@ -86,6 +91,9 @@ static bool configfs_probe (void);
static const char *configfs_udc_enable_value (void);
static bool configfs_write_file (const char *path, const char *text);
static bool configfs_read_file (const char *path, char *buff, size_t size);
#ifdef DEAD_CODE
static bool configfs_read_udc (char *buff, size_t size);
#endif // DEAD_CODE
static bool configfs_write_udc (const char *text);
bool configfs_set_udc (bool enable);
bool configfs_init (void);
......
/**
* @file usb_moded-configfs.h
*
* Copyright (C) 2018 Jolla. All rights reserved.
* Copyright (C) 2018-2019 Jolla. All rights reserved.
*
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
*
......@@ -29,7 +29,9 @@
* Prototypes
* ========================================================================= */
/* -- configfs -- */
/* ------------------------------------------------------------------------- *
* CONFIGFS
* ------------------------------------------------------------------------- */
bool configfs_in_use (void);
bool configfs_set_udc (bool enable);
......
......@@ -37,7 +37,9 @@
* Prototypes
* ========================================================================= */
/* -- usbmoded -- */
/* ------------------------------------------------------------------------- *
* CONTROL
* ------------------------------------------------------------------------- */
void control_rethink_usb_charging_fallback(void);
const char *control_get_external_mode (void);
......@@ -323,7 +325,7 @@ void control_select_usb_mode(void)
log_err("Diagnostic mode is not configured!");
}
else {
mode_list_elem_t *data = iter->data;
modedata_t *data = iter->data;
log_debug("Entering diagnostic mode!");
control_set_usb_mode(data->mode_name);
}
......
......@@ -27,7 +27,13 @@
# include "usb_moded.h"
# include "usb_moded-common.h"
/* -- usbmoded -- */
/* ========================================================================= *
* Prototypes
* ========================================================================= */
/* ------------------------------------------------------------------------- *
* CONTROL
* ------------------------------------------------------------------------- */
void control_rethink_usb_charging_fallback(void);
const char *control_get_external_mode (void);
......@@ -37,7 +43,7 @@ void control_clear_target_mode (void);
const char *control_get_usb_mode (void);
void control_clear_internal_mode (void);
void control_set_usb_mode (const char *mode);
void control_mode_switched (const char *override);
void control_mode_switched (const char *mode);
void control_select_usb_mode (void);
void control_set_cable_state (cable_state_t cable_state);
cable_state_t control_get_cable_state (void);
......
......@@ -53,8 +53,11 @@ typedef void (*usb_moded_get_name_owner_fn)(const char *owner);
* Prototypes
* ========================================================================= */
/* -- umdbus -- */
/* ------------------------------------------------------------------------- *
* UMDBUS
* ------------------------------------------------------------------------- */
void umdbus_send_config_signal (const char *section, const char *key, const char *value);
DBusConnection *umdbus_get_connection (void);
gboolean umdbus_init_connection (void);
gboolean umdbus_init_service (void);
......
......@@ -55,9 +55,11 @@
* Prototypes
* ========================================================================= */
/* -- umdbus -- */
/* ------------------------------------------------------------------------- *
* UMDBUS
* ------------------------------------------------------------------------- */
static void umdbus_send_config_signal (const char *section, const char *key, const char *value);
void umdbus_send_config_signal (const char *section, const char *key, const char *value);
static DBusHandlerResult umdbus_msg_handler (DBusConnection *const connection, DBusMessage *const msg, gpointer const user_data);
DBusConnection *umdbus_get_connection (void);
gboolean umdbus_init_connection (void);
......@@ -68,9 +70,9 @@ static DBusMessage *umdbus_new_signal (const char *signa
static int umdbus_send_signal_ex (const char *signal_name, const char *content);
static void umdbus_send_legacy_signal (const char *state_ind);
void umdbus_send_current_state_signal (const char *state_ind);
static bool umsdbus_append_basic_entry (DBusMessageIter *iter, const char *key, int type, const void *val);
static bool umsdbus_append_int32_entry (DBusMessageIter *iter, const char *key, int val);
static bool umsdbus_append_string_entry (DBusMessageIter *iter, const char *key, const char *val);
static bool umdbus_append_basic_entry (DBusMessageIter *iter, const char *key, int type, const void *val);
static bool umdbus_append_int32_entry (DBusMessageIter *iter, const char *key, int val);
static bool umdbus_append_string_entry (DBusMessageIter *iter, const char *key, const char *val);
static bool umdbus_append_mode_details (DBusMessage *msg, const char *mode_name);
static void umdbus_send_mode_details_signal (const char *mode_name);
void umdbus_send_target_state_signal (const char *state_ind);
......@@ -231,7 +233,7 @@ static const char umdbus_introspect_usbmoded[] =
/**
* Issues "sig_usb_config_ind" signal.
*/
static void umdbus_send_config_signal(const char *section, const char *key, const char *value)
void umdbus_send_config_signal(const char *section, const char *key, const char *value)
{
LOG_REGISTER_CONTEXT;
......@@ -382,8 +384,6 @@ static DBusHandlerResult umdbus_msg_handler(DBusConnection *const connection, DB
{
/* error checking is done when setting configuration */
int ret = config_set_mode_setting(config);
if (ret == SET_CONFIG_UPDATED)
umdbus_send_config_signal(MODE_SETTING_ENTRY, MODE_SETTING_KEY, config);
if (SET_CONFIG_OK(ret))
{
if((reply = dbus_message_new_method_return(msg)))
......@@ -405,8 +405,6 @@ static DBusHandlerResult umdbus_msg_handler(DBusConnection *const connection, DB
{
/* error checking is done when setting configuration */
int ret = config_set_hide_mode_setting(config);
if (ret == SET_CONFIG_UPDATED)
umdbus_send_config_signal(MODE_SETTING_ENTRY, MODE_HIDE_KEY, config);
if (SET_CONFIG_OK(ret))
{
if((reply = dbus_message_new_method_return(msg)))
......@@ -428,8 +426,6 @@ static DBusHandlerResult umdbus_msg_handler(DBusConnection *const connection, DB
{
/* error checking is done when setting configuration */
int ret = config_set_unhide_mode_setting(config);
if (ret == SET_CONFIG_UPDATED)
umdbus_send_config_signal(MODE_SETTING_ENTRY, MODE_HIDE_KEY, config);
if (SET_CONFIG_OK(ret))
{
if((reply = dbus_message_new_method_return(msg)))
......@@ -460,8 +456,6 @@ static DBusHandlerResult umdbus_msg_handler(DBusConnection *const connection, DB
{
/* error checking is done when setting configuration */
int ret = config_set_network_setting(config, setting);
if (ret == SET_CONFIG_UPDATED)
umdbus_send_config_signal(NETWORK_ENTRY, config, setting);
if (SET_CONFIG_OK(ret))
{
if((reply = dbus_message_new_method_return(msg)))
......@@ -547,8 +541,6 @@ static DBusHandlerResult umdbus_msg_handler(DBusConnection *const connection, DB
else
{
int ret = config_set_mode_whitelist(whitelist);
if (ret == SET_CONFIG_UPDATED)
umdbus_send_config_signal(MODE_SETTING_ENTRY, MODE_WHITELIST_KEY, whitelist);
if (SET_CONFIG_OK(ret))
{
if ((reply = dbus_message_new_method_return(msg)))
......@@ -570,14 +562,6 @@ static DBusHandlerResult umdbus_msg_handler(DBusConnection *const connection, DB
else
{
int ret = config_set_mode_in_whitelist(mode, enabled);
if (ret == SET_CONFIG_UPDATED)
{
char *whitelist = config_get_mode_whitelist();
if (!whitelist)
whitelist = g_strdup(MODE_UNDEFINED);
umdbus_send_config_signal(MODE_SETTING_ENTRY, MODE_WHITELIST_KEY, whitelist);
g_free(whitelist);
}
if (SET_CONFIG_OK(ret))
reply = dbus_message_new_method_return(msg);
else
......@@ -933,7 +917,7 @@ void umdbus_send_current_state_signal(const char *state_ind)
* @return true on success, false on failure
*/
static bool
umsdbus_append_basic_entry(DBusMessageIter *iter, const char *key,
umdbus_append_basic_entry(DBusMessageIter *iter, const char *key,
int type, const void *val)
{
LOG_REGISTER_CONTEXT;
......@@ -993,12 +977,12 @@ bailout_message:
* @return true on success, false on failure
*/
static bool
umsdbus_append_int32_entry(DBusMessageIter *iter, const char *key, int val)
umdbus_append_int32_entry(DBusMessageIter *iter, const char *key, int val)
{
LOG_REGISTER_CONTEXT;
dbus_int32_t arg = val;
return umsdbus_append_basic_entry(iter, key, DBUS_TYPE_INT32, &arg);
return umdbus_append_basic_entry(iter, key, DBUS_TYPE_INT32, &arg);
}