vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New code base for connman module 

ConnMan 1.0 is the first stable release and the one being packed by most
distros. Completely remove the old code, together with the
econnman-0.7x dependency. The relevant code is now maintained together
with e17 module for easier maintenance.



SVN revision: 76020
This commit is contained in:
Lucas De Marchi 2012-09-03 21:57:16 +00:00
parent 8d269d907c
commit 0d26bde204
9 changed files with 380 additions and 2386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -774,7 +774,8 @@ AC_SUBST(SOUND_LIBS)
AM_CONDITIONAL(HAVE_ECONNMAN, false)
define([CHECK_MODULE_CONNMAN],
[
AC_E_CHECK_PKG(ECONNMAN, [ edbus >= 1.2.0 econnman-0.7x >= 1.2.0 ], [], [CONNMAN=false])
AC_E_CHECK_PKG(ECONNMAN, [ edbus >= 1.2.0 ], [], [CONNMAN=false])
AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false])
])
AC_SUBST(ECONNMAN_CFLAGS)
AC_SUBST(ECONNMAN_LIBS)

20
src/modules/connman/E_Connman.h Normal file
View File

@ -0,0 +1,20 @@
#ifndef E_CONNMAN_H
#define E_CONNMAN_H
#include <stdint.h>
#include <stdio.h>
#include <Eina.h>
#include <Ecore.h>
#include <E_DBus.h>
/* Ecore Events */
extern int E_CONNMAN_EVENT_MANAGER_IN;
extern int E_CONNMAN_EVENT_MANAGER_OUT;
/* Daemon monitoring */
unsigned int e_connman_system_init(E_DBus_Connection *edbus_conn) EINA_ARG_NONNULL(1);
unsigned int e_connman_system_shutdown(void);
#endif /* E_CONNMAN_H */

5
src/modules/connman/Makefile.am
View File

@ -23,7 +23,10 @@ pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.h \
e_mod_main.c \
e_mod_config.c
e_mod_config.c \
e_connman.c \
e_connman_private.h \
E_Connman.h
module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECONNMAN_LIBS@
module_la_LDFLAGS = -module -avoid-version

162
src/modules/connman/e_connman.c Normal file
View File

@ -0,0 +1,162 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "e_connman_private.h"
#include <stdlib.h>
#include <string.h>
static const char CONNMAN_BUS_NAME[] = "net.connman";
static E_DBus_Signal_Handler *cb_name_owner_changed;
static DBusPendingCall *pending_get_name_owner;
static unsigned int init_count;
static E_DBus_Connection *conn;
EAPI int E_CONNMAN_EVENT_MANAGER_IN;
EAPI int E_CONNMAN_EVENT_MANAGER_OUT;
int _e_dbus_connman_log_dom = -1;
static inline void
_e_connman_system_name_owner_exit(void)
{
ecore_event_add(E_CONNMAN_EVENT_MANAGER_OUT, NULL, NULL, NULL);
}
static inline void
_e_connman_system_name_owner_enter(void)
{
ecore_event_add(E_CONNMAN_EVENT_MANAGER_IN, NULL, NULL, NULL);
}
static void
_e_connman_system_name_owner_changed(void *data __UNUSED__, DBusMessage *msg)
{
const char *name, *from, *to;
DBusError err;
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))
{
ERR("could not get NameOwnerChanged arguments: %s: %s",
err.name, err.message);
dbus_error_free(&err);
return;
}
if (strcmp(name, CONNMAN_BUS_NAME) != 0)
return;
DBG("NameOwnerChanged %s from=[%s] to=[%s]", name, from, to);
if (from[0] == '\0' && to[0] != '\0')
_e_connman_system_name_owner_enter();
else if (from[0] != '\0' && to[0] == '\0')
_e_connman_system_name_owner_exit();
else
ERR("unknow change from %s to %s", from, to);
}
static void
_e_connman_get_name_owner(void *data __UNUSED__, DBusMessage *msg, DBusError *err)
{
pending_get_name_owner = NULL;
DBG("get_name_owner msg=%p", msg);
if (dbus_error_is_set(err))
{
if (!strcmp(err->name, DBUS_ERROR_NAME_HAS_NO_OWNER))
ERR("could not get bus name owner: %s %s", err->name, err->message);
return;
}
_e_connman_system_name_owner_enter();
}
/**
* Initialize E Connection Manager (E_Connman) system.
*
* This will connect to ConnMan through DBus and watch for it going in and out.
*
* Interesting events are:
* - E_CONNMAN_EVENT_MANAGER_IN: issued when connman is avaiable.
* - E_CONNMAN_EVENT_MANAGER_OUT: issued when connman connection is lost.
*/
unsigned int
e_connman_system_init(E_DBus_Connection *edbus_conn)
{
init_count++;
if (init_count > 1)
return init_count;
_e_dbus_connman_log_dom = eina_log_domain_register("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;
}
if (E_CONNMAN_EVENT_MANAGER_IN == 0)
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();
conn = edbus_conn;
cb_name_owner_changed = e_dbus_signal_handler_add(conn,
E_DBUS_FDO_BUS, E_DBUS_FDO_PATH, E_DBUS_FDO_INTERFACE,
"NameOwnerChanged", _e_connman_system_name_owner_changed,
NULL);
pending_get_name_owner = e_dbus_get_name_owner(conn,
CONNMAN_BUS_NAME, _e_connman_get_name_owner,
NULL);
return init_count;
}
/**
* Shutdown ConnMan system
*
* When count drops to 0 resources will be released and no calls should be
* made anymore.
*/
unsigned int
e_connman_system_shutdown(void)
{
if (init_count == 0)
{
ERR("connman system already shut down.");
return 0;
}
init_count--;
if (init_count > 0)
return init_count;
if (pending_get_name_owner)
{
dbus_pending_call_cancel(pending_get_name_owner);
pending_get_name_owner = NULL;
}
if (cb_name_owner_changed)
{
e_dbus_signal_handler_del(conn, cb_name_owner_changed);
cb_name_owner_changed = NULL;
}
eina_log_domain_unregister(_e_dbus_connman_log_dom);
conn = NULL;
return init_count;
}

21
src/modules/connman/e_connman_private.h Normal file
View File

@ -0,0 +1,21 @@
#include <stdio.h>
#include <Eina.h>
#include <eina_safety_checks.h>
#include "E_Connman.h"
extern int _e_dbus_connman_log_dom;
#ifndef EINA_LOG_DEFAULT_COLOR
#define EINA_LOG_DEFAULT_COLOR EINA_COLOR_CYAN
#endif
#undef DBG
#undef INF
#undef WRN
#undef ERR
#define DBG(...) EINA_LOG_DOM_DBG(_e_dbus_connman_log_dom, __VA_ARGS__)
#define INF(...) EINA_LOG_DOM_INFO(_e_dbus_connman_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_e_dbus_connman_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_e_dbus_connman_log_dom, __VA_ARGS__)

665
src/modules/connman/e_mod_config.c
View File

@ -2,216 +2,55 @@
extern const char _e_connman_Name[];
extern const char *e_str_enabled;
extern const char *e_str_available;
extern const char *e_str_connected;
extern const char *e_str_offline;
struct connman_config_technologies
{
EINA_INLIST;
Evas_Object *obj;
E_Connman_Technology *technology;
int enabled;
};
struct _E_Config_Dialog_Data
{
E_Connman_Module_Context *ctxt;
const char *selected_network;
struct connman_config_network_ui
{
Evas_Object *hlayout;
Evas_Object *netframe;
Evas_Object *netlist;
/*
Evas_Object *o_up;
Evas_Object *o_down;
Evas_Object *o_add;
Evas_Object *o_del;
*/
Evas_Object *setframe;
struct connman_config_network_settings_ui
{
Evas_Object *scr_general;
Evas_Object *list_general;
Evas_Object *lb_autoconn;
Evas_Object *lb_autoconn_val;
Evas_Object *lb_favorite;
Evas_Object *lb_favorite_val;
Evas_Object *lb_type;
Evas_Object *lb_type_val;
Evas_Object *lb_ipv4_method;
Evas_Object *lb_ipv4_method_val;
Evas_Object *lb_ipv4_address;
Evas_Object *lb_ipv4_address_val;
Evas_Object *lb_ipv4_netmask;
Evas_Object *lb_ipv4_netmask_val;
#if 0 // need to do proxy stuff to enalbe the toolbook
Evas_Object *settings_otb;
Evas_Object *list_proxy;
#endif
} settings_otb;
} networks;
struct connman_config_switch_ui
{
Evas_Object *vlayout;
Evas_Object *type_frame;
Evas_Object *off_frame;
Eina_Inlist *technologies;
Evas_Object *o_off;
int offline_mode;
} switches;
};
/* Local Function Prototypes */
static void *_create_data(E_Config_Dialog *dialog);
static void _free_data(E_Config_Dialog *dialog,
E_Config_Dialog_Data *cfdata);
static void _fill_data(E_Config_Dialog_Data *cfdata,
E_Connman_Module_Context *ctxt);
static Evas_Object *_basic_create(E_Config_Dialog *dialog,
Evas *evas,
E_Config_Dialog_Data *cfdata);
static int _basic_apply(E_Config_Dialog *dialog,
E_Config_Dialog_Data *cfdata);
struct connman_service_move_data
static Evas_Object *
_basic_create(E_Config_Dialog *dialog __UNUSED__, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
const char *service_path;
const char *service_ref_path;
E_Connman_Module_Context *ctxt;
};
enum _Conmman_Move_Direction {
SERVICE_MOVE_DOWN,
SERVICE_MOVE_UP
};
#if 0
static void
_connman_service_move_cb(void *data,
DBusMessage *msg __UNUSED__,
DBusError *error)
{
struct connman_service_move_data *d = data;
if (error && dbus_error_is_set(error))
{
ERR("%s method failed with message \'%s\'",
error->name, error->message);
dbus_error_free(error);
}
else
DBG("Changed service order");
eina_stringshare_del(d->service_ref_path);
eina_stringshare_del(d->service_path);
E_FREE(d);
return NULL;
}
#endif
#if 0
static void
_connman_service_move(E_Connman_Service *service,
const E_Connman_Service *service_ref,
enum _Conmman_Move_Direction direction)
static int
_basic_apply(E_Config_Dialog *dialog __UNUSED__,
E_Config_Dialog_Data *cfdata)
{
struct connman_service_move_data *d;
int ret;
d = E_NEW(struct connman_service_move_data, 1);
if (!d)
return;
d->service_ref_path = eina_stringshare_ref(service_ref->path);
d->service_path = eina_stringshare_ref(service->path);
d->ctxt = service->ctxt;
DBG("Try to move %s %s %s\n", d->service_path,
(direction == SERVICE_MOVE_UP) ? "before" : "after",
d->service_ref_path);
if (direction == SERVICE_MOVE_UP)
ret = e_connman_service_move_before
(service->element, d->service_ref_path, _connman_service_move_cb, d);
else
ret = e_connman_service_move_after
(service->element, d->service_ref_path, _connman_service_move_cb, d);
if (!ret)
{
eina_stringshare_del(d->service_ref_path);
eina_stringshare_del(d->service_path);
E_FREE(d);
_connman_operation_error_show(_("Re-order preferred services"));
}
}
#endif
struct _connman_technology_onoff_data
{
const char *type;
E_Connman_Module_Context *ctxt;
Eina_Bool on;
};
static void
_connman_technology_onoff_cb(void *data,
DBusMessage *msg __UNUSED__,
DBusError *error)
{
struct _connman_technology_onoff_data *d = data;
if (error && dbus_error_is_set(error))
{
ERR("%s method failed with message \'%s\'.",
error->name, error->message);
dbus_error_free(error);
}
else
DBG("Technology %s has been %s.", d->type, d->on ? "enabled" : "disabled");
eina_stringshare_del(d->type);
E_FREE(d);
return 1;
}
static void
_connman_technology_onoff(E_Connman_Module_Context *ctxt,
const char *type,
Eina_Bool on)
_free_data(E_Config_Dialog *dialog,
E_Config_Dialog_Data *cfdata)
{
int ret;
struct _connman_technology_onoff_data *d;
E_Connman_Module_Context *ctxt = dialog->data;
ctxt->conf_dialog = NULL;
E_FREE(cfdata);
}
d = E_NEW(struct _connman_technology_onoff_data, 1);
if (!d)
{
_connman_operation_error_show("No memory available");
return;
}
static inline void
_fill_data(E_Config_Dialog_Data *cfdata,
E_Connman_Module_Context *ctxt)
{
cfdata->ctxt = ctxt;
}
d->type = eina_stringshare_add(type);
d->ctxt = ctxt;
d->on = on;
static void *
_create_data(E_Config_Dialog *dialog)
{
E_Config_Dialog_Data *cfdata;
if(on)
ret = e_connman_manager_technology_enable
(type, _connman_technology_onoff_cb, d);
else
ret = e_connman_manager_technology_disable
(type, _connman_technology_onoff_cb, d);
if(!ret)
{
eina_stringshare_del(type);
E_FREE(d);
}
return;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
if (!cfdata)
return NULL;
_fill_data(cfdata, dialog->data);
return cfdata;
}
E_Config_Dialog *
e_connman_config_dialog_new(E_Container *con,
e_connman_config_dialog_new(E_Container *con,
E_Connman_Module_Context *ctxt)
{
E_Config_Dialog *dialog;
@ -236,447 +75,3 @@ e_connman_config_dialog_new(E_Container *con,
return dialog;
}
static void *
_create_data(E_Config_Dialog *dialog)
{
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
if (!cfdata)
return NULL;
_fill_data(cfdata, dialog->data);
return cfdata;
}
static void
_free_data(E_Config_Dialog *dialog,
E_Config_Dialog_Data *cfdata)
{
E_Connman_Module_Context *ctxt = dialog->data;
struct connman_config_switch_ui *ui = &cfdata->switches;
while(ui->technologies)
{
struct connman_config_technologies *t;
t = (struct connman_config_technologies *)ui->technologies;
ui->technologies = eina_inlist_remove
(ui->technologies, EINA_INLIST_GET(t));
E_FREE(t);
}
ctxt->conf_dialog = NULL;
E_FREE(cfdata);
}
static inline void
_fill_data(E_Config_Dialog_Data *cfdata,
E_Connman_Module_Context *ctxt)
{
cfdata->ctxt = ctxt;
cfdata->switches.technologies = NULL;
}
void
_cb_scr_general_show(void *data,
Evas *evas __UNUSED__,
Evas_Object *obj,
void *event_info __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
struct connman_config_network_ui *ui;
ui = &cfdata->networks;
if (e_widget_ilist_selected_get(ui->netlist) < 0)
evas_object_hide(obj);
}
static void
_network_settings_general_page_create(Evas *evas,
E_Config_Dialog_Data *cfdata)
{
struct connman_config_network_settings_ui *ui;
Evas_Coord mw, mh;
ui = &cfdata->networks.settings_otb;
ui->list_general = e_widget_list_add(evas, 0, 0);
#define _APPEND_ITEM(item, label) \
do \
{ \
ui->lb_##item = e_widget_label_add(evas, _(label)); \
ui->lb_##item ## _val = e_widget_entry_add \
(evas, NULL, NULL, NULL, NULL); \
e_widget_entry_readonly_set(ui->lb_##item ## _val, 1); \
e_widget_list_object_append \
(ui->list_general, ui->lb_##item, 1, 0, 0.0); \
e_widget_list_object_append \
(ui->list_general, ui->lb_##item ## _val, 1, 0, 0.0); \
} while(0)
_APPEND_ITEM(autoconn, _("Auto-connect:"));
_APPEND_ITEM(favorite, _("Favorite:"));
_APPEND_ITEM(type, _("Type:"));
_APPEND_ITEM(ipv4_method, _("IP method:"));
_APPEND_ITEM(ipv4_address, _("IP address:"));
_APPEND_ITEM(ipv4_netmask, _("Netmask:"));
#undef _APPEND_ITEM
evas_object_show(ui->list_general);
e_widget_size_min_get(ui->list_general, &mw, &mh);
if (mw < 100 * e_scale)
mw = 100 * e_scale;
if (mh < 100 * e_scale)
mh = 100 * e_scale;
evas_object_resize(ui->list_general, mw, mh);
ui->scr_general = e_widget_scrollframe_simple_add(evas, ui->list_general);
e_widget_size_min_set(ui->scr_general, 100 * e_scale, 100 * e_scale);
evas_object_event_callback_add(ui->scr_general, EVAS_CALLBACK_SHOW, _cb_scr_general_show, cfdata);
}
#if 0 // need to do proxy, until then hide the toolbook complexity
static void
_network_settings_proxy_page_create(Evas *evas,
E_Config_Dialog_Data *cfdata)
{
struct connman_config_network_settings_ui *ui;
Evas_Object *label_todo;
ui = &cfdata->networks.settings_otb;
ui->list_proxy = e_widget_list_add(evas, 0, 0);
label_todo = e_widget_label_add(evas, "TODO");
e_widget_list_object_append(ui->list_proxy, label_todo, 1, 1, 0.0);
}
#endif
static void
_network_settings_create(Evas *evas,
E_Config_Dialog_Data *cfdata)
{
struct connman_config_network_ui *ui;
ui = &cfdata->networks;
ui->setframe = e_widget_framelist_add(evas, _("Settings"), 0);
#if 0 // need to do proxy, until then hide the toolbook complexity
ui->settings_otb.settings_otb = e_widget_toolbook_add(evas, 24 * e_scale, 24 * e_scale);
_network_settings_general_page_create(evas, cfdata);
e_widget_toolbook_page_append
(ui->settings_otb.settings_otb, NULL, _("General"),
ui->settings_otb.scr_general, 1, 1, 1, 1, 0.5, 0.0);
_network_settings_proxy_page_create(evas, cfdata);
e_widget_toolbook_page_append
(ui->settings_otb.settings_otb, NULL, _("Proxy"),
ui->settings_otb.list_proxy, 1, 0, 1, 0, 0.5, 0.0);
e_widget_size_min_set(ui->settings_otb.settings_otb, 100, 100);
e_widget_toolbook_page_show(ui->settings_otb.settings_otb, 0);
e_widget_framelist_object_append(ui->setframe, ui->settings_otb.settings_otb);
#else
_network_settings_general_page_create(evas, cfdata);
e_widget_framelist_object_append(ui->setframe, ui->settings_otb.scr_general);
#endif
}
static inline void
_networks_fill_details(E_Config_Dialog_Data *cfdata,
Evas_Object *list __UNUSED__,
int sel __UNUSED__)
{
E_Connman_Service *service;
E_Connman_Module_Context *ctxt = cfdata->ctxt;
struct connman_config_network_settings_ui *ui = &cfdata->networks.settings_otb;
service = _connman_ctxt_find_service_stringshare
(ctxt, cfdata->selected_network);
if (!service)
{
ERR("service not found: %s.", cfdata->selected_network);
return;
}
e_widget_entry_text_set(ui->lb_autoconn_val,
service->auto_connect ? _("True") : _("False"));
e_widget_entry_text_set(ui->lb_favorite_val,
service->favorite ? _("True") : _("False"));
e_widget_entry_text_set(ui->lb_type_val, service->type);
e_widget_entry_text_set(ui->lb_ipv4_method_val, service->ipv4_method);
e_widget_entry_text_set(ui->lb_ipv4_address_val, service->ipv4_address);
e_widget_entry_text_set(ui->lb_ipv4_netmask_val, service->ipv4_netmask);
evas_object_show(ui->list_general);
evas_object_show(ui->scr_general);
}
/*
static inline void
_networks_disable_buttons(E_Config_Dialog_Data *cfdata, Evas_Object *list, int sel)
{
Evas_Object *o_up = cfdata->networks.o_up;
Evas_Object *o_down = cfdata->networks.o_down;
if (sel >= 0)
{
int index = e_widget_ilist_selected_get(list);
int count = e_widget_ilist_count(list);
e_widget_disabled_set(o_up, !index);
e_widget_disabled_set(o_down, (count > index + 1)?0:1);
}
else
{
e_widget_disabled_set(o_up, 1);
e_widget_disabled_set(o_down, 1);
}
}
*/
void
_cb_service_selected(void *data)
{
E_Config_Dialog_Data *cfdata = data;
Evas_Object *list = cfdata->networks.netlist;
int sel = e_widget_ilist_selected_get(list);
// _networks_disable_buttons(cfdata, list, sel);
_networks_fill_details(cfdata, list, sel);
}
static unsigned int
_networks_list_fill(Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *list = cfdata->networks.netlist;
E_Connman_Module_Context *ctxt = cfdata->ctxt;
E_Connman_Service *service;
EINA_INLIST_FOREACH(ctxt->services, service)
{
Evas_Object *icon = _connman_service_new_list_item(evas, service);
e_widget_ilist_append
(list, icon, service->name, _cb_service_selected,
cfdata, service->path);
}
return eina_inlist_count(ctxt->services);
}
#if 0
static void
_networks_button_up_cb(void *data,
void *data2 __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
Evas_Object *netlist = cfdata->networks.netlist;
E_Connman_Module_Context *ctxt = cfdata->ctxt;
E_Connman_Service *service, *service_ref;
int sel;
sel = e_widget_ilist_selected_get(netlist);
if (sel <= 0)
return;
service = _connman_ctxt_find_service_stringshare
(ctxt, cfdata->selected_network);
e_widget_ilist_selected_set(netlist, sel - 1);
service_ref = _connman_ctxt_find_service_stringshare
(ctxt, cfdata->selected_network);
e_widget_ilist_selected_set(netlist, sel);
_connman_service_move(service, service_ref, SERVICE_MOVE_UP);
}
static void
_networks_button_down_cb(void *data,
void *data2 __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
Evas_Object *netlist = cfdata->networks.netlist;
E_Connman_Module_Context *ctxt = cfdata->ctxt;
E_Connman_Service *service, *service_ref;
int sel;
int count;
sel = e_widget_ilist_selected_get(netlist);
count = e_widget_ilist_count(netlist);
if (sel < 0 || (count == sel + 1))
return;
service = _connman_ctxt_find_service_stringshare
(ctxt, cfdata->selected_network);
e_widget_ilist_selected_set(netlist, sel + 1);
service_ref = _connman_ctxt_find_service_stringshare
(ctxt, cfdata->selected_network);
e_widget_ilist_selected_set(netlist, sel);
_connman_service_move(service, service_ref, SERVICE_MOVE_DOWN);
}
#endif
static void
_networks_list_create(Evas *evas,
E_Config_Dialog_Data *cfdata)
{
struct connman_config_network_ui *ui;
ui = &cfdata->networks;
ui->netframe = e_widget_framelist_add(evas, _("All networks"), 0);
ui->netlist = e_widget_ilist_add(evas, 24, 24, &cfdata->selected_network);
e_widget_ilist_multi_select_set(ui->netlist, 0);
e_widget_on_change_hook_set(ui->netlist, NULL, cfdata);
e_widget_size_min_set(ui->netlist, 100, 100);
e_widget_ilist_selected_set(ui->netlist, 0);
e_widget_framelist_object_append(ui->netframe, ui->netlist);
#if 0
Evas_Object *ot;
Evas_Coord mw, mh;
/* Buttons */
ot = e_widget_table_add(evas, 0);
ui->o_up = e_widget_button_add
(evas, _("Up"), "go-up", _networks_button_up_cb, cfdata, NULL);
e_widget_disabled_set(ui->o_up, 1);
e_widget_table_object_append(ot, ui->o_up, 0, 0, 1, 1, 1, 0, 1, 0);
ui->o_down = e_widget_button_add
(evas, _("Down"), "go-down", _networks_button_down_cb, cfdata, NULL);
e_widget_disabled_set(ui->o_down, 1);
e_widget_table_object_append(ot, ui->o_down, 1, 0, 1, 1, 1, 0, 1, 0);
ui->o_add = e_widget_button_add
(evas, _("Add"), "list-add", NULL, cfdata, NULL);
e_widget_disabled_set(ui->o_add, 1);
e_widget_table_object_append(ot, ui->o_add, 0, 1, 2, 1, 1, 0, 1, 0);
e_widget_size_min_get(ot, &mw, &mh);
e_widget_framelist_object_append_full(ui->netframe, ot,
1, 1, /* fill */
1, 0, /* expand */
0.5, 0.5, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
#endif
}
static void
_networks_page_create(Evas *evas,
E_Config_Dialog_Data *cfdata)
{
struct connman_config_network_ui *ui;
/*
* TODO:
*
* Add a elm_widget_pager similar to elm_pager and push pop the
* list and the associated element settings when the list
* element is selected (needs a view/edit/info/whatever button
* as the list elements may be reordered, thus we need th
* selection).
*
* This should reduce the width of this dialog.
*/
ui = &cfdata->networks;
ui->hlayout = e_widget_list_add(evas, 0, 1);
_networks_list_create(evas, cfdata);
e_widget_list_object_append(ui->hlayout, ui->netframe, 1, 1, 0.0);
_network_settings_create(evas, cfdata);
e_widget_list_object_append(ui->hlayout, ui->setframe, 1, 1, 0.0);
evas_object_hide(ui->settings_otb.scr_general);
}
static inline void
_switches_page_create_technologies(Evas *evas,
E_Connman_Module_Context *ctxt,
struct connman_config_switch_ui *ui)
{
struct E_Connman_Technology *t;
EINA_INLIST_FOREACH(ctxt->technologies, t)
{
struct connman_config_technologies *t_list;
t_list = E_NEW(struct connman_config_technologies, 1);
t_list->technology = t;
t_list->enabled = ((t->state == e_str_enabled) ||
(t->state == e_str_connected));
t_list->obj = e_widget_check_add(evas, _(t->name), &t_list->enabled);
ui->technologies = eina_inlist_append
(ui->technologies, EINA_INLIST_GET(t_list));
e_widget_framelist_object_append(ui->type_frame, t_list->obj);
}
}
static void
_switches_page_create(Evas *evas,
E_Config_Dialog_Data *cfdata)
{
struct connman_config_switch_ui *ui;
E_Connman_Module_Context *ctxt = cfdata->ctxt;
ui = &cfdata->switches;
ui->vlayout = e_widget_list_add(evas, 0, 0);
ui->type_frame = e_widget_framelist_add(evas, _("Network types"), 0);
ui->offline_mode = ctxt->offline_mode;
_switches_page_create_technologies(evas, ctxt, ui);
e_widget_list_object_append(ui->vlayout, ui->type_frame, 1, 1, 0.0);
ui->off_frame = e_widget_framelist_add(evas, _("Disable networking"), 0);
ui->o_off = e_widget_check_add(evas, _("Offline mode"), &ui->offline_mode);
e_widget_framelist_object_append(ui->off_frame, ui->o_off);
e_widget_list_object_append(ui->vlayout, ui->off_frame, 1, 1, 0.0);
}
static Evas_Object *
_basic_create(E_Config_Dialog *dialog __UNUSED__,
Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *otb;
otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
_networks_page_create(evas, cfdata);
e_widget_toolbook_page_append
(otb, NULL, _("Networks Settings"),
cfdata->networks.hlayout, 1, 1, 1, 1, 0.5, 0.0);
_switches_page_create(evas, cfdata);
e_widget_toolbook_page_append
(otb, NULL, _("Network Switches"),
cfdata->switches.vlayout, 1, 1, 0, 0, 0.5, 0.5);
_networks_list_fill(evas, cfdata);
e_widget_toolbook_page_show(otb, 0);
e_widget_size_min_resize(otb);
return otb;
}
static int
_basic_apply(E_Config_Dialog *dialog __UNUSED__,
E_Config_Dialog_Data *cfdata)
{
E_Connman_Module_Context *ctxt = cfdata->ctxt;
struct connman_config_switch_ui *sw = &cfdata->switches;
struct connman_config_technologies *t;
EINA_INLIST_FOREACH(sw->technologies, t)
{
int was_enabled = ((t->technology->state == e_str_enabled) ||
(t->technology->state == e_str_connected));
if (t->enabled != was_enabled)
_connman_technology_onoff(ctxt, t->technology->type, t->enabled);
}
if (ctxt->offline_mode != sw->offline_mode)
_connman_toggle_offline_mode(ctxt);
return 1;
}

1639
src/modules/connman/e_mod_main.c
View File

File diff suppressed because it is too large Load Diff

173
src/modules/connman/e_mod_main.h
View File

@ -3,11 +3,11 @@
#include "config.h"
#include <e.h>
#define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
#include <connman0_7x/E_Connman.h>
#include <eina_log.h>
#define MOD_CONF_VERSION 2
#include "E_Connman.h"
#define MOD_CONF_VERSION 3
extern int _e_connman_log_dom;
#undef DBG
@ -17,90 +17,54 @@ extern int _e_connman_log_dom;
#define WRN(...) EINA_LOG_DOM_WARN(_e_connman_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_e_connman_log_dom, __VA_ARGS__)
typedef struct E_Connman_Instance E_Connman_Instance;
typedef struct E_Connman_Instance E_Connman_Instance;
typedef struct E_Connman_Module_Context E_Connman_Module_Context;
typedef struct E_Connman_Service E_Connman_Service;
typedef struct E_Connman_Technology E_Connman_Technology;
struct E_Connman_Instance
{
E_Connman_Module_Context *ctxt;
E_Gadcon_Client *gcc;
E_Gadcon_Popup *popup;
E_Menu *menu;
E_Gadcon_Client *gcc;
E_Gadcon_Popup *popup;
/* used by popup */
int offline_mode;
const char *service_path;
Eina_Bool first_selection;
int offline_mode;
const char *service_path;
struct
{
Evas_Object *gadget;
Evas_Object *list;
Evas_Object *offline_mode;
Evas_Object *button;
Evas_Object *table;
struct
{
Ecore_X_Window win;
Ecore_Event_Handler *mouse_up;
Ecore_Event_Handler *key_down;
} input;
} ui;
{
Evas_Object *gadget;
Evas_Object *list;
Evas_Object *offline_mode;
Evas_Object *button;
Evas_Object *table;
struct
{
Ecore_X_Window win;
Ecore_Event_Handler *mouse_up;
Ecore_Event_Handler *key_down;
} input;
} ui;
E_Gadcon_Popup *tip;
Evas_Object *o_tip;
};
struct E_Connman_Service
{
EINA_INLIST;
E_Connman_Module_Context *ctxt;
E_Connman_Element *element;
const char *path;
const char *name;
const char *type;
const char *mode;
const char *state;
const char *error;
const char *security;
const char *ipv4_method;
const char *ipv4_address;
const char *ipv4_netmask;
unsigned char strength;
Eina_Bool favorite : 1;
Eina_Bool auto_connect : 1;
Eina_Bool pass_required : 1;
};
struct E_Connman_Technology
{
EINA_INLIST;
E_Connman_Module_Context *ctxt;
E_Connman_Element *element;
const char *path;
const char *name;
const char *type;
const char *state;
};
struct E_Connman_Module_Context
{
Eina_List *instances;
Eina_List *instances;
E_Config_Dialog *conf_dialog;
struct st_connman_actions
{
E_Action *toggle_offline_mode;
} actions;
{
E_Action *toggle_offline_mode;
} actions;
struct
{
Ecore_Event_Handler *manager_in;
Ecore_Event_Handler *manager_out;
Ecore_Event_Handler *mode_changed;
} event;
{
Ecore_Event_Handler *manager_in;
Ecore_Event_Handler *manager_out;
} event;
struct
{
@ -108,81 +72,18 @@ struct E_Connman_Module_Context
Ecore_Poller *manager_changed;
} poller;
Eina_Bool has_manager : 1;
Eina_Bool offline_mode;
Eina_Bool offline_mode_pending;
const char *technology;
const E_Connman_Service *default_service;
Eina_Inlist *services;
Eina_Inlist *technologies;
Eina_Bool has_manager;
Eina_Bool offline_mode;
};
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
const char *e_connman_theme_path(void);
E_Config_Dialog *e_connman_config_dialog_new(E_Container *con,
const char *e_connman_theme_path(void);
E_Config_Dialog *e_connman_config_dialog_new(E_Container *con,
E_Connman_Module_Context *ctxt);
void _connman_toggle_offline_mode(E_Connman_Module_Context *ctxt);
Evas_Object *_connman_service_new_list_item(Evas *evas,
E_Connman_Service *service);
static inline void
_connman_dbus_error_show(const char *msg,
const DBusError *error)
{
const char *name;
if ((!error) || (!dbus_error_is_set(error)))
return;
name = error->name;
if (strncmp(name, "org.moblin.connman.Error.",
sizeof("org.moblin.connman.Error.") - 1) == 0)
name += sizeof("org.moblin.connman.Error.") - 1;
e_util_dialog_show(_("Connman Server Operation Failed"),
_("Could not execute remote operation:<br>"
"%s<br>"
"Server Error <hilight>%s:</hilight> %s"),
msg, name, error->message);
}
static inline void
_connman_operation_error_show(const char *msg)
{
e_util_dialog_show(_("Connman Operation Failed"),
_("Could not execute local operation:<br>%s"),
msg);
}
static inline E_Connman_Service *
_connman_ctxt_find_service_stringshare(const E_Connman_Module_Context *ctxt,
const char *service_path)
{
E_Connman_Service *itr;
EINA_INLIST_FOREACH(ctxt->services, itr)
if (itr->path == service_path)
return itr;
return NULL;
}
static inline E_Connman_Technology *
_connman_ctxt_technology_find_stringshare(const E_Connman_Module_Context *ctxt,
const char *path)
{
E_Connman_Technology *t;
EINA_INLIST_FOREACH(ctxt->technologies, t)
if (t->path == path)
return t;
return NULL;
}
/**
* @addtogroup Optional_Devices

78
src/modules/wizard/page_110.c
View File

@ -2,13 +2,9 @@
#include "e.h"
#include "e_mod_main.h"
#ifdef HAVE_ECONNMAN
#define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
#include <connman0_7x/E_Connman.h>
#include <E_DBus.h>
#endif
static Ecore_Event_Handler *handler = NULL;
static Ecore_Timer *connman_timeout = NULL;
static void
_recommend_connman(E_Wizard_Page *pg)
{
@ -36,26 +32,11 @@ _recommend_connman(E_Wizard_Page *pg)
}
#ifdef HAVE_ECONNMAN
static Eina_Bool
_connman_in(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
if (handler)
{
ecore_event_handler_del(handler);
handler = NULL;
}
if (connman_timeout)
{
ecore_timer_del(connman_timeout);
connman_timeout = NULL;
}
e_wizard_button_next_enable_set(1);
e_wizard_next();
return EINA_TRUE;
}
static DBusPendingCall *pending_connman;
static Ecore_Timer *connman_timeout = NULL;
static Eina_Bool
_connman_timeout(void *data)
_connman_fail(void *data)
{
E_Wizard_Page *pg = data;
E_Config_Module *em;
@ -73,17 +54,38 @@ _connman_timeout(void *data)
break;
}
}
e_config_save_queue();
connman_timeout = NULL;
if (handler)
if (pending_connman)
{
ecore_event_handler_del(handler);
handler = NULL;
dbus_pending_call_cancel(pending_connman);
pending_connman = NULL;
}
connman_timeout = NULL;
_recommend_connman(pg);
return EINA_FALSE;
}
static void
_check_connman_owner(void *data, DBusMessage *msg, DBusError *err)
{
pending_connman = NULL;
if (connman_timeout)
{
ecore_timer_del(connman_timeout);
connman_timeout = NULL;
}
if (!msg)
{
_connman_fail(data);
return;
}
e_wizard_button_next_enable_set(1);
e_wizard_next();
}
#endif
EAPI int
@ -108,12 +110,16 @@ wizard_page_show(E_Wizard_Page *pg)
if (c)
{
#ifdef HAVE_ECONNMAN
if (e_connman_system_init(c))
if (pending_connman)
dbus_pending_call_cancel(pending_connman);
pending_connman = e_dbus_name_has_owner(c, "net.connman",
_check_connman_owner,
pg);
if (pending_connman)
{
handler = ecore_event_handler_add
(E_CONNMAN_EVENT_MANAGER_IN, _connman_in, NULL);
if (connman_timeout) ecore_timer_del(connman_timeout);
connman_timeout = ecore_timer_add(2.0, _connman_timeout, pg);
connman_timeout = ecore_timer_add(2.0, _connman_fail, pg);
have_connman = 1;
e_wizard_button_next_enable_set(0);
}
@ -146,17 +152,19 @@ wizard_page_show(E_Wizard_Page *pg)
EAPI int
wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
{
if (handler)
#ifdef HAVE_ECONNMAN
if (pending_connman)
{
ecore_event_handler_del(handler);
handler = NULL;
dbus_pending_call_cancel(pending_connman);
pending_connman = NULL;
}
if (connman_timeout)
{
ecore_timer_del(connman_timeout);
connman_timeout = NULL;
}
// if (pg->data) evas_object_del(pg->data);
#endif
return 1;
}