From: Enlightenment S. <no-...@en...> - 2010-04-30 15:10:36
|
Log: Use proper error handling functions Author: lucas Date: 2010-04-30 08:10:25 -0700 (Fri, 30 Apr 2010) New Revision: 48479 Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_element.c 2010-04-30 14:54:05 UTC (rev 48478) +++ trunk/e_dbus/src/lib/connman/e_connman_element.c 2010-04-30 15:10:25 UTC (rev 48479) @@ -131,18 +131,9 @@ e_connman_element_listener_add(E_Connman_Element *element, void (*cb)(void *data, const E_Connman_Element *element), const void *data, void (*free_data)(void *data)) { E_Connman_Element_Listener *l; + EINA_SAFETY_ON_FALSE_GOTO(element, error); + EINA_SAFETY_ON_FALSE_GOTO(cb, error); - if (!element) - { - ERR("safety check failed: element == NULL"); - goto error; - } - if (!cb) - { - ERR("safety check failed: cb == NULL"); - goto error; - } - l = malloc(sizeof(*l)); if (!l) { |
From: Enlightenment S. <no-...@en...> - 2010-09-15 20:51:35
|
Log: Clear connman header file Remove lots of blank lines by grouping similar functions. Author: lucas Date: 2010-09-15 13:51:27 -0700 (Wed, 15 Sep 2010) New Revision: 52327 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:40:51 UTC (rev 52326) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:51:27 UTC (rev 52327) @@ -138,75 +138,57 @@ /* Services Methods */ EAPI E_Connman_Element *e_connman_service_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_connect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_disconnect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; + EAPI bool e_connman_service_clear_property(E_Connman_Element *service, const char *property, E_DBus_Method_Return_Cb cb, const void *data); EAPI bool e_connman_service_remove(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_clear_property(E_Connman_Element *service, const char *property, E_DBus_Method_Return_Cb cb, const void *data); + EAPI bool e_connman_service_connect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; + EAPI bool e_connman_service_disconnect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_move_before(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_move_after(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_state_get(const E_Connman_Element *service, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_error_get(const E_Connman_Element *service, const char **error) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_name_get(const E_Connman_Element *service, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_type_get(const E_Connman_Element *service, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_mode_get(const E_Connman_Element *service, const char **mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_security_get(const E_Connman_Element *service, const char **security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_passphrase_get(const E_Connman_Element *service, const char **passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_passphrase_set(E_Connman_Element *service, const char *passphrase, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_passphrase_required_get(const E_Connman_Element *service, bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_strength_get(const E_Connman_Element *service, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_favorite_get(const E_Connman_Element *service, bool *favorite) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_immutable_get(const E_Connman_Element *service, bool *immutable) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_auto_connect_get(const E_Connman_Element *service, bool *auto_connect) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_auto_connect_set(E_Connman_Element *service, bool auto_connect, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_setup_required_get(const E_Connman_Element *service, bool *setup_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; + EAPI bool e_connman_service_passphrase_required_get(const E_Connman_Element *service, bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_apn_get(const E_Connman_Element *service, const char **apn) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_apn_set(E_Connman_Element *service, const char *apn, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_mcc_get(const E_Connman_Element *service, const char **mcc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_mnc_get(const E_Connman_Element *service, const char **mnc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_roaming_get(const E_Connman_Element *service, bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_ipv4_configuration_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_mtu_get(const E_Connman_Element *service, unsigned short *mtu) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; /* Methods to configure IPv4 service */ @@ -243,16 +225,14 @@ EAPI void e_connman_element_print(FILE *fp, const E_Connman_Element *element) EINA_ARG_NONNULL(1, 2); - EAPI bool e_connman_element_properties_sync(E_Connman_Element *element) EINA_ARG_NONNULL(1); EAPI bool e_connman_element_properties_sync_full(E_Connman_Element *element, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1); + EAPI void e_connman_element_properties_list(const E_Connman_Element *element, bool (*cb)(void *data, const E_Connman_Element *element, const char *name, int type, const void *value), const void *data) EINA_ARG_NONNULL(1, 2); EAPI bool e_connman_element_property_set(E_Connman_Element *element, const char *prop, int type, const void *value) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_set_full(E_Connman_Element *element, const char *prop, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_dict_set_full(E_Connman_Element *element, const char *prop, const char *key, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI void e_connman_element_properties_list(const E_Connman_Element *element, bool (*cb)(void *data, const E_Connman_Element *element, const char *name, int type, const void *value), const void *data) EINA_ARG_NONNULL(1, 2); - EAPI bool e_connman_element_property_type_get_stringshared(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_type_get(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_dict_get_stringshared(const E_Connman_Element *element, const char *dict_name, const char *key_name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; @@ -276,11 +256,8 @@ EAPI bool e_connman_device_propose_scan(E_Connman_Element *device, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_device_address_get(const E_Connman_Element *device, const char **address); - EAPI bool e_connman_device_name_get(const E_Connman_Element *device, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_type_get(const E_Connman_Element *device, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_interface_get(const E_Connman_Element *device, const char **interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_device_powered_get(const E_Connman_Element *device, bool *powered) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; @@ -302,30 +279,19 @@ EAPI E_Connman_Element *e_connman_network_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_network_address_get(const E_Connman_Element *network, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_name_get(const E_Connman_Element *network, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_connected_get(const E_Connman_Element *network, bool *connected) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_strength_get(const E_Connman_Element *network, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_frequency_get(const E_Connman_Element *network, unsigned short *frequency) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_device_get(const E_Connman_Element *network, E_Connman_Element **element) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_network_wifi_ssid_get(const E_Connman_Element *network, unsigned int *count, unsigned char **wifi_ssid) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_mode_get(const E_Connman_Element *network, const char **wifi_mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_security_get(const E_Connman_Element *network, const char **wifi_security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_passphrase_get(const E_Connman_Element *network, const char **wifi_passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_channel_get(const E_Connman_Element *network, unsigned short *wifi_channel) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_eap_get(const E_Connman_Element *network, const char **wifi_eap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - #ifdef __cplusplus } #endif |
From: Enlightenment S. <no-...@en...> - 2010-09-16 01:05:15
|
Log: e_dbus: uncrustify connman module The following exceptions apply to current uncrustify config: mod_add_long_function_closebrace_comment=0 mod_add_long_switch_closebrace_comment=0 mod_add_long_ifdef_endif_comment=0 mod_add_long_ifdef_else_comment=0 mod_full_brace_if_chain=true Author: lucas Date: 2010-09-15 18:05:02 -0700 (Wed, 15 Sep 2010) New Revision: 52331 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_device.c trunk/e_dbus/src/lib/connman/e_connman_element.c trunk/e_dbus/src/lib/connman/e_connman_manager.c trunk/e_dbus/src/lib/connman/e_connman_network.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_profile.c trunk/e_dbus/src/lib/connman/e_connman_service.c trunk/e_dbus/src/lib/connman/e_connman_technology.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-16 00:04:34 UTC (rev 52330) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-16 01:05:02 UTC (rev 52331) @@ -19,257 +19,254 @@ extern "C" { #endif - /* Ecore Events */ - extern int E_CONNMAN_EVENT_MANAGER_IN; - extern int E_CONNMAN_EVENT_MANAGER_OUT; - extern int E_CONNMAN_EVENT_ELEMENT_ADD; - extern int E_CONNMAN_EVENT_ELEMENT_DEL; - extern int E_CONNMAN_EVENT_ELEMENT_UPDATED; +/* Ecore Events */ +extern int E_CONNMAN_EVENT_MANAGER_IN; +extern int E_CONNMAN_EVENT_MANAGER_OUT; +extern int E_CONNMAN_EVENT_ELEMENT_ADD; +extern int E_CONNMAN_EVENT_ELEMENT_DEL; +extern int E_CONNMAN_EVENT_ELEMENT_UPDATED; - typedef struct _E_Connman_Element E_Connman_Element; +typedef struct _E_Connman_Element E_Connman_Element; - struct _E_Connman_Element - { - const char *path; - const char *interface; - E_DBus_Signal_Handler *signal_handler; - Eina_Inlist *props; +struct _E_Connman_Element +{ + const char *path; + const char *interface; + E_DBus_Signal_Handler *signal_handler; + Eina_Inlist *props; - /* private */ - struct { - Eina_Inlist *properties_get; - Eina_Inlist *property_set; - Eina_Inlist *agent_register; - Eina_Inlist *agent_unregister; - Eina_Inlist *request_scan; - Eina_Inlist *technology_enable; - Eina_Inlist *technology_disable; - Eina_Inlist *profile_remove; - Eina_Inlist *device_propose_scan; - Eina_Inlist *service_connect; - Eina_Inlist *service_disconnect; - Eina_Inlist *service_remove; - Eina_Inlist *service_move_before; - Eina_Inlist *service_move_after; - Eina_Inlist *service_clear_property; - } _pending; - struct { - Ecore_Idler *changed; - } _idler; - Eina_Inlist *_listeners; - int _references; - }; + /* private */ + struct + { + Eina_Inlist *properties_get; + Eina_Inlist *property_set; + Eina_Inlist *agent_register; + Eina_Inlist *agent_unregister; + Eina_Inlist *request_scan; + Eina_Inlist *technology_enable; + Eina_Inlist *technology_disable; + Eina_Inlist *profile_remove; + Eina_Inlist *device_propose_scan; + Eina_Inlist *service_connect; + Eina_Inlist *service_disconnect; + Eina_Inlist *service_remove; + Eina_Inlist *service_move_before; + Eina_Inlist *service_move_after; + Eina_Inlist *service_clear_property; + } _pending; + struct + { + Ecore_Idler *changed; + } _idler; + Eina_Inlist *_listeners; + int _references; +}; - /* General Public API */ - EAPI unsigned int e_connman_system_init(E_DBus_Connection *edbus_conn) EINA_ARG_NONNULL(1); - EAPI unsigned int e_connman_system_shutdown(void); +/* General Public API */ +EAPI unsigned int e_connman_system_init(E_DBus_Connection *edbus_conn) EINA_ARG_NONNULL(1); +EAPI unsigned int e_connman_system_shutdown(void); - /* Manager Methods */ - EAPI E_Connman_Element *e_connman_manager_get(void) EINA_WARN_UNUSED_RESULT; +/* Manager Methods */ +EAPI E_Connman_Element * e_connman_manager_get(void) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_agent_register(const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_agent_unregister(const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_agent_register(const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_agent_unregister(const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_state_get(const char **state) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_state_get(const char **state) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_offline_mode_get(bool *offline) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_offline_mode_set(bool offline, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_offline_mode_get(bool *offline) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_offline_mode_set(bool offline, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_profiles_get(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_services_get(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_technologies_get(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_profiles_get(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_services_get(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_technologies_get(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_request_scan(const char *type, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_request_scan(const char *type, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_technology_default_get(const char **type) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_technology_default_get(const char **type) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_technology_enable(const char *type, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_technology_disable(const char *type, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_technology_enable(const char *type, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_technology_disable(const char *type, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_technologies_available_get(unsigned int *count, const char ***strings) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_technologies_enabled_get(unsigned int *count, const char ***strings) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_technologies_connected_get(unsigned int *count, const char ***strings) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_technologies_available_get(unsigned int *count, const char ***strings) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_technologies_enabled_get(unsigned int *count, const char ***strings) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_technologies_connected_get(unsigned int *count, const char ***strings) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_profile_remove(const E_Connman_Element *profile, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_profile_remove(const E_Connman_Element *profile, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_profile_active_get(E_Connman_Element **profile) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_manager_profile_active_set(const E_Connman_Element *profile, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_profile_active_get(E_Connman_Element **profile) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_manager_profile_active_set(const E_Connman_Element *profile, E_DBus_Method_Return_Cb cb, const void *data) EINA_WARN_UNUSED_RESULT; +// TODO: profile_create() +// TODO: service_connect() (actually creates and connect) +// TODO: signal E_CONNMAN_EVENT_MANAGER_STATE_CHANGED - // TODO: profile_create() - // TODO: service_connect() (actually creates and connect) - // TODO: signal E_CONNMAN_EVENT_MANAGER_STATE_CHANGED +/* Profile Methods */ +EAPI E_Connman_Element * e_connman_profile_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_profile_name_get(const E_Connman_Element *profile, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_profile_name_set(E_Connman_Element *profile, const char *name, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - /* Profile Methods */ - EAPI E_Connman_Element *e_connman_profile_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_profile_offline_mode_get(const E_Connman_Element *profile, bool *offline) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_profile_offline_mode_set(E_Connman_Element *profile, bool offline, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_profile_name_get(const E_Connman_Element *profile, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_profile_name_set(E_Connman_Element *profile, const char *name, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_profile_services_get(const E_Connman_Element *profile, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_profile_offline_mode_get(const E_Connman_Element *profile, bool *offline) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_profile_offline_mode_set(E_Connman_Element *profile, bool offline, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +/* Services Methods */ +EAPI E_Connman_Element * e_connman_service_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_profile_services_get(const E_Connman_Element *profile, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_clear_property(E_Connman_Element *service, const char *property, E_DBus_Method_Return_Cb cb, const void *data); +EAPI bool e_connman_service_remove(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - /* Services Methods */ - EAPI E_Connman_Element *e_connman_service_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_connect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_disconnect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_clear_property(E_Connman_Element *service, const char *property, E_DBus_Method_Return_Cb cb, const void *data); +EAPI bool e_connman_service_move_before(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_move_after(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_remove(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_state_get(const E_Connman_Element *service, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_error_get(const E_Connman_Element *service, const char **error) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_name_get(const E_Connman_Element *service, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_type_get(const E_Connman_Element *service, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_mode_get(const E_Connman_Element *service, const char **mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_security_get(const E_Connman_Element *service, const char **security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_connect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_disconnect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_passphrase_get(const E_Connman_Element *service, const char **passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_passphrase_set(E_Connman_Element *service, const char *passphrase, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_move_before(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_move_after(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_strength_get(const E_Connman_Element *service, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_state_get(const E_Connman_Element *service, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_error_get(const E_Connman_Element *service, const char **error) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_name_get(const E_Connman_Element *service, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_type_get(const E_Connman_Element *service, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_mode_get(const E_Connman_Element *service, const char **mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_security_get(const E_Connman_Element *service, const char **security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_favorite_get(const E_Connman_Element *service, bool *favorite) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_immutable_get(const E_Connman_Element *service, bool *immutable) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_passphrase_get(const E_Connman_Element *service, const char **passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_passphrase_set(E_Connman_Element *service, const char *passphrase, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_auto_connect_get(const E_Connman_Element *service, bool *auto_connect) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_auto_connect_set(E_Connman_Element *service, bool auto_connect, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_strength_get(const E_Connman_Element *service, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_setup_required_get(const E_Connman_Element *service, bool *setup_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_passphrase_required_get(const E_Connman_Element *service, bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_favorite_get(const E_Connman_Element *service, bool *favorite) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_immutable_get(const E_Connman_Element *service, bool *immutable) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_apn_get(const E_Connman_Element *service, const char **apn) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_apn_set(E_Connman_Element *service, const char *apn, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_auto_connect_get(const E_Connman_Element *service, bool *auto_connect) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_auto_connect_set(E_Connman_Element *service, bool auto_connect, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_mcc_get(const E_Connman_Element *service, const char **mcc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_mnc_get(const E_Connman_Element *service, const char **mnc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_roaming_get(const E_Connman_Element *service, bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_setup_required_get(const E_Connman_Element *service, bool *setup_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_passphrase_required_get(const E_Connman_Element *service, bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_apn_get(const E_Connman_Element *service, const char **apn) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_apn_set(E_Connman_Element *service, const char *apn, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_configuration_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_configuration_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_configuration_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_configuration_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_mcc_get(const E_Connman_Element *service, const char **mcc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_mnc_get(const E_Connman_Element *service, const char **mnc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_roaming_get(const E_Connman_Element *service, bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ethernet_mtu_get(const E_Connman_Element *service, unsigned short *mtu) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ethernet_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +/* Methods to configure IPv4 service */ +EAPI bool e_connman_service_ipv4_configure_dhcp(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_service_ipv4_configure_manual(E_Connman_Element *service, const char *address, const char *netmask, const char *gateway, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +/* Technologies methods */ +EAPI E_Connman_Element * e_connman_technology_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_mtu_get(const E_Connman_Element *service, unsigned short *mtu) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_technology_state_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_technology_name_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_technology_type_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_technology_devices_get(const E_Connman_Element *technology, unsigned int *count, E_Connman_Element ***t_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - /* Methods to configure IPv4 service */ - EAPI bool e_connman_service_ipv4_configure_dhcp(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configure_manual(E_Connman_Element *service, const char *address, const char *netmask, const char *gateway, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +// TODO: ethernet_speed_get (not in connman yet) +// TODO: ethernet_duplex_get (not in connman yet) - /* Technologies methods */ - EAPI E_Connman_Element *e_connman_technology_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +/* Low-Level API: + * + * Should just be used to work around problems until proper solution + * is made into e_connman. + */ +EAPI bool e_connman_manager_sync_elements(void); - EAPI bool e_connman_technology_state_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_technology_name_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_technology_type_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_technology_devices_get(const E_Connman_Element *technology, unsigned int *count, E_Connman_Element ***t_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_elements_get_all(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_elements_get_all_type(const char *type, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI E_Connman_Element * e_connman_element_get(const char *path); - // TODO: ethernet_speed_get (not in connman yet) - // TODO: ethernet_duplex_get (not in connman yet) +EAPI void e_connman_element_listener_add(E_Connman_Element *element, void (*cb)(void *data, const E_Connman_Element *element), const void *data, void (*free_data)(void *data)) EINA_ARG_NONNULL(1, 2); +EAPI void e_connman_element_listener_del(E_Connman_Element *element, void (*cb)(void *data, const E_Connman_Element *element), const void *data) EINA_ARG_NONNULL(1, 2); - /* Low-Level API: - * - * Should just be used to work around problems until proper solution - * is made into e_connman. - */ - EAPI bool e_connman_manager_sync_elements(void); +EAPI int e_connman_element_ref(E_Connman_Element *element) EINA_ARG_NONNULL(1); +EAPI int e_connman_element_unref(E_Connman_Element *element) EINA_ARG_NONNULL(1); - EAPI bool e_connman_elements_get_all(unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_elements_get_all_type(const char *type, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI E_Connman_Element *e_connman_element_get(const char *path); +EAPI void e_connman_element_print(FILE *fp, const E_Connman_Element *element) EINA_ARG_NONNULL(1, 2); - EAPI void e_connman_element_listener_add(E_Connman_Element *element, void (*cb)(void *data, const E_Connman_Element *element), const void *data, void (*free_data)(void *data)) EINA_ARG_NONNULL(1, 2); - EAPI void e_connman_element_listener_del(E_Connman_Element *element, void (*cb)(void *data, const E_Connman_Element *element), const void *data) EINA_ARG_NONNULL(1, 2); +EAPI bool e_connman_element_properties_sync(E_Connman_Element *element) EINA_ARG_NONNULL(1); +EAPI bool e_connman_element_properties_sync_full(E_Connman_Element *element, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1); +EAPI void e_connman_element_properties_list(const E_Connman_Element *element, bool (*cb)(void *data, const E_Connman_Element *element, const char *name, int type, const void *value), const void *data) EINA_ARG_NONNULL(1, 2); - EAPI int e_connman_element_ref(E_Connman_Element *element) EINA_ARG_NONNULL(1); - EAPI int e_connman_element_unref(E_Connman_Element *element) EINA_ARG_NONNULL(1); +EAPI bool e_connman_element_property_set(E_Connman_Element *element, const char *prop, int type, const void *value) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_property_set_full(E_Connman_Element *element, const char *prop, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_property_dict_set_full(E_Connman_Element *element, const char *prop, const char *key, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI void e_connman_element_print(FILE *fp, const E_Connman_Element *element) EINA_ARG_NONNULL(1, 2); +EAPI bool e_connman_element_property_type_get_stringshared(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_property_type_get(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_property_dict_get_stringshared(const E_Connman_Element *element, const char *dict_name, const char *key_name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_property_get_stringshared(const E_Connman_Element *element, const char *name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_property_get(const E_Connman_Element *element, const char *name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_properties_sync(E_Connman_Element *element) EINA_ARG_NONNULL(1); - EAPI bool e_connman_element_properties_sync_full(E_Connman_Element *element, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1); - EAPI void e_connman_element_properties_list(const E_Connman_Element *element, bool (*cb)(void *data, const E_Connman_Element *element, const char *name, int type, const void *value), const void *data) EINA_ARG_NONNULL(1, 2); +EAPI bool e_connman_element_is_manager(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_is_device(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_is_profile(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_is_network(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_is_service(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_element_is_technology(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_set(E_Connman_Element *element, const char *prop, int type, const void *value) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_set_full(E_Connman_Element *element, const char *prop, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_dict_set_full(E_Connman_Element *element, const char *prop, const char *key, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +/* Device Methods: Low-Level API + * + * Fine tune device, such as turn off and change scan interval. + */ +EAPI E_Connman_Element * e_connman_device_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_type_get_stringshared(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_type_get(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_dict_get_stringshared(const E_Connman_Element *element, const char *dict_name, const char *key_name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_get_stringshared(const E_Connman_Element *element, const char *name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_property_get(const E_Connman_Element *element, const char *name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_propose_scan(E_Connman_Element *device, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_is_manager(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_is_device(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_is_profile(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_is_network(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_is_service(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_element_is_technology(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_address_get(const E_Connman_Element *device, const char **address); +EAPI bool e_connman_device_name_get(const E_Connman_Element *device, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_type_get(const E_Connman_Element *device, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_interface_get(const E_Connman_Element *device, const char **interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_powered_get(const E_Connman_Element *device, bool *powered) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_powered_set(E_Connman_Element *device, bool powered, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - /* Device Methods: Low-Level API - * - * Fine tune device, such as turn off and change scan interval. - */ - EAPI E_Connman_Element *e_connman_device_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_scan_interval_get(const E_Connman_Element *device, unsigned short *scan_interval) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_scan_interval_set(E_Connman_Element *device, unsigned short scan_interval, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_propose_scan(E_Connman_Element *device, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_scanning_get(const E_Connman_Element *device, bool *scanning) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_address_get(const E_Connman_Element *device, const char **address); - EAPI bool e_connman_device_name_get(const E_Connman_Element *device, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_type_get(const E_Connman_Element *device, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_interface_get(const E_Connman_Element *device, const char **interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_device_networks_get(const E_Connman_Element *device, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_powered_get(const E_Connman_Element *device, bool *powered) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_powered_set(E_Connman_Element *device, bool powered, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +/* Network Methods: Low-Level API + * + * The network API is informational only, to set these parameters, + * use the services API instead. + */ +EAPI E_Connman_Element * e_connman_network_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_scan_interval_get(const E_Connman_Element *device, unsigned short *scan_interval) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_scan_interval_set(E_Connman_Element *device, unsigned short scan_interval, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_address_get(const E_Connman_Element *network, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_name_get(const E_Connman_Element *network, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_connected_get(const E_Connman_Element *network, bool *connected) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_strength_get(const E_Connman_Element *network, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_frequency_get(const E_Connman_Element *network, unsigned short *frequency) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_device_get(const E_Connman_Element *network, E_Connman_Element **element) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_scanning_get(const E_Connman_Element *device, bool *scanning) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_wifi_ssid_get(const E_Connman_Element *network, unsigned int *count, unsigned char **wifi_ssid) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_wifi_mode_get(const E_Connman_Element *network, const char **wifi_mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_wifi_security_get(const E_Connman_Element *network, const char **wifi_security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_wifi_passphrase_get(const E_Connman_Element *network, const char **wifi_passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_wifi_channel_get(const E_Connman_Element *network, unsigned short *wifi_channel) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI bool e_connman_network_wifi_eap_get(const E_Connman_Element *network, const char **wifi_eap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_networks_get(const E_Connman_Element *device, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - - - /* Network Methods: Low-Level API - * - * The network API is informational only, to set these parameters, - * use the services API instead. - */ - EAPI E_Connman_Element *e_connman_network_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - - EAPI bool e_connman_network_address_get(const E_Connman_Element *network, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_name_get(const E_Connman_Element *network, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_connected_get(const E_Connman_Element *network, bool *connected) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_strength_get(const E_Connman_Element *network, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_frequency_get(const E_Connman_Element *network, unsigned short *frequency) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_device_get(const E_Connman_Element *network, E_Connman_Element **element) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - - EAPI bool e_connman_network_wifi_ssid_get(const E_Connman_Element *network, unsigned int *count, unsigned char **wifi_ssid) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_mode_get(const E_Connman_Element *network, const char **wifi_mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_security_get(const E_Connman_Element *network, const char **wifi_security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_passphrase_get(const E_Connman_Element *network, const char **wifi_passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_channel_get(const E_Connman_Element *network, unsigned short *wifi_channel) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_eap_get(const E_Connman_Element *network, const char **wifi_eap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - #ifdef __cplusplus } #endif Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2010-09-16 00:04:34 UTC (rev 52330) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2010-09-16 01:05:02 UTC (rev 52331) @@ -79,10 +79,9 @@ const char *e_connman_prop_roaming = NULL; const char *e_connman_prop_technology_default = NULL; const char *e_connman_prop_technologies_available = NULL; -const char *e_connman_prop_technologies_enabled= NULL; +const char *e_connman_prop_technologies_enabled = NULL; const char *e_connman_prop_technologies_connected = NULL; - int _e_dbus_connman_log_dom = -1; const char * @@ -91,10 +90,9 @@ return unique_name ? unique_name : bus_name; } - /*********************************************************************** - * Manager - ***********************************************************************/ +* Manager +***********************************************************************/ /** * Synchronize elements with server. @@ -115,12 +113,13 @@ E_Connman_Element *manager; if (!unique_name) - return EINA_FALSE; + return EINA_FALSE; + manager = e_connman_element_register(manager_path, e_connman_iface_manager); if (manager) - e_connman_element_properties_sync(manager); + e_connman_element_properties_sync(manager); else - return EINA_FALSE; + return EINA_FALSE; DBG("sync_manager: %s (%s)", unique_name, bus_name); @@ -143,12 +142,12 @@ DBG("enter connman at %s (old was %s)", uid, unique_name); if (unique_name && strcmp(unique_name, uid) == 0) { - DBG("same unique_name for connman, ignore."); - return; + DBG("same unique_name for connman, ignore."); + return; } if (unique_name) - _e_connman_system_name_owner_exit(); + _e_connman_system_name_owner_exit(); unique_name = strdup(uid); @@ -164,34 +163,38 @@ dbus_error_init(&err); if (!dbus_message_get_args(msg, &err, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_STRING, &from, - DBUS_TYPE_STRING, &to, - DBUS_TYPE_INVALID)) + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &from, + DBUS_TYPE_STRING, &to, + DBUS_TYPE_INVALID)) { - ERR("could not get NameOwnerChanged arguments: %s: %s", - err.name, err.message); - dbus_error_free(&err); - return; + ERR("could not get NameOwnerChanged arguments: %s: %s", + err.name, err.message); + dbus_error_free(&err); + return; } if (strcmp(name, bus_name) != 0) - return; + return; DBG("NameOwnerChanged from=[%s] to=[%s]", from, to); if (from[0] == '\0' && to[0] != '\0') - _e_connman_system_name_owner_enter(to); + { + _e_connman_system_name_owner_enter(to); + } else if (from[0] != '\0' && to[0] == '\0') { - DBG("exit connman at %s", from); - if (strcmp(unique_name, from) != 0) - DBG("%s was not the known name %s, ignored.", from, unique_name); - else - _e_connman_system_name_owner_exit(); + DBG("exit connman at %s", from); + if (strcmp(unique_name, from) != 0) + DBG("%s was not the known name %s, ignored.", from, unique_name); + else + _e_connman_system_name_owner_exit(); } else - DBG("unknow change from %s to %s", from, to); + { + DBG("unknow change from %s to %s", from, to); + } } static void @@ -204,17 +207,17 @@ pending_get_name_owner = NULL; if (!_dbus_callback_check_and_init(msg, &itr, err)) - return; + return; t = dbus_message_iter_get_arg_type(&itr); if (!_dbus_iter_type_check(t, DBUS_TYPE_STRING)) - return; + return; dbus_message_iter_get_basic(&itr, &uid); if (!uid) { - ERR("no name owner!"); - return; + ERR("no name owner!"); + return; } _e_connman_system_name_owner_enter(uid); @@ -249,167 +252,232 @@ init_count++; if (init_count > 1) - return init_count; + return init_count; _e_dbus_connman_log_dom = eina_log_domain_register - ("e_dbus_connman", EINA_LOG_DEFAULT_COLOR); + ("e_dbus_connman", EINA_LOG_DEFAULT_COLOR); if(_e_dbus_connman_log_dom < 0) { - EINA_LOG_ERR - ("impossible to create a log domain for edbus_connman module"); - return -1; + EINA_LOG_ERR + ("impossible to create a log domain for edbus_connman module"); + return -1; } if (E_CONNMAN_EVENT_MANAGER_IN == 0) - E_CONNMAN_EVENT_MANAGER_IN = ecore_event_type_new(); + E_CONNMAN_EVENT_MANAGER_IN = ecore_event_type_new(); + if (E_CONNMAN_EVENT_MANAGER_OUT == 0) - E_CONNMAN_EVENT_MANAGER_OUT = ecore_event_type_new(); + E_CONNMAN_EVENT_MANAGER_OUT = ecore_event_type_new(); + if (E_CONNMAN_EVENT_ELEMENT_ADD == 0) - E_CONNMAN_EVENT_ELEMENT_ADD = ecore_event_type_new(); + E_CONNMAN_EVENT_ELEMENT_ADD = ecore_event_type_new(); + if (E_CONNMAN_EVENT_ELEMENT_DEL == 0) - E_CONNMAN_EVENT_ELEMENT_DEL = ecore_event_type_new(); + E_CONNMAN_EVENT_ELEMENT_DEL = ecore_event_type_new(); + if (E_CONNMAN_EVENT_ELEMENT_UPDATED == 0) - E_CONNMAN_EVENT_ELEMENT_UPDATED = ecore_event_type_new(); + E_CONNMAN_EVENT_ELEMENT_UPDATED = ecore_event_type_new(); if (!e_connman_iface_manager) - e_connman_iface_manager = eina_stringshare_add("org.moblin.connman.Manager"); + e_connman_iface_manager = eina_stringshare_add("org.moblin.connman.Manager"); + if (!e_connman_iface_network) - e_connman_iface_network = eina_stringshare_add("org.moblin.connman.Network"); + e_connman_iface_network = eina_stringshare_add("org.moblin.connman.Network"); + if (!e_connman_iface_profile) - e_connman_iface_profile = eina_stringshare_add("org.moblin.connman.Profile"); + e_connman_iface_profile = eina_stringshare_add("org.moblin.connman.Profile"); + if (!e_connman_iface_service) - e_connman_iface_service = eina_stringshare_add("org.moblin.connman.Service"); + e_connman_iface_service = eina_stringshare_add("org.moblin.connman.Service"); + if (!e_connman_iface_device) - e_connman_iface_device = eina_stringshare_add("org.moblin.connman.Device"); + e_connman_iface_device = eina_stringshare_add("org.moblin.connman.Device"); + if (!e_connman_iface_connection) - e_connman_iface_connection = eina_stringshare_add("org.moblin.connman.Connection"); + e_connman_iface_connection = eina_stringshare_add("org.moblin.connman.Connection"); + if (!e_connman_iface_technology) - e_connman_iface_technology = eina_stringshare_add("org.moblin.connman.Technology"); + e_connman_iface_technology = eina_stringshare_add("org.moblin.connman.Technology"); if (!e_connman_prop_available) - e_connman_prop_available = eina_stringshare_add("Available"); + e_connman_prop_available = eina_stringshare_add("Available"); + if (!e_connman_prop_connected) - e_connman_prop_connected = eina_stringshare_add("Connected"); + e_connman_prop_connected = eina_stringshare_add("Connected"); + if (!e_connman_prop_connections) - e_connman_prop_connections = eina_stringshare_add("Connections"); + e_connman_prop_connections = eina_stringshare_add("Connections"); + if (!e_connman_prop_default) - e_connman_prop_default = eina_stringshare_add("Default"); + e_connman_prop_default = eina_stringshare_add("Default"); + if (!e_connman_prop_device) - e_connman_prop_device = eina_stringshare_add("Device"); + e_connman_prop_device = eina_stringshare_add("Device"); + if (!e_connman_prop_devices) - e_connman_prop_devices = eina_stringshare_add("Devices"); + e_connman_prop_devices = eina_stringshare_add("Devices"); + if (!e_connman_prop_interface) - e_connman_prop_interface = eina_stringshare_add("Interface"); + e_connman_prop_interface = eina_stringshare_add("Interface"); + if (!e_connman_prop_ipv4) - e_connman_prop_ipv4 = eina_stringshare_add("IPv4"); + e_connman_prop_ipv4 = eina_stringshare_add("IPv4"); + if (!e_connman_prop_ipv4_configuration) - e_connman_prop_ipv4_configuration = eina_stringshare_add("IPv4.Configuration"); + e_connman_prop_ipv4_configuration = eina_stringshare_add("IPv4.Configuration"); + if (!e_connman_prop_ethernet) - e_connman_prop_ethernet = eina_stringshare_add("Ethernet"); + e_connman_prop_ethernet = eina_stringshare_add("Ethernet"); + if (!e_connman_prop_method) - e_connman_prop_method = eina_stringshare_add("Method"); + e_connman_prop_method = eina_stringshare_add("Method"); + if (!e_connman_prop_address) - e_connman_prop_address = eina_stringshare_add("Address"); + e_connman_prop_address = eina_stringshare_add("Address"); + if (!e_connman_prop_gateway) - e_connman_prop_gateway = eina_stringshare_add("Gateway"); + e_connman_prop_gateway = eina_stringshare_add("Gateway"); + if (!e_connman_prop_netmask) - e_connman_prop_netmask = eina_stringshare_add("Netmask"); + e_connman_prop_netmask = eina_stringshare_add("Netmask"); + if (!e_connman_prop_mtu) - e_connman_prop_mtu = eina_stringshare_add("MTU"); + e_connman_prop_mtu = eina_stringshare_add("MTU"); + if (!e_connman_prop_name) - e_connman_prop_name = eina_stringshare_add("Name"); + e_connman_prop_name = eina_stringshare_add("Name"); + if (!e_connman_prop_network) - e_connman_prop_network = eina_stringshare_add("Network"); + e_connman_prop_network = eina_stringshare_add("Network"); + if (!e_connman_prop_networks) - e_connman_prop_networks = eina_stringshare_add("Networks"); + e_connman_prop_networks = eina_stringshare_add("Networks"); + if (!e_connman_prop_offline_mode) - e_connman_prop_offline_mode = eina_stringshare_add("OfflineMode"); + e_connman_prop_offline_mode = eina_stringshare_add("OfflineMode"); + if (!e_connman_prop_policy) - e_connman_prop_policy = eina_stringshare_add("Policy"); + e_connman_prop_policy = eina_stringshare_add("Policy"); + if (!e_connman_prop_powered) - e_connman_prop_powered = eina_stringshare_add("Powered"); + e_connman_prop_powered = eina_stringshare_add("Powered"); + if (!e_connman_prop_priority) - e_connman_prop_priority = eina_stringshare_add("Priority"); + e_connman_prop_priority = eina_stringshare_add("Priority"); + if (!e_connman_prop_profiles) - e_connman_prop_profiles = eina_stringshare_add("Profiles"); + e_connman_prop_profiles = eina_stringshare_add("Profiles"); + if (!e_connman_prop_profile_active) - e_connman_prop_profile_active = eina_stringshare_add("ActiveProfile"); + e_connman_prop_profile_active = eina_stringshare_add("ActiveProfile"); + if (!e_connman_prop_services) - e_connman_prop_services = eina_stringshare_add("Services"); + e_connman_prop_services = eina_stringshare_add("Services"); + if (!e_connman_prop_technologies) - e_connman_prop_technologies = eina_stringshare_add("Technologies"); + e_connman_prop_technologies = eina_stringshare_add("Technologies"); + if (!e_connman_prop_remember) - e_connman_prop_remember = eina_stringshare_add("Remember"); + e_connman_prop_remember = eina_stringshare_add("Remember"); + if (!e_connman_prop_scan_interval) - e_connman_prop_scan_interval = eina_stringshare_add("ScanInterval"); + e_connman_prop_scan_interval = eina_stringshare_add("ScanInterval"); + if (!e_connman_prop_scanning) - e_connman_prop_scanning = eina_stringshare_add("Scanning"); + e_connman_prop_scanning = eina_stringshare_add("Scanning"); + if (!e_connman_prop_state) - e_connman_prop_state = eina_stringshare_add("State"); + e_connman_prop_state = eina_stringshare_add("State"); + if (!e_connman_prop_strength) - e_connman_prop_strength = eina_stringshare_add("Strength"); + e_connman_prop_strength = eina_stringshare_add("Strength"); + if (!e_connman_prop_frequency) - e_connman_prop_frequency = eina_stringshare_add("Frequency"); + e_connman_prop_frequency = eina_stringshare_add("Frequency"); + if (!e_connman_prop_type) - e_connman_prop_type = eina_stringshare_add("Type"); + e_connman_prop_type = eina_stringshare_add("Type"); + if (!e_connman_prop_wifi_mode) - e_connman_prop_wifi_mode = eina_stringshare_add("WiFi.Mode"); + e_connman_prop_wifi_mode = eina_stringshare_add("WiFi.Mode"); + if (!e_connman_prop_wifi_passphrase) - e_connman_prop_wifi_passphrase = eina_stringshare_add("WiFi.Passphrase"); + e_connman_prop_wifi_passphrase = eina_stringshare_add("WiFi.Passphrase"); + if (!e_connman_prop_wifi_security) - e_connman_prop_wifi_security = eina_stringshare_add("WiFi.Security"); + e_connman_prop_wifi_security = eina_stringshare_add("WiFi.Security"); + if (!e_connman_prop_wifi_ssid) - e_connman_prop_wifi_ssid = eina_stringshare_add("WiFi.SSID"); + e_connman_prop_wifi_ssid = eina_stringshare_add("WiFi.SSID"); + if (!e_connman_prop_wifi_channel) - e_connman_prop_wifi_channel = eina_stringshare_add("WiFi.Channel"); + e_connman_prop_wifi_channel = eina_stringshare_add("WiFi.Channel"); + if (!e_connman_prop_wifi_eap) - e_connman_prop_wifi_eap = eina_stringshare_add("WiFi.EAP"); + e_connman_prop_wifi_eap = eina_stringshare_add("WiFi.EAP"); + if (!e_connman_prop_error) - e_connman_prop_error = eina_stringshare_add("Error"); + e_connman_prop_error = eina_stringshare_add("Error"); + if (!e_connman_prop_mode) - e_connman_prop_mode = eina_stringshare_add("Mode"); + e_connman_prop_mode = eina_stringshare_add("Mode"); + if (!e_connman_prop_security) - e_connman_prop_security = eina_stringshare_add("Security"); + e_connman_prop_security = eina_stringshare_add("Security"); + if (!e_connman_prop_passphrase) - e_connman_prop_passphrase = eina_stringshare_add("Passphrase"); + e_connman_prop_passphrase = eina_stringshare_add("Passphrase"); + if (!e_connman_prop_passphrase_required) - e_connman_prop_passphrase_required = eina_stringshare_add("PassphraseRequired"); + e_connman_prop_passphrase_required = eina_stringshare_add("PassphraseRequired"); + if (!e_connman_prop_favorite) - e_connman_prop_favorite = eina_stringshare_add("Favorite"); + e_connman_prop_favorite = eina_stringshare_add("Favorite"); + if (!e_connman_prop_immutable) - e_connman_prop_immutable = eina_stringshare_add("Immutable"); + e_connman_prop_immutable = eina_stringshare_add("Immutable"); + if (!e_connman_prop_auto_connect) - e_connman_prop_auto_connect = eina_stringshare_add("AutoConnect"); + e_connman_prop_auto_connect = eina_stringshare_add("AutoConnect"); + if (!e_connman_prop_setup_required) - e_connman_prop_setup_required = eina_stringshare_add("SetupRequired"); + e_connman_prop_setup_required = eina_stringshare_add("SetupRequired"); + if (!e_connman_prop_apn) - e_connman_prop_apn = eina_stringshare_add("APN"); + e_connman_prop_apn = eina_stringshare_add("APN"); + if (!e_connman_prop_mcc) - e_connman_prop_mcc = eina_stringshare_add("MCC"); + e_connman_prop_mcc = eina_stringshare_add("MCC"); + if (!e_connman_prop_mnc) - e_connman_prop_mnc = eina_stringshare_add("MCN"); + e_connman_prop_mnc = eina_stringshare_add("MCN"); + if (!e_connman_prop_roaming) - e_connman_prop_roaming = eina_stringshare_add("Roaming"); + e_connman_prop_roaming = eina_stringshare_add("Roaming"); + if (!e_connman_prop_technology_default) - e_connman_prop_technology_default = eina_stringshare_add("DefaultTechnology"); + e_connman_prop_technology_default = eina_stringshare_add("DefaultTechnology"); + if (!e_connman_prop_technologies_available) - e_connman_prop_technologies_available = eina_stringshare_add("AvailableTechnologies"); + e_connman_prop_technologies_available = eina_stringshare_add("AvailableTechnologies"); + if (!e_connman_prop_technologies_enabled) - e_connman_prop_technologies_enabled = eina_stringshare_add("EnabledTechnologies"); + e_connman_prop_technologies_enabled = eina_stringshare_add("EnabledTechnologies"); + if (!e_connman_prop_technologies_connected) - e_connman_prop_technologies_connected = eina_... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2010-12-10 17:43:07
|
Log: e_dbus: remove connman methods for Network interface Remove methods dealing with org.moblin.connman.Network interface. These methods were marked as internal, low-level, and should not be used. They are not supported anymore in stable branch of connman. Author: lucas Date: 2010-12-10 09:43:00 -0800 (Fri, 10 Dec 2010) New Revision: 55459 Trac: http://trac.enlightenment.org/e/changeset/55459 Removed: trunk/e_dbus/src/lib/connman/e_connman_network.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/Makefile.am trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_element.c trunk/e_dbus/src/lib/connman/e_connman_manager.c trunk/e_dbus/src/lib/connman/e_connman_private.h Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2010-12-10 17:42:36 UTC (rev 55458) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2010-12-10 17:43:00 UTC (rev 55459) @@ -218,7 +218,6 @@ EAPI Eina_Bool e_connman_element_is_manager(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_device(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_profile(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_element_is_network(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_service(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_technology(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; @@ -245,27 +244,6 @@ EAPI Eina_Bool e_connman_device_networks_get(const E_Connman_Element *device, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; -/* Network Methods: Low-Level API - * - * The network API is informational only, to set these parameters, - * use the services API instead. - */ -EAPI E_Connman_Element * e_connman_network_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_network_address_get(const E_Connman_Element *network, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_name_get(const E_Connman_Element *network, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_connected_get(const E_Connman_Element *network, Eina_Bool *connected) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_strength_get(const E_Connman_Element *network, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_frequency_get(const E_Connman_Element *network, unsigned short *frequency) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_device_get(const E_Connman_Element *network, E_Connman_Element **element) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_network_wifi_ssid_get(const E_Connman_Element *network, unsigned int *count, unsigned char **wifi_ssid) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_wifi_mode_get(const E_Connman_Element *network, const char **wifi_mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_wifi_security_get(const E_Connman_Element *network, const char **wifi_security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_wifi_passphrase_get(const E_Connman_Element *network, const char **wifi_passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_wifi_channel_get(const E_Connman_Element *network, unsigned short *wifi_channel) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_network_wifi_eap_get(const E_Connman_Element *network, const char **wifi_eap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - #ifdef __cplusplus } #endif Modified: trunk/e_dbus/src/lib/connman/Makefile.am =================================================================== --- trunk/e_dbus/src/lib/connman/Makefile.am 2010-12-10 17:42:36 UTC (rev 55458) +++ trunk/e_dbus/src/lib/connman/Makefile.am 2010-12-10 17:43:00 UTC (rev 55459) @@ -13,7 +13,6 @@ e_connman_device.c \ e_connman_element.c \ e_connman_manager.c \ -e_connman_network.c \ e_connman_profile.c \ e_connman_service.c \ e_connman_technology.c Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:42:36 UTC (rev 55458) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:43:00 UTC (rev 55459) @@ -18,7 +18,6 @@ EAPI int E_CONNMAN_EVENT_ELEMENT_UPDATED = 0; const char *e_connman_iface_manager = NULL; -const char *e_connman_iface_network = NULL; const char *e_connman_iface_profile = NULL; const char *e_connman_iface_service = NULL; const char *e_connman_iface_device = NULL; @@ -41,8 +40,6 @@ const char *e_connman_prop_netmask = NULL; const char *e_connman_prop_mtu = NULL; const char *e_connman_prop_name = NULL; -const char *e_connman_prop_network = NULL; -const char *e_connman_prop_networks = NULL; const char *e_connman_prop_offline_mode = NULL; const char *e_connman_prop_policy = NULL; const char *e_connman_prop_powered = NULL; @@ -282,9 +279,6 @@ if (!e_connman_iface_manager) e_connman_iface_manager = eina_stringshare_add("org.moblin.connman.Manager"); - if (!e_connman_iface_network) - e_connman_iface_network = eina_stringshare_add("org.moblin.connman.Network"); - if (!e_connman_iface_profile) e_connman_iface_profile = eina_stringshare_add("org.moblin.connman.Profile"); @@ -348,12 +342,6 @@ if (!e_connman_prop_name) e_connman_prop_name = eina_stringshare_add("Name"); - if (!e_connman_prop_network) - e_connman_prop_network = eina_stringshare_add("Network"); - - if (!e_connman_prop_networks) - e_connman_prop_networks = eina_stringshare_add("Networks"); - if (!e_connman_prop_offline_mode) e_connman_prop_offline_mode = eina_stringshare_add("OfflineMode"); @@ -514,7 +502,6 @@ return init_count; _stringshare_del(&e_connman_iface_manager); - _stringshare_del(&e_connman_iface_network); _stringshare_del(&e_connman_iface_profile); _stringshare_del(&e_connman_iface_service); _stringshare_del(&e_connman_iface_device); @@ -537,8 +524,6 @@ _stringshare_del(&e_connman_prop_netmask); _stringshare_del(&e_connman_prop_mtu); _stringshare_del(&e_connman_prop_name); - _stringshare_del(&e_connman_prop_network); - _stringshare_del(&e_connman_prop_networks); _stringshare_del(&e_connman_prop_offline_mode); _stringshare_del(&e_connman_prop_policy); _stringshare_del(&e_connman_prop_powered); Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_element.c 2010-12-10 17:42:36 UTC (rev 55458) +++ trunk/e_dbus/src/lib/connman/e_connman_element.c 2010-12-10 17:43:00 UTC (rev 55459) @@ -458,12 +458,6 @@ break; - case 'N': - if (strcmp(tail, "etworks") == 0) - interface = e_connman_iface_network; - - break; - case 'S': if (strcmp(tail, "ervices") == 0) interface = e_connman_iface_service; @@ -2382,13 +2376,6 @@ } Eina_Bool -e_connman_element_is_network(const E_Connman_Element *element) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(element, EINA_FALSE); - return _e_connman_element_is(element, e_connman_iface_network); -} - -Eina_Bool e_connman_element_is_service(const E_Connman_Element *element) { EINA_SAFETY_ON_NULL_RETURN_VAL(element, EINA_FALSE); Modified: trunk/e_dbus/src/lib/connman/e_connman_manager.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_manager.c 2010-12-10 17:42:36 UTC (rev 55458) +++ trunk/e_dbus/src/lib/connman/e_connman_manager.c 2010-12-10 17:43:00 UTC (rev 55459) @@ -280,8 +280,8 @@ /** * Request to trigger a scan for given technology. * - * Call method RequestScan(type) on server in order to - * find new services and networks for such technology type. + * Call method RequestScan(type) on server in order to find new services for + * such technology type. * * The empty string for type means all technolgies. * Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2010-12-10 17:42:36 UTC (rev 55458) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2010-12-10 17:43:00 UTC (rev 55459) @@ -29,7 +29,6 @@ static const char manager_path[] = "/"; extern const char *e_connman_iface_manager; -extern const char *e_connman_iface_network; extern const char *e_connman_iface_profile; extern const char *e_connman_iface_service; extern const char *e_connman_iface_device; @@ -52,8 +51,6 @@ extern const char *e_connman_prop_netmask; extern const char *e_connman_prop_mtu; extern const char *e_connman_prop_name; -extern const char *e_connman_prop_network; -extern const char *e_connman_prop_networks; extern const char *e_connman_prop_offline_mode; extern const char *e_connman_prop_policy; extern const char *e_connman_prop_powered; |
From: Enlightenment S. <no-...@en...> - 2010-12-10 17:43:26
|
Log: e_dbus: remove connman methods for Device interface Remove methods dealing with org.moblin.connman.Device interface. These methods were marked as internal, low-level, and should not be used. They are not supported anymore in stable branch of connman. Author: lucas Date: 2010-12-10 09:43:19 -0800 (Fri, 10 Dec 2010) New Revision: 55460 Trac: http://trac.enlightenment.org/e/changeset/55460 Removed: trunk/e_dbus/src/lib/connman/e_connman_device.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/Makefile.am trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_element.c trunk/e_dbus/src/lib/connman/e_connman_manager.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_profile.c trunk/e_dbus/src/lib/connman/e_connman_technology.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2010-12-10 17:43:19 UTC (rev 55460) @@ -45,7 +45,6 @@ Eina_Inlist *technology_enable; Eina_Inlist *technology_disable; Eina_Inlist *profile_remove; - Eina_Inlist *device_propose_scan; Eina_Inlist *service_connect; Eina_Inlist *service_disconnect; Eina_Inlist *service_remove; @@ -177,7 +176,6 @@ EAPI Eina_Bool e_connman_technology_state_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_technology_name_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_technology_type_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_technology_devices_get(const E_Connman_Element *technology, unsigned int *count, E_Connman_Element ***t_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; // TODO: ethernet_speed_get (not in connman yet) // TODO: ethernet_duplex_get (not in connman yet) @@ -216,34 +214,10 @@ EAPI Eina_Bool e_connman_element_property_get(const E_Connman_Element *element, const char *name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_manager(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_element_is_device(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_profile(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_service(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_is_technology(const E_Connman_Element *element) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; -/* Device Methods: Low-Level API - * - * Fine tune device, such as turn off and change scan interval. - */ -EAPI E_Connman_Element * e_connman_device_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_device_propose_scan(E_Connman_Element *device, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_device_address_get(const E_Connman_Element *device, const char **address); -EAPI Eina_Bool e_connman_device_name_get(const E_Connman_Element *device, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_device_type_get(const E_Connman_Element *device, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_device_interface_get(const E_Connman_Element *device, const char **interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_device_powered_get(const E_Connman_Element *device, Eina_Bool *powered) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_device_powered_set(E_Connman_Element *device, Eina_Bool powered, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_device_scan_interval_get(const E_Connman_Element *device, unsigned short *scan_interval) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -EAPI Eina_Bool e_connman_device_scan_interval_set(E_Connman_Element *device, unsigned short scan_interval, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_device_scanning_get(const E_Connman_Element *device, Eina_Bool *scanning) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - -EAPI Eina_Bool e_connman_device_networks_get(const E_Connman_Element *device, unsigned int *count, E_Connman_Element ***p_elements) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - #ifdef __cplusplus } #endif Modified: trunk/e_dbus/src/lib/connman/Makefile.am =================================================================== --- trunk/e_dbus/src/lib/connman/Makefile.am 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/Makefile.am 2010-12-10 17:43:19 UTC (rev 55460) @@ -10,7 +10,6 @@ libeconnman_la_SOURCES = \ e_connman.c \ -e_connman_device.c \ e_connman_element.c \ e_connman_manager.c \ e_connman_profile.c \ Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:43:19 UTC (rev 55460) @@ -20,7 +20,6 @@ const char *e_connman_iface_manager = NULL; const char *e_connman_iface_profile = NULL; const char *e_connman_iface_service = NULL; -const char *e_connman_iface_device = NULL; const char *e_connman_iface_connection = NULL; const char *e_connman_iface_technology = NULL; @@ -28,8 +27,6 @@ const char *e_connman_prop_connected = NULL; const char *e_connman_prop_connections = NULL; const char *e_connman_prop_default = NULL; -const char *e_connman_prop_device = NULL; -const char *e_connman_prop_devices = NULL; const char *e_connman_prop_interface = NULL; const char *e_connman_prop_ipv4 = NULL; const char *e_connman_prop_ipv4_configuration = NULL; @@ -285,9 +282,6 @@ if (!e_connman_iface_service) e_connman_iface_service = eina_stringshare_add("org.moblin.connman.Service"); - if (!e_connman_iface_device) - e_connman_iface_device = eina_stringshare_add("org.moblin.connman.Device"); - if (!e_connman_iface_connection) e_connman_iface_connection = eina_stringshare_add("org.moblin.connman.Connection"); @@ -306,12 +300,6 @@ if (!e_connman_prop_default) e_connman_prop_default = eina_stringshare_add("Default"); - if (!e_connman_prop_device) - e_connman_prop_device = eina_stringshare_add("Device"); - - if (!e_connman_prop_devices) - e_connman_prop_devices = eina_stringshare_add("Devices"); - if (!e_connman_prop_interface) e_connman_prop_interface = eina_stringshare_add("Interface"); @@ -504,7 +492,6 @@ _stringshare_del(&e_connman_iface_manager); _stringshare_del(&e_connman_iface_profile); _stringshare_del(&e_connman_iface_service); - _stringshare_del(&e_connman_iface_device); _stringshare_del(&e_connman_iface_connection); _stringshare_del(&e_connman_iface_technology); @@ -512,8 +499,6 @@ _stringshare_del(&e_connman_prop_connected); _stringshare_del(&e_connman_prop_connections); _stringshare_del(&e_connman_prop_default); - _stringshare_del(&e_connman_prop_device); - _stringshare_del(&e_connman_prop_devices); _stringshare_del(&e_connman_prop_interface); _stringshare_del(&e_connman_prop_ipv4); _stringshare_del(&e_connman_prop_ipv4_configuration); Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_element.c 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/e_connman_element.c 2010-12-10 17:43:19 UTC (rev 55460) @@ -452,12 +452,6 @@ break; - case 'D': - if (strcmp(tail, "evices") == 0) - interface = e_connman_iface_device; - - break; - case 'S': if (strcmp(tail, "ervices") == 0) interface = e_connman_iface_service; @@ -1114,7 +1108,6 @@ e_connman_element_pending_cancel_and_free(&element->_pending.technology_enable); e_connman_element_pending_cancel_and_free(&element->_pending.technology_disable); e_connman_element_pending_cancel_and_free(&element->_pending.profile_remove); - e_connman_element_pending_cancel_and_free(&element->_pending.device_propose_scan); e_connman_element_pending_cancel_and_free(&element->_pending.service_connect); e_connman_element_pending_cancel_and_free(&element->_pending.service_disconnect); e_connman_element_pending_cancel_and_free(&element->_pending.service_remove); @@ -2362,13 +2355,6 @@ } Eina_Bool -e_connman_element_is_device(const E_Connman_Element *element) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(element, EINA_FALSE); - return _e_connman_element_is(element, e_connman_iface_device); -} - -Eina_Bool e_connman_element_is_profile(const E_Connman_Element *element) { EINA_SAFETY_ON_NULL_RETURN_VAL(element, EINA_FALSE); Modified: trunk/e_dbus/src/lib/connman/e_connman_manager.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_manager.c 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/e_connman_manager.c 2010-12-10 17:43:19 UTC (rev 55460) @@ -78,7 +78,7 @@ * * The global connection state of a system. Possible * values are "online" if at least one connection exists - * and "offline" if no device is connected. + * and "offline" if no service is connected. * * In certain situations the state might change to * the value "connected". This can only be seen if @@ -113,16 +113,14 @@ * If @c EINA_FALSE is returned, then this call failed and parameter-returned * values shall be considered invalid. * - * The offline mode indicates the global setting for - * switching all radios on or off. Changing offline mode - * to true results in powering down all devices. When - * leaving offline mode the individual policy of each - * device decides to switch the radio back on or not. + * The offline mode indicates the global setting for switching all radios on or + * off. Changing offline mode to true results in powering down all devices that + * use radio technology. When leaving offline mode the individual policy of each + * technology decides to switch the radio back on or not. * - * During offline mode, it is still possible to switch - * certain technologies manually back on. For example - * the limited usage of WiFi or Bluetooth devices might - * be allowed in some situations. + * During offline mode, it is still possible to switch certain technologies + * manually back on. For example the limited usage of WiFi or Bluetooth + * technologies might be allowed in some situations. * * @param offline where to store the property value, must be a pointer * to Eina_Bool (Eina_Bool *). @@ -152,16 +150,14 @@ * no property is updated locally. If the value was set the event * E_CONNMAN_EVENT_ELEMENT_UPDATED will be added to main loop. * - * The offline mode indicates the global setting for - * switching all radios on or off. Changing offline mode - * to true results in powering down all devices. When - * leaving offline mode the individual policy of each - * device decides to switch the radio back on or not. + * The offline mode indicates the global setting for switching all radios on or + * off. Changing offline mode to true results in powering down all devices that + * use radio technology. When leaving offline mode the individual policy of each + * technology decides to switch the radio back on or not. * - * During offline mode, it is still possible to switch - * certain technologies manually back on. For example - * the limited usage of WiFi or Bluetooth devices might - * be allowed in some situations. + * During offline mode, it is still possible to switch certain technologies + * manually back on. For example the limited usage of WiFi or Bluetooth + * technologies might be allowed in some situations. * * @param offline value to set. * @param cb function to call when server replies or some error happens. Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2010-12-10 17:43:19 UTC (rev 55460) @@ -31,7 +31,6 @@ extern const char *e_connman_iface_manager; extern const char *e_connman_iface_profile; extern const char *e_connman_iface_service; -extern const char *e_connman_iface_device; extern const char *e_connman_iface_connection; extern const char *e_connman_iface_technology; @@ -39,8 +38,6 @@ extern const char *e_connman_prop_connected; extern const char *e_connman_prop_connections; extern const char *e_connman_prop_default; -extern const char *e_connman_prop_device; -extern const char *e_connman_prop_devices; extern const char *e_connman_prop_interface; extern const char *e_connman_prop_ipv4; extern const char *e_connman_prop_ipv4_configuration; Modified: trunk/e_dbus/src/lib/connman/e_connman_profile.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_profile.c 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/e_connman_profile.c 2010-12-10 17:43:19 UTC (rev 55460) @@ -76,9 +76,9 @@ * If @c EINA_FALSE is returned, then this call failed and parameter-returned * values shall be considered invalid. * - * The offline mode indicates the global setting for - * switching all radios on or off. Changing offline mode - * to true results in powering down all devices. + * The offline mode indicates the global setting for switching all radios on or + * off. Changing offline mode to true results in powering down all devices that + * use radio technology. * * @param offline where to store the property value, must be a pointer * to Eina_Bool (Eina_Bool *). @@ -102,9 +102,9 @@ * no property is updated locally. If the value was set the event * E_CONNMAN_EVENT_ELEMENT_UPDATED will be added to main loop. * - * The offline mode indicates the global setting for - * switching all radios on or off. Changing offline mode - * to true results in powering down all devices. + * The offline mode indicates the global setting for switching all radios on or + * off. Changing offline mode to true results in powering down all devices that + * use radio technology. * * @param offline value to set. * @param cb function to call when server replies or some error happens. Modified: trunk/e_dbus/src/lib/connman/e_connman_technology.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_technology.c 2010-12-10 17:43:00 UTC (rev 55459) +++ trunk/e_dbus/src/lib/connman/e_connman_technology.c 2010-12-10 17:43:19 UTC (rev 55460) @@ -104,30 +104,3 @@ return e_connman_element_property_get_stringshared (technology, e_connman_prop_state, NULL, state); } - -/** - * Get array of device elements. - * - * If this property isn't found then @c EINA_FALSE is returned. - * If @c EINA_FALSE is returned, then this call failed and parameter-returned - * values shall be considered invalid. - * - * @param technology path to get property. - * @param count return the number of elements in array. - * @param t_elements array with all elements, these are not referenced - * and in no particular order, just set if return is @c EINA_TRUE. The - * array itself is allocated using malloc() and should be freed - * after usage is done. - * - * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. - */ -Eina_Bool -e_connman_technology_devices_get(const E_Connman_Element *technology, unsigned int *count, E_Connman_Element ***t_elements) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(technology, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(t_elements, EINA_FALSE); - return e_connman_element_objects_array_get_stringshared - (technology, e_connman_prop_devices, count, t_elements); -} - |
From: Enlightenment S. <no-...@en...> - 2010-12-10 17:43:41
|
Log: e_dbus: remove unused strings Author: lucas Date: 2010-12-10 09:43:34 -0800 (Fri, 10 Dec 2010) New Revision: 55461 Trac: http://trac.enlightenment.org/e/changeset/55461 Modified: trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:43:19 UTC (rev 55460) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:43:34 UTC (rev 55461) @@ -24,10 +24,8 @@ const char *e_connman_iface_technology = NULL; const char *e_connman_prop_available = NULL; -const char *e_connman_prop_connected = NULL; const char *e_connman_prop_connections = NULL; const char *e_connman_prop_default = NULL; -const char *e_connman_prop_interface = NULL; const char *e_connman_prop_ipv4 = NULL; const char *e_connman_prop_ipv4_configuration = NULL; const char *e_connman_prop_ethernet = NULL; @@ -39,25 +37,15 @@ const char *e_connman_prop_name = NULL; const char *e_connman_prop_offline_mode = NULL; const char *e_connman_prop_policy = NULL; -const char *e_connman_prop_powered = NULL; const char *e_connman_prop_priority = NULL; const char *e_connman_prop_profiles = NULL; const char *e_connman_prop_profile_active = NULL; const char *e_connman_prop_services = NULL; const char *e_connman_prop_technologies = NULL; const char *e_connman_prop_remember = NULL; -const char *e_connman_prop_scan_interval = NULL; -const char *e_connman_prop_scanning = NULL; const char *e_connman_prop_state = NULL; const char *e_connman_prop_strength = NULL; -const char *e_connman_prop_frequency = NULL; const char *e_connman_prop_type = NULL; -const char *e_connman_prop_wifi_mode = NULL; -const char *e_connman_prop_wifi_passphrase = NULL; -const char *e_connman_prop_wifi_security = NULL; -const char *e_connman_prop_wifi_ssid = NULL; -const char *e_connman_prop_wifi_channel = NULL; -const char *e_connman_prop_wifi_eap = NULL; const char *e_connman_prop_error = NULL; const char *e_connman_prop_mode = NULL; const char *e_connman_prop_security = NULL; @@ -291,18 +279,12 @@ if (!e_connman_prop_available) e_connman_prop_available = eina_stringshare_add("Available"); - if (!e_connman_prop_connected) - e_connman_prop_connected = eina_stringshare_add("Connected"); - if (!e_connman_prop_connections) e_connman_prop_connections = eina_stringshare_add("Connections"); if (!e_connman_prop_default) e_connman_prop_default = eina_stringshare_add("Default"); - if (!e_connman_prop_interface) - e_connman_prop_interface = eina_stringshare_add("Interface"); - if (!e_connman_prop_ipv4) e_connman_prop_ipv4 = eina_stringshare_add("IPv4"); @@ -336,9 +318,6 @@ if (!e_connman_prop_policy) e_connman_prop_policy = eina_stringshare_add("Policy"); - if (!e_connman_prop_powered) - e_connman_prop_powered = eina_stringshare_add("Powered"); - if (!e_connman_prop_priority) e_connman_prop_priority = eina_stringshare_add("Priority"); @@ -357,42 +336,15 @@ if (!e_connman_prop_remember) e_connman_prop_remember = eina_stringshare_add("Remember"); - if (!e_connman_prop_scan_interval) - e_connman_prop_scan_interval = eina_stringshare_add("ScanInterval"); - - if (!e_connman_prop_scanning) - e_connman_prop_scanning = eina_stringshare_add("Scanning"); - if (!e_connman_prop_state) e_connman_prop_state = eina_stringshare_add("State"); if (!e_connman_prop_strength) e_connman_prop_strength = eina_stringshare_add("Strength"); - if (!e_connman_prop_frequency) - e_connman_prop_frequency = eina_stringshare_add("Frequency"); - if (!e_connman_prop_type) e_connman_prop_type = eina_stringshare_add("Type"); - if (!e_connman_prop_wifi_mode) - e_connman_prop_wifi_mode = eina_stringshare_add("WiFi.Mode"); - - if (!e_connman_prop_wifi_passphrase) - e_connman_prop_wifi_passphrase = eina_stringshare_add("WiFi.Passphrase"); - - if (!e_connman_prop_wifi_security) - e_connman_prop_wifi_security = eina_stringshare_add("WiFi.Security"); - - if (!e_connman_prop_wifi_ssid) - e_connman_prop_wifi_ssid = eina_stringshare_add("WiFi.SSID"); - - if (!e_connman_prop_wifi_channel) - e_connman_prop_wifi_channel = eina_stringshare_add("WiFi.Channel"); - - if (!e_connman_prop_wifi_eap) - e_connman_prop_wifi_eap = eina_stringshare_add("WiFi.EAP"); - if (!e_connman_prop_error) e_connman_prop_error = eina_stringshare_add("Error"); @@ -496,10 +448,8 @@ _stringshare_del(&e_connman_iface_technology); _stringshare_del(&e_connman_prop_available); - _stringshare_del(&e_connman_prop_connected); _stringshare_del(&e_connman_prop_connections); _stringshare_del(&e_connman_prop_default); - _stringshare_del(&e_connman_prop_interface); _stringshare_del(&e_connman_prop_ipv4); _stringshare_del(&e_connman_prop_ipv4_configuration); _stringshare_del(&e_connman_prop_ethernet); @@ -511,25 +461,15 @@ _stringshare_del(&e_connman_prop_name); _stringshare_del(&e_connman_prop_offline_mode); _stringshare_del(&e_connman_prop_policy); - _stringshare_del(&e_connman_prop_powered); _stringshare_del(&e_connman_prop_priority); _stringshare_del(&e_connman_prop_profiles); _stringshare_del(&e_connman_prop_profile_active); _stringshare_del(&e_connman_prop_services); _stringshare_del(&e_connman_prop_technologies); _stringshare_del(&e_connman_prop_remember); - _stringshare_del(&e_connman_prop_scan_interval); - _stringshare_del(&e_connman_prop_scanning); _stringshare_del(&e_connman_prop_state); _stringshare_del(&e_connman_prop_strength); - _stringshare_del(&e_connman_prop_frequency); _stringshare_del(&e_connman_prop_type); - _stringshare_del(&e_connman_prop_wifi_mode); - _stringshare_del(&e_connman_prop_wifi_passphrase); - _stringshare_del(&e_connman_prop_wifi_security); - _stringshare_del(&e_connman_prop_wifi_ssid); - _stringshare_del(&e_connman_prop_wifi_channel); - _stringshare_del(&e_connman_prop_wifi_eap); _stringshare_del(&e_connman_prop_error); _stringshare_del(&e_connman_prop_mode); _stringshare_del(&e_connman_prop_security); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2010-12-10 17:43:19 UTC (rev 55460) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2010-12-10 17:43:34 UTC (rev 55461) @@ -35,10 +35,8 @@ extern const char *e_connman_iface_technology; extern const char *e_connman_prop_available; -extern const char *e_connman_prop_connected; extern const char *e_connman_prop_connections; extern const char *e_connman_prop_default; -extern const char *e_connman_prop_interface; extern const char *e_connman_prop_ipv4; extern const char *e_connman_prop_ipv4_configuration; extern const char *e_connman_prop_ethernet; @@ -50,25 +48,15 @@ extern const char *e_connman_prop_name; extern const char *e_connman_prop_offline_mode; extern const char *e_connman_prop_policy; -extern const char *e_connman_prop_powered; extern const char *e_connman_prop_priority; extern const char *e_connman_prop_profiles; extern const char *e_connman_prop_profile_active; extern const char *e_connman_prop_services; extern const char *e_connman_prop_technologies; extern const char *e_connman_prop_remember; -extern const char *e_connman_prop_scan_interval; -extern const char *e_connman_prop_scanning; extern const char *e_connman_prop_state; extern const char *e_connman_prop_strength; -extern const char *e_connman_prop_frequency; extern const char *e_connman_prop_type; -extern const char *e_connman_prop_wifi_mode; -extern const char *e_connman_prop_wifi_passphrase; -extern const char *e_connman_prop_wifi_security; -extern const char *e_connman_prop_wifi_ssid; -extern const char *e_connman_prop_wifi_channel; -extern const char *e_connman_prop_wifi_eap; extern const char *e_connman_prop_error; extern const char *e_connman_prop_mode; extern const char *e_connman_prop_security; |
From: Enlightenment S. <no-...@en...> - 2010-12-10 17:43:57
|
Log: e_dbus: rename connman path Connman's dbus interface got renamed from org.mobling.connman to net.connman as of version 0.64 This means e_dbus is now compatible with connman v0.64 and up. Author: lucas Date: 2010-12-10 09:43:49 -0800 (Fri, 10 Dec 2010) New Revision: 55462 Trac: http://trac.enlightenment.org/e/changeset/55462 Modified: trunk/e_dbus/src/lib/connman/e_connman.c Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:43:34 UTC (rev 55461) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2010-12-10 17:43:49 UTC (rev 55462) @@ -7,7 +7,7 @@ static unsigned int init_count = 0; static char *unique_name = NULL; -static const char bus_name[] = "org.moblin.connman"; +static const char bus_name[] = "net.connman"; E_DBus_Connection *e_connman_conn = NULL; @@ -209,7 +209,7 @@ /** * Initialize E Connection Manager (E_Connman) system. * - * This will connect and watch org.moblin.connman.Manager and Element + * This will connect and watch net.connman.Manager and Element * events and translate to Ecore main loop events, also provide a * proxy for method invocation on server. * @@ -262,19 +262,19 @@ E_CONNMAN_EVENT_ELEMENT_UPDATED = ecore_event_type_new(); if (!e_connman_iface_manager) - e_connman_iface_manager = eina_stringshare_add("org.moblin.connman.Manager"); + e_connman_iface_manager = eina_stringshare_add("net.connman.Manager"); if (!e_connman_iface_profile) - e_connman_iface_profile = eina_stringshare_add("org.moblin.connman.Profile"); + e_connman_iface_profile = eina_stringshare_add("net.connman.Profile"); if (!e_connman_iface_service) - e_connman_iface_service = eina_stringshare_add("org.moblin.connman.Service"); + e_connman_iface_service = eina_stringshare_add("net.connman.Service"); if (!e_connman_iface_connection) - e_connman_iface_connection = eina_stringshare_add("org.moblin.connman.Connection"); + e_connman_iface_connection = eina_stringshare_add("net.connman.Connection"); if (!e_connman_iface_technology) - e_connman_iface_technology = eina_stringshare_add("org.moblin.connman.Technology"); + e_connman_iface_technology = eina_stringshare_add("net.connman.Technology"); if (!e_connman_prop_available) e_connman_prop_available = eina_stringshare_add("Available"); |
From: Enlightenment S. <no-...@en...> - 2011-11-09 12:05:36
|
Log: share common code Author: lucas Date: 2011-11-09 04:05:25 -0800 (Wed, 09 Nov 2011) New Revision: 64982 Trac: http://trac.enlightenment.org/e/changeset/64982 Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-09 12:03:46 UTC (rev 64981) +++ trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-09 12:05:25 UTC (rev 64982) @@ -379,16 +379,12 @@ case DBUS_TYPE_UINT32: break; + case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator) - eina_stringshare_del(item); + eina_stringshare_del(item); break; - case DBUS_TYPE_STRING: - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator) - eina_stringshare_del(item); - break; - case DBUS_TYPE_DICT_ENTRY: EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator) _e_connman_element_dict_entry_free(item); |
From: Enlightenment S. <no-...@en...> - 2011-11-10 00:49:25
|
Log: e_dbus/connman: fix doc with wrong description Author: lucas Date: 2011-11-09 16:49:19 -0800 (Wed, 09 Nov 2011) New Revision: 64998 Trac: http://trac.enlightenment.org/e/changeset/64998 Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-09 23:04:01 UTC (rev 64997) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-10 00:49:19 UTC (rev 64998) @@ -1198,7 +1198,7 @@ } /** - * Get property "Ethernet.Gateway" value. + * Get property "Ethernet.MTU" value. * * If this property isn't found then @c EINA_FALSE is returned. * If @c EINA_FALSE is returned, then this call failed and parameter-returned |
From: Enlightenment S. <no-...@en...> - 2011-11-10 00:49:34
|
Log: e_dbus/connman: update doc Author: lucas Date: 2011-11-09 16:49:27 -0800 (Wed, 09 Nov 2011) New Revision: 64999 Trac: http://trac.enlightenment.org/e/changeset/64999 Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-10 00:49:19 UTC (rev 64998) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-10 00:49:27 UTC (rev 64999) @@ -1152,7 +1152,7 @@ * If @c EINA_FALSE is returned, then this call failed and parameter-returned * values shall be considered invalid. * - * The Ethernet configuration method. Possible values here "auto". + * The Ethernet configuration method. Possible values here "auto" and "manual". * * @param service path to get property. * @param method where to store the property value, must be a pointer |
From: Enlightenment S. <no-...@en...> - 2011-11-10 00:49:45
|
Log: e_dbus/connman: downgrade log message to DBG Some dict entries may not be available depending on the dictionary so don't warn about it. Author: lucas Date: 2011-11-09 16:49:39 -0800 (Wed, 09 Nov 2011) New Revision: 65000 Trac: http://trac.enlightenment.org/e/changeset/65000 Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-10 00:49:27 UTC (rev 64999) +++ trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-10 00:49:39 UTC (rev 65000) @@ -1851,7 +1851,7 @@ } } - WRN("element %s (%p) has no property with name \"%s\".", + DBG("element %s (%p) has no property with name \"%s\".", element->path, element, dict_name); return EINA_FALSE; } |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:18:47
|
Log: e_dbus/connman: Remove legacy interfaces New methods only exist on new interface. Newer versions of ConnMan is already packaged by major distros so there's no need to keep the legacy stuff there. Author: lucas Date: 2011-11-14 07:18:40 -0800 (Mon, 14 Nov 2011) New Revision: 65173 Trac: http://trac.enlightenment.org/e/changeset/65173 Modified: trunk/e_dbus/src/lib/connman/e_connman.c Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:16:28 UTC (rev 65172) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:18:40 UTC (rev 65173) @@ -4,12 +4,10 @@ static E_DBus_Signal_Handler *cb_name_owner_changed = NULL; static DBusPendingCall *pending_get_name_owner = NULL; -static DBusPendingCall *pending_get_name_owner_old = NULL; static unsigned int init_count = 0; static char *unique_name = NULL; static const char bus_name[] = "net.connman"; -static const char bus_name_old[] = "org.moblin.connman"; E_DBus_Connection *e_connman_conn = NULL; @@ -204,67 +202,10 @@ return; } - if (!e_connman_iface_manager) - e_connman_iface_manager = eina_stringshare_add("net.connman.Manager"); - - if (!e_connman_iface_profile) - e_connman_iface_profile = eina_stringshare_add("net.connman.Profile"); - - if (!e_connman_iface_service) - e_connman_iface_service = eina_stringshare_add("net.connman.Service"); - - if (!e_connman_iface_connection) - e_connman_iface_connection = eina_stringshare_add("net.connman.Connection"); - - if (!e_connman_iface_technology) - e_connman_iface_technology = eina_stringshare_add("net.connman.Technology"); - _e_connman_system_name_owner_enter(uid); return; } -static void -_e_connman_get_name_owner_old(void *data __UNUSED__, DBusMessage *msg, DBusError *err) -{ - DBusMessageIter itr; - int t; - const char *uid; - - pending_get_name_owner_old = NULL; - - if (!_dbus_callback_check_and_init(msg, &itr, err)) - return; - - t = dbus_message_iter_get_arg_type(&itr); - if (!_dbus_iter_type_check(t, DBUS_TYPE_STRING)) - return; - - dbus_message_iter_get_basic(&itr, &uid); - if (!uid) - { - ERR("no name owner!"); - return; - } - - if (!e_connman_iface_manager) - e_connman_iface_manager = eina_stringshare_add("org.moblin.connman.Manager"); - - if (!e_connman_iface_profile) - e_connman_iface_profile = eina_stringshare_add("org.moblin.connman.Profile"); - - if (!e_connman_iface_service) - e_connman_iface_service = eina_stringshare_add("org.moblin.connman.Service"); - - if (!e_connman_iface_connection) - e_connman_iface_connection = eina_stringshare_add("org.moblin.connman.Connection"); - - if (!e_connman_iface_technology) - e_connman_iface_technology = eina_stringshare_add("org.moblin.connman.Technology"); - - _e_connman_system_name_owner_enter(uid); - return; -} - /** * Initialize E Connection Manager (E_Connman) system. * @@ -320,6 +261,21 @@ if (E_CONNMAN_EVENT_ELEMENT_UPDATED == 0) E_CONNMAN_EVENT_ELEMENT_UPDATED = ecore_event_type_new(); + if (!e_connman_iface_manager) + e_connman_iface_manager = eina_stringshare_add("net.connman.Manager"); + + if (!e_connman_iface_profile) + e_connman_iface_profile = eina_stringshare_add("net.connman.Profile"); + + if (!e_connman_iface_service) + e_connman_iface_service = eina_stringshare_add("net.connman.Service"); + + if (!e_connman_iface_connection) + e_connman_iface_connection = eina_stringshare_add("net.connman.Connection"); + + if (!e_connman_iface_technology) + e_connman_iface_technology = eina_stringshare_add("net.connman.Technology"); + if (!e_connman_prop_available) e_connman_prop_available = eina_stringshare_add("Available"); @@ -451,12 +407,6 @@ pending_get_name_owner = e_dbus_get_name_owner (e_connman_conn, bus_name, _e_connman_get_name_owner, NULL); - if (pending_get_name_owner_old) - dbus_pending_call_cancel(pending_get_name_owner_old); - - pending_get_name_owner_old = e_dbus_get_name_owner - (e_connman_conn, bus_name_old, _e_connman_get_name_owner_old, NULL); - e_connman_elements_init(); return init_count; |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:18:59
|
Log: e_dbus/connman: Add getter/setter for LoginRequired Author: lucas Date: 2011-11-14 07:18:48 -0800 (Mon, 14 Nov 2011) New Revision: 65174 Trac: http://trac.enlightenment.org/e/changeset/65174 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:18:40 UTC (rev 65173) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:18:48 UTC (rev 65174) @@ -150,6 +150,7 @@ EAPI Eina_Bool e_connman_service_setup_required_get(const E_Connman_Element *service, Eina_Bool *setup_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_passphrase_required_get(const E_Connman_Element *service, Eina_Bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_login_required_get(const E_Connman_Element *service, Eina_Bool *login_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_apn_get(const E_Connman_Element *service, const char **apn) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_apn_set(E_Connman_Element *service, const char *apn, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:18:40 UTC (rev 65173) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:18:48 UTC (rev 65174) @@ -51,6 +51,7 @@ const char *e_connman_prop_security = NULL; const char *e_connman_prop_passphrase = NULL; const char *e_connman_prop_passphrase_required = NULL; +const char *e_connman_prop_login_required = NULL; const char *e_connman_prop_favorite = NULL; const char *e_connman_prop_immutable = NULL; const char *e_connman_prop_auto_connect = NULL; @@ -360,6 +361,9 @@ if (!e_connman_prop_passphrase_required) e_connman_prop_passphrase_required = eina_stringshare_add("PassphraseRequired"); + if (!e_connman_prop_login_required) + e_connman_prop_login_required = eina_stringshare_add("LoginRequired"); + if (!e_connman_prop_favorite) e_connman_prop_favorite = eina_stringshare_add("Favorite"); @@ -475,6 +479,7 @@ _stringshare_del(&e_connman_prop_security); _stringshare_del(&e_connman_prop_passphrase); _stringshare_del(&e_connman_prop_passphrase_required); + _stringshare_del(&e_connman_prop_login_required); _stringshare_del(&e_connman_prop_favorite); _stringshare_del(&e_connman_prop_immutable); _stringshare_del(&e_connman_prop_auto_connect); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:18:40 UTC (rev 65173) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:18:48 UTC (rev 65174) @@ -74,6 +74,7 @@ extern const char *e_connman_prop_technologies_available; extern const char *e_connman_prop_technologies_enabled; extern const char *e_connman_prop_technologies_connected; +extern const char *e_connman_prop_login_required; extern int _e_dbus_connman_log_dom; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:18:40 UTC (rev 65173) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:18:48 UTC (rev 65174) @@ -493,6 +493,37 @@ } /** + * Get property "LoginRequired" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Indicates that a manual configuration must be done to login the + * user, likely access an website using a browser. + * + * If a login has been set already or if no + * login is needed, then this property will + * be set to false. + * + * @param service path to get property. + * @param login_required where to store the property value, must be a + * pointer to Eina_Bool (Eina_Bool *). + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + * + * @since 1.1.0 + */ +Eina_Bool +e_connman_service_login_required_get(const E_Connman_Element *service, Eina_Bool *login_required) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(login_required, EINA_FALSE); + return e_connman_element_property_get_stringshared + (service, e_connman_prop_login_required, NULL, login_required); +} + +/** * Get property "Strength" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:19:01
|
Log: e_dbus/connman: define macro to do boring repetitive work Author: lucas Date: 2011-11-14 07:18:54 -0800 (Mon, 14 Nov 2011) New Revision: 65175 Trac: http://trac.enlightenment.org/e/changeset/65175 Modified: trunk/e_dbus/src/lib/connman/e_connman.c Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:18:48 UTC (rev 65174) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:18:54 UTC (rev 65175) @@ -262,144 +262,61 @@ if (E_CONNMAN_EVENT_ELEMENT_UPDATED == 0) E_CONNMAN_EVENT_ELEMENT_UPDATED = ecore_event_type_new(); - if (!e_connman_iface_manager) - e_connman_iface_manager = eina_stringshare_add("net.connman.Manager"); +#define ADD_STRINGSHARE(name, s) \ + if (!name) \ + name = eina_stringshare_add(s) - if (!e_connman_iface_profile) - e_connman_iface_profile = eina_stringshare_add("net.connman.Profile"); + ADD_STRINGSHARE(e_connman_iface_manager, "net.connman.Manager"); + ADD_STRINGSHARE(e_connman_iface_profile, "net.connman.Profile"); + ADD_STRINGSHARE(e_connman_iface_service, "net.connman.Service"); + ADD_STRINGSHARE(e_connman_iface_connection, "net.connman.Connection"); + ADD_STRINGSHARE(e_connman_iface_technology, "net.connman.Technology"); + ADD_STRINGSHARE(e_connman_prop_available, "Available"); + ADD_STRINGSHARE(e_connman_prop_connections, "Connections"); + ADD_STRINGSHARE(e_connman_prop_default, "Default"); + ADD_STRINGSHARE(e_connman_prop_ipv4, "IPv4"); + ADD_STRINGSHARE(e_connman_prop_ipv4_configuration, "IPv4.Configuration"); + ADD_STRINGSHARE(e_connman_prop_ethernet, "Ethernet"); + ADD_STRINGSHARE(e_connman_prop_method, "Method"); + ADD_STRINGSHARE(e_connman_prop_address, "Address"); + ADD_STRINGSHARE(e_connman_prop_gateway, "Gateway"); + ADD_STRINGSHARE(e_connman_prop_netmask, "Netmask"); + ADD_STRINGSHARE(e_connman_prop_mtu, "MTU"); + ADD_STRINGSHARE(e_connman_prop_name, "Name"); + ADD_STRINGSHARE(e_connman_prop_offline_mode, "OfflineMode"); + ADD_STRINGSHARE(e_connman_prop_policy, "Policy"); + ADD_STRINGSHARE(e_connman_prop_priority, "Priority"); + ADD_STRINGSHARE(e_connman_prop_profiles, "Profiles"); + ADD_STRINGSHARE(e_connman_prop_profile_active, "ActiveProfile"); + ADD_STRINGSHARE(e_connman_prop_services, "Services"); + ADD_STRINGSHARE(e_connman_prop_technologies, "Technologies"); + ADD_STRINGSHARE(e_connman_prop_remember, "Remember"); + ADD_STRINGSHARE(e_connman_prop_state, "State"); + ADD_STRINGSHARE(e_connman_prop_strength, "Strength"); + ADD_STRINGSHARE(e_connman_prop_type, "Type"); + ADD_STRINGSHARE(e_connman_prop_error, "Error"); + ADD_STRINGSHARE(e_connman_prop_mode, "Mode"); + ADD_STRINGSHARE(e_connman_prop_security, "Security"); + ADD_STRINGSHARE(e_connman_prop_passphrase, "Passphrase"); + ADD_STRINGSHARE(e_connman_prop_passphrase_required, "PassphraseRequired"); + ADD_STRINGSHARE(e_connman_prop_login_required, "LoginRequired"); + ADD_STRINGSHARE(e_connman_prop_favorite, "Favorite"); + ADD_STRINGSHARE(e_connman_prop_immutable, "Immutable"); + ADD_STRINGSHARE(e_connman_prop_auto_connect, "AutoConnect"); + ADD_STRINGSHARE(e_connman_prop_setup_required, "SetupRequired"); + ADD_STRINGSHARE(e_connman_prop_apn, "APN"); + ADD_STRINGSHARE(e_connman_prop_mcc, "MCC"); + ADD_STRINGSHARE(e_connman_prop_mnc, "MNC"); + ADD_STRINGSHARE(e_connman_prop_roaming, "Roaming"); + ADD_STRINGSHARE(e_connman_prop_technology_default, "DefaultTechnology"); + ADD_STRINGSHARE(e_connman_prop_technologies_available, + "AvailableTechnologies"); + ADD_STRINGSHARE(e_connman_prop_technologies_enabled, "EnabledTechnologies"); + ADD_STRINGSHARE(e_connman_prop_technologies_connected, + "ConnectedTechnologies"); - if (!e_connman_iface_service) - e_connman_iface_service = eina_stringshare_add("net.connman.Service"); +#undef ADD_STRINGSHARE - if (!e_connman_iface_connection) - e_connman_iface_connection = eina_stringshare_add("net.connman.Connection"); - - if (!e_connman_iface_technology) - e_connman_iface_technology = eina_stringshare_add("net.connman.Technology"); - - if (!e_connman_prop_available) - e_connman_prop_available = eina_stringshare_add("Available"); - - if (!e_connman_prop_connections) - e_connman_prop_connections = eina_stringshare_add("Connections"); - - if (!e_connman_prop_default) - e_connman_prop_default = eina_stringshare_add("Default"); - - if (!e_connman_prop_ipv4) - e_connman_prop_ipv4 = eina_stringshare_add("IPv4"); - - if (!e_connman_prop_ipv4_configuration) - e_connman_prop_ipv4_configuration = eina_stringshare_add("IPv4.Configuration"); - - if (!e_connman_prop_ethernet) - e_connman_prop_ethernet = eina_stringshare_add("Ethernet"); - - if (!e_connman_prop_method) - e_connman_prop_method = eina_stringshare_add("Method"); - - if (!e_connman_prop_address) - e_connman_prop_address = eina_stringshare_add("Address"); - - if (!e_connman_prop_gateway) - e_connman_prop_gateway = eina_stringshare_add("Gateway"); - - if (!e_connman_prop_netmask) - e_connman_prop_netmask = eina_stringshare_add("Netmask"); - - if (!e_connman_prop_mtu) - e_connman_prop_mtu = eina_stringshare_add("MTU"); - - if (!e_connman_prop_name) - e_connman_prop_name = eina_stringshare_add("Name"); - - if (!e_connman_prop_offline_mode) - e_connman_prop_offline_mode = eina_stringshare_add("OfflineMode"); - - if (!e_connman_prop_policy) - e_connman_prop_policy = eina_stringshare_add("Policy"); - - if (!e_connman_prop_priority) - e_connman_prop_priority = eina_stringshare_add("Priority"); - - if (!e_connman_prop_profiles) - e_connman_prop_profiles = eina_stringshare_add("Profiles"); - - if (!e_connman_prop_profile_active) - e_connman_prop_profile_active = eina_stringshare_add("ActiveProfile"); - - if (!e_connman_prop_services) - e_connman_prop_services = eina_stringshare_add("Services"); - - if (!e_connman_prop_technologies) - e_connman_prop_technologies = eina_stringshare_add("Technologies"); - - if (!e_connman_prop_remember) - e_connman_prop_remember = eina_stringshare_add("Remember"); - - if (!e_connman_prop_state) - e_connman_prop_state = eina_stringshare_add("State"); - - if (!e_connman_prop_strength) - e_connman_prop_strength = eina_stringshare_add("Strength"); - - if (!e_connman_prop_type) - e_connman_prop_type = eina_stringshare_add("Type"); - - if (!e_connman_prop_error) - e_connman_prop_error = eina_stringshare_add("Error"); - - if (!e_connman_prop_mode) - e_connman_prop_mode = eina_stringshare_add("Mode"); - - if (!e_connman_prop_security) - e_connman_prop_security = eina_stringshare_add("Security"); - - if (!e_connman_prop_passphrase) - e_connman_prop_passphrase = eina_stringshare_add("Passphrase"); - - if (!e_connman_prop_passphrase_required) - e_connman_prop_passphrase_required = eina_stringshare_add("PassphraseRequired"); - - if (!e_connman_prop_login_required) - e_connman_prop_login_required = eina_stringshare_add("LoginRequired"); - - if (!e_connman_prop_favorite) - e_connman_prop_favorite = eina_stringshare_add("Favorite"); - - if (!e_connman_prop_immutable) - e_connman_prop_immutable = eina_stringshare_add("Immutable"); - - if (!e_connman_prop_auto_connect) - e_connman_prop_auto_connect = eina_stringshare_add("AutoConnect"); - - if (!e_connman_prop_setup_required) - e_connman_prop_setup_required = eina_stringshare_add("SetupRequired"); - - if (!e_connman_prop_apn) - e_connman_prop_apn = eina_stringshare_add("APN"); - - if (!e_connman_prop_mcc) - e_connman_prop_mcc = eina_stringshare_add("MCC"); - - if (!e_connman_prop_mnc) - e_connman_prop_mnc = eina_stringshare_add("MNC"); - - if (!e_connman_prop_roaming) - e_connman_prop_roaming = eina_stringshare_add("Roaming"); - - if (!e_connman_prop_technology_default) - e_connman_prop_technology_default = eina_stringshare_add("DefaultTechnology"); - - if (!e_connman_prop_technologies_available) - e_connman_prop_technologies_available = eina_stringshare_add("AvailableTechnologies"); - - if (!e_connman_prop_technologies_enabled) - e_connman_prop_technologies_enabled = eina_stringshare_add("EnabledTechnologies"); - - if (!e_connman_prop_technologies_connected) - e_connman_prop_technologies_connected = eina_stringshare_add("ConnectedTechnologies"); - e_connman_conn = edbus_conn; cb_name_owner_changed = e_dbus_signal_handler_add (e_connman_conn, E_DBUS_FDO_BUS, E_DBUS_FDO_PATH, E_DBUS_FDO_INTERFACE, "NameOwnerChanged", |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:19:19
|
Log: e_dbus/connman: add Ethernet.Interface property Author: lucas Date: 2011-11-14 07:19:10 -0800 (Mon, 14 Nov 2011) New Revision: 65177 Trac: http://trac.enlightenment.org/e/changeset/65177 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:03 UTC (rev 65176) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:10 UTC (rev 65177) @@ -170,6 +170,7 @@ EAPI Eina_Bool e_connman_service_ipv4_configuration_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_ethernet_interface_get(const E_Connman_Element *service, const char **iface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_mtu_get(const E_Connman_Element *service, unsigned short *mtu) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:03 UTC (rev 65176) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:10 UTC (rev 65177) @@ -29,6 +29,7 @@ const char *e_connman_prop_ipv4 = NULL; const char *e_connman_prop_ipv4_configuration = NULL; const char *e_connman_prop_ethernet = NULL; +const char *e_connman_prop_interface = NULL; const char *e_connman_prop_method = NULL; const char *e_connman_prop_address = NULL; const char *e_connman_prop_gateway = NULL; @@ -277,6 +278,7 @@ ADD_STRINGSHARE(e_connman_prop_ipv4, "IPv4"); ADD_STRINGSHARE(e_connman_prop_ipv4_configuration, "IPv4.Configuration"); ADD_STRINGSHARE(e_connman_prop_ethernet, "Ethernet"); + ADD_STRINGSHARE(e_connman_prop_interface, "Interface"); ADD_STRINGSHARE(e_connman_prop_method, "Method"); ADD_STRINGSHARE(e_connman_prop_address, "Address"); ADD_STRINGSHARE(e_connman_prop_gateway, "Gateway"); @@ -374,6 +376,7 @@ _stringshare_del(&e_connman_prop_ipv4); _stringshare_del(&e_connman_prop_ipv4_configuration); _stringshare_del(&e_connman_prop_ethernet); + _stringshare_del(&e_connman_prop_interface); _stringshare_del(&e_connman_prop_method); _stringshare_del(&e_connman_prop_address); _stringshare_del(&e_connman_prop_gateway); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:03 UTC (rev 65176) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:10 UTC (rev 65177) @@ -40,6 +40,7 @@ extern const char *e_connman_prop_ipv4; extern const char *e_connman_prop_ipv4_configuration; extern const char *e_connman_prop_ethernet; +extern const char *e_connman_prop_interface; extern const char *e_connman_prop_method; extern const char *e_connman_prop_address; extern const char *e_connman_prop_gateway; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:03 UTC (rev 65176) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:10 UTC (rev 65177) @@ -1203,6 +1203,32 @@ } /** + * Get property "Ethernet.Interface" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Interface name (for example eth0). + * + * @param service path to get property. + * @param iface where to store the property value, must be a pointer + * to string (const char **), it will not be allocated or + * copied and references will be valid until element changes, + * so copy it if you want to use it later. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_ethernet_interface_get(const E_Connman_Element *service, const char **iface) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(iface, EINA_FALSE); + return e_connman_element_property_dict_get_stringshared + (service, e_connman_prop_ethernet, e_connman_prop_interface, NULL, iface); +} + +/** * Get property "Ethernet.Address" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:19:22
|
Log: e_dbus/connman: add Ethernet.Speed property Author: lucas Date: 2011-11-14 07:19:16 -0800 (Mon, 14 Nov 2011) New Revision: 65178 Trac: http://trac.enlightenment.org/e/changeset/65178 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:10 UTC (rev 65177) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:16 UTC (rev 65178) @@ -173,6 +173,7 @@ EAPI Eina_Bool e_connman_service_ethernet_interface_get(const E_Connman_Element *service, const char **iface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_mtu_get(const E_Connman_Element *service, unsigned short *mtu) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_ethernet_speed_get(const E_Connman_Element *service, unsigned short *speed) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; /* Methods to configure IPv4 service */ EAPI Eina_Bool e_connman_service_ipv4_configure_dhcp(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; @@ -185,7 +186,6 @@ EAPI Eina_Bool e_connman_technology_name_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_technology_type_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -// TODO: ethernet_speed_get (not in connman yet) // TODO: ethernet_duplex_get (not in connman yet) /* Low-Level API: Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:10 UTC (rev 65177) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:16 UTC (rev 65178) @@ -30,6 +30,7 @@ const char *e_connman_prop_ipv4_configuration = NULL; const char *e_connman_prop_ethernet = NULL; const char *e_connman_prop_interface = NULL; +const char *e_connman_prop_speed = NULL; const char *e_connman_prop_method = NULL; const char *e_connman_prop_address = NULL; const char *e_connman_prop_gateway = NULL; @@ -279,6 +280,7 @@ ADD_STRINGSHARE(e_connman_prop_ipv4_configuration, "IPv4.Configuration"); ADD_STRINGSHARE(e_connman_prop_ethernet, "Ethernet"); ADD_STRINGSHARE(e_connman_prop_interface, "Interface"); + ADD_STRINGSHARE(e_connman_prop_speed, "Speed"); ADD_STRINGSHARE(e_connman_prop_method, "Method"); ADD_STRINGSHARE(e_connman_prop_address, "Address"); ADD_STRINGSHARE(e_connman_prop_gateway, "Gateway"); @@ -377,6 +379,7 @@ _stringshare_del(&e_connman_prop_ipv4_configuration); _stringshare_del(&e_connman_prop_ethernet); _stringshare_del(&e_connman_prop_interface); + _stringshare_del(&e_connman_prop_speed); _stringshare_del(&e_connman_prop_method); _stringshare_del(&e_connman_prop_address); _stringshare_del(&e_connman_prop_gateway); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:10 UTC (rev 65177) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:16 UTC (rev 65178) @@ -41,6 +41,7 @@ extern const char *e_connman_prop_ipv4_configuration; extern const char *e_connman_prop_ethernet; extern const char *e_connman_prop_interface; +extern const char *e_connman_prop_speed; extern const char *e_connman_prop_method; extern const char *e_connman_prop_address; extern const char *e_connman_prop_gateway; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:10 UTC (rev 65177) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:16 UTC (rev 65178) @@ -1229,6 +1229,29 @@ } /** + * Get property "Ethernet.Speed" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Selected speed of the line. This information might not always be available. + * + * @param service path to get property. + * @param speed where to store the property value. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_ethernet_speed_get(const E_Connman_Element *service, unsigned short *speed) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(speed, EINA_FALSE); + return e_connman_element_property_dict_get_stringshared + (service, e_connman_prop_ethernet, e_connman_prop_speed, NULL, speed); +} + +/** * Get property "Ethernet.Address" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:19:28
|
Log: e_dbus/connman: add Ethernet.Duplex property Author: lucas Date: 2011-11-14 07:19:22 -0800 (Mon, 14 Nov 2011) New Revision: 65179 Trac: http://trac.enlightenment.org/e/changeset/65179 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:16 UTC (rev 65178) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:22 UTC (rev 65179) @@ -174,6 +174,7 @@ EAPI Eina_Bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_mtu_get(const E_Connman_Element *service, unsigned short *mtu) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_speed_get(const E_Connman_Element *service, unsigned short *speed) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_ethernet_duplex_get(const E_Connman_Element *service, const char **duplex) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; /* Methods to configure IPv4 service */ EAPI Eina_Bool e_connman_service_ipv4_configure_dhcp(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; @@ -186,8 +187,6 @@ EAPI Eina_Bool e_connman_technology_name_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_technology_type_get(const E_Connman_Element *technology, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; -// TODO: ethernet_duplex_get (not in connman yet) - /* Low-Level API: * * Should just be used to work around problems until proper solution Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:16 UTC (rev 65178) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:22 UTC (rev 65179) @@ -31,6 +31,7 @@ const char *e_connman_prop_ethernet = NULL; const char *e_connman_prop_interface = NULL; const char *e_connman_prop_speed = NULL; +const char *e_connman_prop_duplex = NULL; const char *e_connman_prop_method = NULL; const char *e_connman_prop_address = NULL; const char *e_connman_prop_gateway = NULL; @@ -281,6 +282,7 @@ ADD_STRINGSHARE(e_connman_prop_ethernet, "Ethernet"); ADD_STRINGSHARE(e_connman_prop_interface, "Interface"); ADD_STRINGSHARE(e_connman_prop_speed, "Speed"); + ADD_STRINGSHARE(e_connman_prop_duplex, "Duplex"); ADD_STRINGSHARE(e_connman_prop_method, "Method"); ADD_STRINGSHARE(e_connman_prop_address, "Address"); ADD_STRINGSHARE(e_connman_prop_gateway, "Gateway"); @@ -380,6 +382,7 @@ _stringshare_del(&e_connman_prop_ethernet); _stringshare_del(&e_connman_prop_interface); _stringshare_del(&e_connman_prop_speed); + _stringshare_del(&e_connman_prop_duplex); _stringshare_del(&e_connman_prop_method); _stringshare_del(&e_connman_prop_address); _stringshare_del(&e_connman_prop_gateway); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:16 UTC (rev 65178) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:22 UTC (rev 65179) @@ -42,6 +42,7 @@ extern const char *e_connman_prop_ethernet; extern const char *e_connman_prop_interface; extern const char *e_connman_prop_speed; +extern const char *e_connman_prop_duplex; extern const char *e_connman_prop_method; extern const char *e_connman_prop_address; extern const char *e_connman_prop_gateway; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:16 UTC (rev 65178) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:22 UTC (rev 65179) @@ -1278,6 +1278,33 @@ } /** + * Get property "Ethernet.Duplex" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Selected duplex settings of the line. Possible values are "half" and "full". + * This information might not always be available. + * + * @param service path to get property. + * @param duplex where to store the property value, must be a pointer + * to string (const char **), it will not be allocated or + * copied and references will be valid until element changes, + * so copy it if you want to use it later. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_ethernet_duplex_get(const E_Connman_Element *service, const char **duplex) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(duplex, EINA_FALSE); + return e_connman_element_property_dict_get_stringshared + (service, e_connman_prop_ethernet, e_connman_prop_duplex, NULL, duplex); +} + +/** * Get property "Ethernet.MTU" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:19:47
|
Log: e_dbus/connman: add Nameservers property Author: lucas Date: 2011-11-14 07:19:40 -0800 (Mon, 14 Nov 2011) New Revision: 65182 Trac: http://trac.enlightenment.org/e/changeset/65182 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:34 UTC (rev 65181) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:40 UTC (rev 65182) @@ -151,6 +151,7 @@ EAPI Eina_Bool e_connman_service_login_required_get(const E_Connman_Element *service, Eina_Bool *login_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_roaming_get(const E_Connman_Element *service, Eina_Bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_nameservers_get(const E_Connman_Element *service, unsigned int *count, const char ***nameserver) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ipv4_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:34 UTC (rev 65181) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:40 UTC (rev 65182) @@ -62,6 +62,7 @@ const char *e_connman_prop_technologies_available = NULL; const char *e_connman_prop_technologies_enabled = NULL; const char *e_connman_prop_technologies_connected = NULL; +const char *e_connman_prop_nameservers = NULL; int _e_dbus_connman_log_dom = -1; @@ -310,6 +311,7 @@ ADD_STRINGSHARE(e_connman_prop_technologies_enabled, "EnabledTechnologies"); ADD_STRINGSHARE(e_connman_prop_technologies_connected, "ConnectedTechnologies"); + ADD_STRINGSHARE(e_connman_prop_nameservers, "Nameservers"); #undef ADD_STRINGSHARE @@ -403,6 +405,7 @@ _stringshare_del(&e_connman_prop_technologies_available); _stringshare_del(&e_connman_prop_technologies_enabled); _stringshare_del(&e_connman_prop_technologies_connected); + _stringshare_del(&e_connman_prop_nameservers); if (pending_get_name_owner) { Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:34 UTC (rev 65181) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:40 UTC (rev 65182) @@ -73,6 +73,7 @@ extern const char *e_connman_prop_technologies_enabled; extern const char *e_connman_prop_technologies_connected; extern const char *e_connman_prop_login_required; +extern const char *e_connman_prop_nameservers; extern int _e_dbus_connman_log_dom; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:34 UTC (rev 65181) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:40 UTC (rev 65182) @@ -657,6 +657,46 @@ } /** + * Get property "Nameservers" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * The list of currently active nameservers for this service. If the server is + * not in READY or ONLINE state than this list will be empty. + * + * Global nameservers are automatically added to this list. + * + * The array represents a sorted list of the current nameservers. The first one + * has the highest priority and is used by default. + * + * When using DHCP this array represents the nameservers provided by the + * network. In case of manual settings, the ones from Nameservers.Configuration + * are used. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param nameservers array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_nameservers_get(const E_Connman_Element *service, unsigned int *count, const char ***nameservers) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(nameservers, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_strings_array_get_stringshared + (service, e_connman_prop_nameservers, count, nameservers); +} + +/** * Get property "IPv4.Method" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:19:53
|
Log: e_dbus/connman: add Domains property Author: lucas Date: 2011-11-14 07:19:46 -0800 (Mon, 14 Nov 2011) New Revision: 65183 Trac: http://trac.enlightenment.org/e/changeset/65183 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:40 UTC (rev 65182) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:46 UTC (rev 65183) @@ -152,6 +152,7 @@ EAPI Eina_Bool e_connman_service_roaming_get(const E_Connman_Element *service, Eina_Bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_nameservers_get(const E_Connman_Element *service, unsigned int *count, const char ***nameserver) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_domains_get(const E_Connman_Element *service, unsigned int *count, const char ***domains) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ipv4_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:40 UTC (rev 65182) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:46 UTC (rev 65183) @@ -63,6 +63,7 @@ const char *e_connman_prop_technologies_enabled = NULL; const char *e_connman_prop_technologies_connected = NULL; const char *e_connman_prop_nameservers = NULL; +const char *e_connman_prop_domains = NULL; int _e_dbus_connman_log_dom = -1; @@ -312,6 +313,7 @@ ADD_STRINGSHARE(e_connman_prop_technologies_connected, "ConnectedTechnologies"); ADD_STRINGSHARE(e_connman_prop_nameservers, "Nameservers"); + ADD_STRINGSHARE(e_connman_prop_domains, "Domains"); #undef ADD_STRINGSHARE @@ -406,6 +408,7 @@ _stringshare_del(&e_connman_prop_technologies_enabled); _stringshare_del(&e_connman_prop_technologies_connected); _stringshare_del(&e_connman_prop_nameservers); + _stringshare_del(&e_connman_prop_domains); if (pending_get_name_owner) { Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:40 UTC (rev 65182) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:46 UTC (rev 65183) @@ -74,6 +74,7 @@ extern const char *e_connman_prop_technologies_connected; extern const char *e_connman_prop_login_required; extern const char *e_connman_prop_nameservers; +extern const char *e_connman_prop_domains; extern int _e_dbus_connman_log_dom; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:40 UTC (rev 65182) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:46 UTC (rev 65183) @@ -697,6 +697,38 @@ } /** + * Get property "Domains" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * The list of currently active domains for this service. If the server is + * not in READY or ONLINE state than this list will be empty. + * + * The list of currently used search domains. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param domains array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_domains_get(const E_Connman_Element *service, unsigned int *count, const char ***domains) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(domains, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_strings_array_get_stringshared + (service, e_connman_prop_domains, count, domains); +} +/** * Get property "IPv4.Method" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:19:59
|
Log: e_dbus/connman: allow a property inside a dict to be an array Author: lucas Date: 2011-11-14 07:19:52 -0800 (Mon, 14 Nov 2011) New Revision: 65184 Trac: http://trac.enlightenment.org/e/changeset/65184 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman_element.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:46 UTC (rev 65183) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:52 UTC (rev 65184) @@ -212,6 +212,8 @@ EAPI Eina_Bool e_connman_element_property_type_get_stringshared(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_property_type_get(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_property_dict_get_stringshared(const E_Connman_Element *element, const char *dict_name, const char *key_name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_element_property_dict_strings_array_get_stringshared(const E_Connman_Element *element, const char *dict_name, const char *key, unsigned int *count, const char ***strings) EINA_ARG_NONNULL(1, 2, 3, 4) EINA_WARN_UNUSED_RESULT; + EAPI Eina_Bool e_connman_element_property_get_stringshared(const E_Connman_Element *element, const char *name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_property_get(const E_Connman_Element *element, const char *name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-14 15:19:46 UTC (rev 65183) +++ trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-14 15:19:52 UTC (rev 65184) @@ -49,12 +49,13 @@ const char *name; int type; union { - Eina_Bool boolean; - const char *str; - unsigned short u16; - unsigned int u32; - unsigned char byte; - const char *path; + Eina_Bool boolean; + const char *str; + unsigned short u16; + unsigned int u32; + unsigned char byte; + const char *path; + E_Connman_Array *array; } value; }; @@ -1837,6 +1838,10 @@ *(const char **)value = entry->value.path; return EINA_TRUE; + case DBUS_TYPE_ARRAY: + *(E_Connman_Array **)value = entry->value.array; + return EINA_TRUE; + default: ERR("don't know how to get property %s, key %s type %c (%d)", dict_name, key, entry->type, entry->type); @@ -1849,6 +1854,69 @@ return EINA_FALSE; } +Eina_Bool +e_connman_element_property_dict_strings_array_get_stringshared(const E_Connman_Element *element, const char *dict_name, const char *key, unsigned int *count, const char ***strings) +{ + const char **ret, **p; + Eina_Array_Iterator iterator; + E_Connman_Array *array; + unsigned int i; + int type; + void *item; + + EINA_SAFETY_ON_NULL_RETURN_VAL(element, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(dict_name, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(key, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(strings, EINA_FALSE); + + *count = 0; + *strings = NULL; + + if (!e_connman_element_property_dict_get_stringshared(element, dict_name, + key, &type, &array)) + return EINA_FALSE; + + if (type != DBUS_TYPE_ARRAY) + { + ERR("property %s.%s is not an array!", dict_name, key); + return EINA_FALSE; + } + + if ((!array) || (!array->array) || (array->type == DBUS_TYPE_INVALID)) + return EINA_FALSE; + + if (array->type != DBUS_TYPE_STRING) + { + ERR("property %s.%s is not an array of strings!", dict_name, key); + return EINA_FALSE; + } + + *count = eina_array_count_get(array->array); + ret = malloc(*count * sizeof(char *)); + if (!ret) + { + ERR("could not allocate return array of %d strings: %s", + *count, strerror(errno)); + *count = 0; + return EINA_FALSE; + } + + p = ret; + + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator) + { + if (!item) + continue; + + *p = item; + p++; + } + *count = p - ret; + *strings = ret; + return EINA_TRUE; +} + /** * Get property value given its name. * |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:20:09
|
Log: e_dbus/connman: add readonly Proxy properties Properties inside Proxy dictionary include: Method, URL, Servers and Excludes. Author: lucas Date: 2011-11-14 07:19:58 -0800 (Mon, 14 Nov 2011) New Revision: 65185 Trac: http://trac.enlightenment.org/e/changeset/65185 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:52 UTC (rev 65184) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:58 UTC (rev 65185) @@ -164,6 +164,11 @@ EAPI Eina_Bool e_connman_service_ipv4_configuration_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ipv4_configuration_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_url_get(const E_Connman_Element *service, const char **url) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_servers_get(const E_Connman_Element *service, unsigned int *count, const char ***servers) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_excludes_get(const E_Connman_Element *service, unsigned int *count, const char ***excludes) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; + EAPI Eina_Bool e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_interface_get(const E_Connman_Element *service, const char **iface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:52 UTC (rev 65184) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:58 UTC (rev 65185) @@ -64,6 +64,10 @@ const char *e_connman_prop_technologies_connected = NULL; const char *e_connman_prop_nameservers = NULL; const char *e_connman_prop_domains = NULL; +const char *e_connman_prop_proxy = NULL; +const char *e_connman_prop_url = NULL; +const char *e_connman_prop_servers = NULL; +const char *e_connman_prop_excludes = NULL; int _e_dbus_connman_log_dom = -1; @@ -314,6 +318,10 @@ "ConnectedTechnologies"); ADD_STRINGSHARE(e_connman_prop_nameservers, "Nameservers"); ADD_STRINGSHARE(e_connman_prop_domains, "Domains"); + ADD_STRINGSHARE(e_connman_prop_proxy, "Proxy"); + ADD_STRINGSHARE(e_connman_prop_url, "URL"); + ADD_STRINGSHARE(e_connman_prop_servers, "Servers"); + ADD_STRINGSHARE(e_connman_prop_excludes, "Excludes"); #undef ADD_STRINGSHARE @@ -409,6 +417,10 @@ _stringshare_del(&e_connman_prop_technologies_connected); _stringshare_del(&e_connman_prop_nameservers); _stringshare_del(&e_connman_prop_domains); + _stringshare_del(&e_connman_prop_proxy); + _stringshare_del(&e_connman_prop_url); + _stringshare_del(&e_connman_prop_servers); + _stringshare_del(&e_connman_prop_excludes); if (pending_get_name_owner) { Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:52 UTC (rev 65184) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:58 UTC (rev 65185) @@ -75,6 +75,10 @@ extern const char *e_connman_prop_login_required; extern const char *e_connman_prop_nameservers; extern const char *e_connman_prop_domains; +extern const char *e_connman_prop_proxy; +extern const char *e_connman_prop_url; +extern const char *e_connman_prop_servers; +extern const char *e_connman_prop_excludes; extern int _e_dbus_connman_log_dom; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:52 UTC (rev 65184) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:58 UTC (rev 65185) @@ -1062,13 +1062,13 @@ } /** - * Get property "Ethernet.Method" value. + * Get property "Proxy.Method" value. * * If this property isn't found then @c EINA_FALSE is returned. * If @c EINA_FALSE is returned, then this call failed and parameter-returned * values shall be considered invalid. * - * The Ethernet configuration method. Possible values here "auto" and "manual". + * Possible values are "direct", "auto" and "manual". * * @param service path to get property. * @param method where to store the property value, must be a pointer @@ -1079,15 +1079,110 @@ * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. */ Eina_Bool -e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) +e_connman_service_proxy_method_get(const E_Connman_Element *service, const char **method) { EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(method, EINA_FALSE); return e_connman_element_property_dict_get_stringshared - (service, e_connman_prop_ethernet, e_connman_prop_method, NULL, method); + (service, e_connman_prop_proxy, e_connman_prop_method, NULL, method); } /** + * Get property "Proxy.URL" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Automatic proxy configuration URL. Used by "auto" method. + * + * @param service path to get property. + * @param url where to store the property value, must be a pointer + * to string (const char **), it will not be allocated or + * copied and references will be valid until element changes, + * so copy it if you want to use it later. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_proxy_url_get(const E_Connman_Element *service, const char **url) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(url, EINA_FALSE); + return e_connman_element_property_dict_get_stringshared + (service, e_connman_prop_proxy, e_connman_prop_url, NULL, url); +} + +/** + * Get property "Proxy.Servers" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * List of proxy URIs. The URI without a protocol will be interpreted as the + * generic proxy URI. All others will target a specific protocol and only once. + * Example of generic proxy server entry would be like this: + * "server.example.com:911". + * + * Used when "manual" method is set. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param servers array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_proxy_servers_get(const E_Connman_Element *service, unsigned int *count, const char ***servers) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(servers, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_property_dict_strings_array_get_stringshared + (service, e_connman_prop_proxy, e_connman_prop_servers, count, servers); +} + +/** + * Get property "Proxy.Excludes" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * List of hosts which can be accessed directly. + * + * Used when "manual" method is set. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param excludes array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_proxy_excludes_get(const E_Connman_Element *service, unsigned int *count, const char ***excludes) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(excludes, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_property_dict_strings_array_get_stringshared + (service, e_connman_prop_proxy, e_connman_prop_excludes, count, excludes); +} + +/** * Get property "Ethernet.Interface" value. * * If this property isn't found then @c EINA_FALSE is returned. @@ -1114,6 +1209,32 @@ } /** + * Get property "Ethernet.Method" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * The Ethernet configuration method. Possible values here "auto" and "manual". + * + * @param service path to get property. + * @param method where to store the property value, must be a pointer + * to string (const char **), it will not be allocated or + * copied and references will be valid until element changes, + * so copy it if you want to use it later. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(method, EINA_FALSE); + return e_connman_element_property_dict_get_stringshared + (service, e_connman_prop_ethernet, e_connman_prop_method, NULL, method); +} + +/** * Get property "Ethernet.Speed" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:20:11
|
Log: e_dbus/connman: add getters for Proxy.Configuration properties Properties inside Proxy.Configuration dictionary include: Method, URL, Servers and Excludes. Same values as Proxy property. The Proxy represents the actual system configuration while this allows user configuration. Right now there's still no way to set these properties. Author: lucas Date: 2011-11-14 07:20:04 -0800 (Mon, 14 Nov 2011) New Revision: 65186 Trac: http://trac.enlightenment.org/e/changeset/65186 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:19:58 UTC (rev 65185) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:20:04 UTC (rev 65186) @@ -169,6 +169,11 @@ EAPI Eina_Bool e_connman_service_proxy_servers_get(const E_Connman_Element *service, unsigned int *count, const char ***servers) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_proxy_excludes_get(const E_Connman_Element *service, unsigned int *count, const char ***excludes) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_configuration_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_configuration_url_get(const E_Connman_Element *service, const char **url) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_configuration_servers_get(const E_Connman_Element *service, unsigned int *count, const char ***servers) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_service_proxy_configuration_excludes_get(const E_Connman_Element *service, unsigned int *count, const char ***excludes) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; + EAPI Eina_Bool e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_interface_get(const E_Connman_Element *service, const char **iface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:19:58 UTC (rev 65185) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:20:04 UTC (rev 65186) @@ -65,6 +65,7 @@ const char *e_connman_prop_nameservers = NULL; const char *e_connman_prop_domains = NULL; const char *e_connman_prop_proxy = NULL; +const char *e_connman_prop_proxy_configuration = NULL; const char *e_connman_prop_url = NULL; const char *e_connman_prop_servers = NULL; const char *e_connman_prop_excludes = NULL; @@ -319,6 +320,7 @@ ADD_STRINGSHARE(e_connman_prop_nameservers, "Nameservers"); ADD_STRINGSHARE(e_connman_prop_domains, "Domains"); ADD_STRINGSHARE(e_connman_prop_proxy, "Proxy"); + ADD_STRINGSHARE(e_connman_prop_proxy_configuration, "Proxy.Configuration"); ADD_STRINGSHARE(e_connman_prop_url, "URL"); ADD_STRINGSHARE(e_connman_prop_servers, "Servers"); ADD_STRINGSHARE(e_connman_prop_excludes, "Excludes"); @@ -418,6 +420,7 @@ _stringshare_del(&e_connman_prop_nameservers); _stringshare_del(&e_connman_prop_domains); _stringshare_del(&e_connman_prop_proxy); + _stringshare_del(&e_connman_prop_proxy_configuration); _stringshare_del(&e_connman_prop_url); _stringshare_del(&e_connman_prop_servers); _stringshare_del(&e_connman_prop_excludes); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:19:58 UTC (rev 65185) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:20:04 UTC (rev 65186) @@ -76,6 +76,7 @@ extern const char *e_connman_prop_nameservers; extern const char *e_connman_prop_domains; extern const char *e_connman_prop_proxy; +extern const char *e_connman_prop_proxy_configuration; extern const char *e_connman_prop_url; extern const char *e_connman_prop_servers; extern const char *e_connman_prop_excludes; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:19:58 UTC (rev 65185) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:20:04 UTC (rev 65186) @@ -1183,6 +1183,139 @@ } /** + * Get property "Proxy.Configuration.Method" value. + * + * Unlike Proxy.Configuration.Method, this is the user-set value, rather than + * the actual value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Possible values are "direct", "auto" and "manual". + * + * @param service path to get property. + * @param method where to store the property value, must be a pointer + * to string (const char **), it will not be allocated or + * copied and references will be valid until element changes, + * so copy it if you want to use it later. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_proxy_configuration_method_get(const E_Connman_Element *service, const char **method) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(method, EINA_FALSE); + return e_connman_element_property_dict_get_stringshared + (service, e_connman_prop_proxy_configuration, e_connman_prop_method, NULL, method); +} + +/** + * Get property "Proxy.Configuration.URL" value. + * + * Unlike Proxy.URL, this is the user-set value, rather than the + * actual value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Automatic proxy configuration URL. Used by "auto" method. + * + * @param service path to get property. + * @param url where to store the property value, must be a pointer + * to string (const char **), it will not be allocated or + * copied and references will be valid until element changes, + * so copy it if you want to use it later. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_proxy_configuration_url_get(const E_Connman_Element *service, const char **url) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(url, EINA_FALSE); + return e_connman_element_property_dict_get_stringshared + (service, e_connman_prop_proxy_configuration, e_connman_prop_url, NULL, url); +} + +/** + * Get property "Proxy.Configuration.Servers" value. + * + * Unlike Proxy.Servers, this is the user-set value, rather than the + * actual value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * List of proxy URIs. The URI without a protocol will be interpreted as the + * generic proxy URI. All others will target a specific protocol and only once. + * Example of generic proxy server entry would be like this: + * "server.example.com:911". + * + * Used when "manual" method is set. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param servers array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_proxy_configuration_servers_get(const E_Connman_Element *service, unsigned int *count, const char ***servers) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(servers, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_property_dict_strings_array_get_stringshared + (service, e_connman_prop_proxy_configuration, e_connman_prop_servers, count, servers); +} + +/** + * Get property "Proxy.Configuration.Excludes" value. + * + * Unlike Proxy.Excludes, this is the user-set value, rather than the + * actual value. + + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * List of hosts which can be accessed directly. + * + * Used when "manual" method is set. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param excludes array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_proxy_configuration_excludes_get(const E_Connman_Element *service, unsigned int *count, const char ***excludes) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(excludes, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_property_dict_strings_array_get_stringshared + (service, e_connman_prop_proxy_configuration, e_connman_prop_excludes, count, excludes); +} + +/** * Get property "Ethernet.Interface" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:20:17
|
Log: e_dbus/connman: set array property Author: lucas Date: 2011-11-14 07:20:10 -0800 (Mon, 14 Nov 2011) New Revision: 65187 Trac: http://trac.enlightenment.org/e/changeset/65187 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman_element.c Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:20:04 UTC (rev 65186) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2011-11-14 15:20:10 UTC (rev 65187) @@ -217,6 +217,8 @@ EAPI Eina_Bool e_connman_element_property_set(E_Connman_Element *element, const char *prop, int type, const void *value) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_property_set_full(E_Connman_Element *element, const char *prop, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; +EAPI Eina_Bool e_connman_element_property_array_set_full(E_Connman_Element *element, const char *prop, int type, const Eina_List *values, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; + EAPI Eina_Bool e_connman_element_property_dict_set_full(E_Connman_Element *element, const char *prop, const char *key, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool e_connman_element_property_type_get_stringshared(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; Modified: trunk/e_dbus/src/lib/connman/e_connman_element.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-14 15:20:04 UTC (rev 65186) +++ trunk/e_dbus/src/lib/connman/e_connman_element.c 2011-11-14 15:20:10 UTC (rev 65187) @@ -1575,6 +1575,71 @@ } /** + * Call method SetProperty(prop, value) at the given element on server, when + * value is an array. + * + * This is a server call, not local, so it may fail and in that case + * no property is updated locally. If the value was set the event + * E_CONNMAN_EVENT_ELEMENT_UPDATED will be added to main loop. + * + * @param element to call method on server. + * @param prop property name. + * @param type DBus type to use for value. + * @param value pointer to value, just like regular DBus, see + * dbus_message_iter_append_basic(). + * @param cb function to call when server replies or some error happens. + * @param data data to give to cb when it is called. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_element_property_array_set_full(E_Connman_Element *element, const char *prop, int type, const Eina_List *values, E_DBus_Method_Return_Cb cb, const void *data) +{ + const char name[] = "SetProperty"; + char type_sig[2] = { type, '\0'}; + char array_sig[3] = { DBUS_TYPE_ARRAY, type, '\0' }; + DBusMessage *msg; + DBusMessageIter itr, variant, array; + const Eina_List *l; + void *entry; + + EINA_SAFETY_ON_NULL_RETURN_VAL(element, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(prop, EINA_FALSE); + + msg = dbus_message_new_method_call + (e_connman_system_bus_name_get(), element->path, element->interface, name); + + if (!msg) + return EINA_FALSE; + + dbus_message_iter_init_append(msg, &itr); + dbus_message_iter_append_basic(&itr, DBUS_TYPE_STRING, &prop); + + dbus_message_iter_open_container(&itr, DBUS_TYPE_VARIANT, array_sig, + &variant); + dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY, type_sig, + &array); + + if (type == DBUS_TYPE_STRING || type == DBUS_TYPE_OBJECT_PATH) + { + EINA_LIST_FOREACH(values, l, entry) + dbus_message_iter_append_basic(&array, type, &entry); + } + else + { + EINA_LIST_FOREACH(values, l, entry) + dbus_message_iter_append_basic(&array, type, entry); + } + + dbus_message_iter_close_container(&variant, &array); + dbus_message_iter_close_container(&itr, &variant); + + return e_connman_element_message_send(element, name, NULL, msg, + &element->_pending.property_set, + cb, data); +} + +/** * Call method SetProperty(prop, value) at the given element on server. * * This is the simple version and there is no check of server reply |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:20:23
|
Log: e_dbus/connman: add Nameservers.Configuration property Author: lucas Date: 2011-11-14 07:20:16 -0800 (Mon, 14 Nov 2011) New Revision: 65188 Trac: http://trac.enlightenment.org/e/changeset/65188 Modified: trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:20:10 UTC (rev 65187) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:20:16 UTC (rev 65188) @@ -63,6 +63,7 @@ const char *e_connman_prop_technologies_enabled = NULL; const char *e_connman_prop_technologies_connected = NULL; const char *e_connman_prop_nameservers = NULL; +const char *e_connman_prop_nameservers_configuration = NULL; const char *e_connman_prop_domains = NULL; const char *e_connman_prop_proxy = NULL; const char *e_connman_prop_proxy_configuration = NULL; @@ -318,6 +319,8 @@ ADD_STRINGSHARE(e_connman_prop_technologies_connected, "ConnectedTechnologies"); ADD_STRINGSHARE(e_connman_prop_nameservers, "Nameservers"); + ADD_STRINGSHARE(e_connman_prop_nameservers_configuration, + "Nameservers.Configuration"); ADD_STRINGSHARE(e_connman_prop_domains, "Domains"); ADD_STRINGSHARE(e_connman_prop_proxy, "Proxy"); ADD_STRINGSHARE(e_connman_prop_proxy_configuration, "Proxy.Configuration"); @@ -418,6 +421,7 @@ _stringshare_del(&e_connman_prop_technologies_enabled); _stringshare_del(&e_connman_prop_technologies_connected); _stringshare_del(&e_connman_prop_nameservers); + _stringshare_del(&e_connman_prop_nameservers_configuration); _stringshare_del(&e_connman_prop_domains); _stringshare_del(&e_connman_prop_proxy); _stringshare_del(&e_connman_prop_proxy_configuration); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:20:10 UTC (rev 65187) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:20:16 UTC (rev 65188) @@ -74,6 +74,7 @@ extern const char *e_connman_prop_technologies_connected; extern const char *e_connman_prop_login_required; extern const char *e_connman_prop_nameservers; +extern const char *e_connman_prop_nameservers_configuration; extern const char *e_connman_prop_domains; extern const char *e_connman_prop_proxy; extern const char *e_connman_prop_proxy_configuration; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:20:10 UTC (rev 65187) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:20:16 UTC (rev 65188) @@ -697,6 +697,78 @@ } /** + * Get property "Nameservers.Configuration" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * The list of currently active nameservers for this service. If the server is + * not in READY or ONLINE state than this list will be empty. + * + * Unlike Nameservers, this is the user-set value, rather than the + * actual value. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param nameservers array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_nameservers_configuration_get(const E_Connman_Element *service, unsigned int *count, const char ***nameservers) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(nameservers, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_strings_array_get_stringshared + (service, e_connman_prop_nameservers_configuration, count, nameservers); +} + +/** + * Set property "Nameservers.Configuration" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Unlike Nameservers, this is the user-set value, rather than the actual value. + * It allows user to override the default setting. When using manual + * configuration and no global nameservers are configured, then it is useful to + * configure this setting as well. + * + * This list is sorted by priority and the first entry represents the nameserver + * with the highest priority. + * + * Changes to the domain name servers can be done at any time. It will not cause + * a disconnect of the service. However there might be small window where name + * resolution might fail. + * + * @param service path to set property. + * @param nameservers sorted list of the current nameservers. The first one has + * the highest priority and is used by default. + * @param cb function to call when server replies or some error happens. + * @param data data to give to cb when it is called. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + * @see e_connman_service_nameservers_configuration_get() + */ +Eina_Bool +e_connman_service_nameservers_configuration_set(E_Connman_Element *service, Eina_List *nameservers, E_DBus_Method_Return_Cb cb, const void *data) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(nameservers, EINA_FALSE); + return e_connman_element_property_array_set_full + (service, e_connman_prop_nameservers_configuration, + DBUS_TYPE_STRING, nameservers, cb, data); +} + +/** * Get property "Domains" value. * * If this property isn't found then @c EINA_FALSE is returned. |
From: Enlightenment S. <no-...@en...> - 2011-11-14 15:20:29
|
Log: e_dbus/connman: add Domains.Configuration property Author: lucas Date: 2011-11-14 07:20:22 -0800 (Mon, 14 Nov 2011) New Revision: 65189 Trac: http://trac.enlightenment.org/e/changeset/65189 Modified: trunk/e_dbus/src/lib/connman/e_connman.c trunk/e_dbus/src/lib/connman/e_connman_private.h trunk/e_dbus/src/lib/connman/e_connman_service.c Modified: trunk/e_dbus/src/lib/connman/e_connman.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:20:16 UTC (rev 65188) +++ trunk/e_dbus/src/lib/connman/e_connman.c 2011-11-14 15:20:22 UTC (rev 65189) @@ -65,6 +65,7 @@ const char *e_connman_prop_nameservers = NULL; const char *e_connman_prop_nameservers_configuration = NULL; const char *e_connman_prop_domains = NULL; +const char *e_connman_prop_domains_configuration = NULL; const char *e_connman_prop_proxy = NULL; const char *e_connman_prop_proxy_configuration = NULL; const char *e_connman_prop_url = NULL; @@ -322,6 +323,8 @@ ADD_STRINGSHARE(e_connman_prop_nameservers_configuration, "Nameservers.Configuration"); ADD_STRINGSHARE(e_connman_prop_domains, "Domains"); + ADD_STRINGSHARE(e_connman_prop_domains_configuration, + "Domains.Configuration"); ADD_STRINGSHARE(e_connman_prop_proxy, "Proxy"); ADD_STRINGSHARE(e_connman_prop_proxy_configuration, "Proxy.Configuration"); ADD_STRINGSHARE(e_connman_prop_url, "URL"); @@ -423,6 +426,7 @@ _stringshare_del(&e_connman_prop_nameservers); _stringshare_del(&e_connman_prop_nameservers_configuration); _stringshare_del(&e_connman_prop_domains); + _stringshare_del(&e_connman_prop_domains_configuration); _stringshare_del(&e_connman_prop_proxy); _stringshare_del(&e_connman_prop_proxy_configuration); _stringshare_del(&e_connman_prop_url); Modified: trunk/e_dbus/src/lib/connman/e_connman_private.h =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:20:16 UTC (rev 65188) +++ trunk/e_dbus/src/lib/connman/e_connman_private.h 2011-11-14 15:20:22 UTC (rev 65189) @@ -76,6 +76,7 @@ extern const char *e_connman_prop_nameservers; extern const char *e_connman_prop_nameservers_configuration; extern const char *e_connman_prop_domains; +extern const char *e_connman_prop_domains_configuration; extern const char *e_connman_prop_proxy; extern const char *e_connman_prop_proxy_configuration; extern const char *e_connman_prop_url; Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c =================================================================== --- trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:20:16 UTC (rev 65188) +++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2011-11-14 15:20:22 UTC (rev 65189) @@ -800,7 +800,80 @@ return e_connman_element_strings_array_get_stringshared (service, e_connman_prop_domains, count, domains); } + /** + * Get property "Domains.Configuration" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * The list of currently active domains for this service. If the server is + * not in READY or ONLINE state than this list will be empty. + * + * Unlike Domains, this is the user-set value, rather than the + * actual value. + * + * @param service path to get property. + * @param count return the number of elements in array. + * @param domains array with pointers to internal strings. These + * strings are not copied in any way, and they are granted to + * be eina_stringshare instances, so one can use + * eina_stringshare_ref() if he wants to save memory and cpu to + * get an extra reference. The array itself is allocated using + * malloc() and should be freed after usage is done. This + * pointer is just set if return is @c EINA_TRUE. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + */ +Eina_Bool +e_connman_service_domains_configuration_get(const E_Connman_Element *service, unsigned int *count, const char ***domains) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(domains, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(count, EINA_FALSE); + return e_connman_element_strings_array_get_stringshared + (service, e_connman_prop_domains_configuration, count, domains); +} + +/** + * Set property "Domains.Configuration" value. + * + * If this property isn't found then @c EINA_FALSE is returned. + * If @c EINA_FALSE is returned, then this call failed and parameter-returned + * values shall be considered invalid. + * + * Unlike Domains, this is the user-set value, rather than the actual value. + * It allows user to override the default setting. When using manual + * configuration and no global domains are configured, then it is useful to + * configure this setting as well. + * + * This list is sorted by priority and the first entry represents the nameserver + * with the highest priority. + * + * Changes to the domain name servers can be done at any time. It will not cause + * a disconnect of the service. However there might be small window where name + * resolution might fail. + * + * @param service path to set property. + * @param domains sorted list of the current domains. The first one has + * the highest priority and is used by default. + * @param cb function to call when server replies or some error happens. + * @param data data to give to cb when it is called. + * + * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. + * @see e_connman_service_domains_configuration_get() + */ +Eina_Bool +e_connman_service_domains_configuration_set(E_Connman_Element *service, Eina_List *domains, E_DBus_Method_Return_Cb cb, const void *data) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(domains, EINA_FALSE); + return e_connman_element_property_array_set_full + (service, e_connman_prop_domains_configuration, + DBUS_TYPE_STRING, domains, cb, data); +} + +/** * Get property "IPv4.Method" value. * * If this property isn't found then @c EINA_FALSE is returned. |