#include "wifi-eap.h"
#include "wifi-wps.h"
#include "wifi-power.h"
+#include "wifi-state.h"
#include "wifi-agent.h"
#include "wifi-firmware.h"
#include "wifi-ssid-scan.h"
#include "wifi-background-scan.h"
#include "wifi-config.h"
-static Wifi *netconfigwifi = NULL;
-static NetConnmanAgent *netconnmanagent = NULL;
-static WifiFirmware *netconfigwififirmware = NULL;
+static Wifi *wifi_object = NULL;
+static NetConnmanAgent *connman_agent_object = NULL;
+static WifiFirmware *wififirmware_object = NULL;
-Wifi *get_netconfig_wifi_object(void){
- return netconfigwifi;
+Wifi *get_wifi_object(void){
+ return wifi_object;
}
static gboolean handle_check_black_list(Wifi *wifi, GDBusMethodInvocation *context,
return TRUE;
}
-void netconfig_wifi_create_and_init(void)
+static void _set_wifi_mac_address(void)
+{
+ gchar *mac_addr = NULL;
+
+ mac_addr = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
+ if (mac_addr != NULL) {
+ if (strlen(mac_addr) == 0)
+ netconfig_set_mac_address_from_file();
+ g_free(mac_addr);
+ }
+}
+
+void wifi_object_create_and_init(void)
{
DBG("Create wifi object.");
- GDBusInterfaceSkeleton *interface = NULL;
- GDBusConnection *connection;
- GDBusObjectManagerServer *server = netconfig_get_wifi_manager();
+ GDBusInterfaceSkeleton *interface_wifi = NULL;
+ GDBusInterfaceSkeleton *interface_connman_agent = NULL;
+ GDBusInterfaceSkeleton *interface_wifi_firmware = NULL;
+ GDBusConnection *connection = NULL;
+ GDBusObjectManagerServer *server = netdbus_get_wifi_manager();
if (server == NULL)
return;
- connection = netconfig_gdbus_get_connection();
+ connection = netdbus_get_connection();
g_dbus_object_manager_server_set_connection(server, connection);
- /*Interface*/
- netconfigwifi = wifi_skeleton_new();
- interface = G_DBUS_INTERFACE_SKELETON(netconfigwifi);
+ /*Interface netconfig.wifi*/
+ wifi_object = wifi_skeleton_new();
+ interface_wifi = G_DBUS_INTERFACE_SKELETON(wifi_object);
// WIFI power
- g_signal_connect(netconfigwifi, "handle-load-driver",
+ g_signal_connect(wifi_object, "handle-load-driver",
G_CALLBACK(handle_load_driver), NULL);
- g_signal_connect(netconfigwifi, "handle-remove-driver",
+ g_signal_connect(wifi_object, "handle-remove-driver",
G_CALLBACK(handle_remove_driver), NULL);
- g_signal_connect(netconfigwifi, "handle-load-p2p-driver",
+ g_signal_connect(wifi_object, "handle-load-p2p-driver",
G_CALLBACK(handle_load_p2p_driver), NULL);
- g_signal_connect(netconfigwifi, "handle-remove-p2p-driver",
+ g_signal_connect(wifi_object, "handle-remove-p2p-driver",
G_CALLBACK(handle_remove_p2p_driver), NULL);
+ // WIFI state
+ g_signal_connect(wifi_object, "handle-get-wifi-state",
+ G_CALLBACK(handle_get_wifi_state), NULL);
+
// WIFI scan
- g_signal_connect(netconfigwifi, "handle-request-specific-scan",
+ g_signal_connect(wifi_object, "handle-request-specific-scan",
G_CALLBACK(handle_request_specific_scan), NULL);
- g_signal_connect(netconfigwifi, "handle-request-wps-scan",
+ g_signal_connect(wifi_object, "handle-request-wps-scan",
G_CALLBACK(handle_request_wps_scan), NULL);
// WIFI direct
- g_signal_connect(netconfigwifi, "handle-launch-direct",
+ g_signal_connect(wifi_object, "handle-launch-direct",
G_CALLBACK(handle_launch_direct), NULL);
// EAP config
- g_signal_connect(netconfigwifi, "handle-create-eap-config",
+ g_signal_connect(wifi_object, "handle-create-eap-config",
G_CALLBACK(handle_create_eap_config), NULL);
- g_signal_connect(netconfigwifi, "handle-delete-eap-config",
+ g_signal_connect(wifi_object, "handle-delete-eap-config",
G_CALLBACK(handle_delete_eap_config), NULL);
// WIFI configuration
- g_signal_connect(netconfigwifi, "handle-save-configuration",
+ g_signal_connect(wifi_object, "handle-save-configuration",
G_CALLBACK(handle_save_configuration), NULL);
- g_signal_connect(netconfigwifi, "handle-remove-configuration",
+ g_signal_connect(wifi_object, "handle-remove-configuration",
G_CALLBACK(handle_remove_configuration), NULL);
- g_signal_connect(netconfigwifi, "handle-get-config-ids",
+ g_signal_connect(wifi_object, "handle-get-config-ids",
G_CALLBACK(handle_get_config_ids), NULL);
- g_signal_connect(netconfigwifi, "handle-load-configuration",
+ g_signal_connect(wifi_object, "handle-load-configuration",
G_CALLBACK(handle_load_configuration), NULL);
- g_signal_connect(netconfigwifi, "handle-set-config-field",
+ g_signal_connect(wifi_object, "handle-set-config-field",
G_CALLBACK(handle_set_config_field), NULL);
+ g_signal_connect(wifi_object, "handle-get-config-passphrase",
+ G_CALLBACK(handle_get_config_passphrase), NULL);
+ // WIFI EAP configuration
+ g_signal_connect(wifi_object, "handle-save-eap-configuration",
+ G_CALLBACK(handle_save_eap_configuration), NULL);
+ g_signal_connect(wifi_object, "handle-load-eap-configuration",
+ G_CALLBACK(handle_load_eap_configuration), NULL);
// BG scan mode
- g_signal_connect(netconfigwifi, "handle-set-bgscan",
+ g_signal_connect(wifi_object, "handle-set-bgscan",
G_CALLBACK(handle_set_bgscan), NULL);
- g_signal_connect(netconfigwifi, "handle-resume-bgscan",
+ g_signal_connect(wifi_object, "handle-resume-bgscan",
G_CALLBACK(handle_resume_bgscan), NULL);
- g_signal_connect(netconfigwifi, "handle-pause-bgscan",
+ g_signal_connect(wifi_object, "handle-pause-bgscan",
G_CALLBACK(handle_pause_bgscan), NULL);
// Passpoint
- g_signal_connect(netconfigwifi, "handle-set-passpoint",
+ g_signal_connect(wifi_object, "handle-set-passpoint",
G_CALLBACK(handle_set_passpoint), NULL);
- g_signal_connect(netconfigwifi, "handle-get-passpoint",
+ g_signal_connect(wifi_object, "handle-get-passpoint",
G_CALLBACK(handle_get_passpoint), NULL);
// EAP authentication
- g_signal_connect(netconfigwifi, "handle-get-aka-auth",
+ g_signal_connect(wifi_object, "handle-get-aka-auth",
G_CALLBACK(handle_get_aka_auth), NULL);
- g_signal_connect(netconfigwifi, "handle-get-sim-auth",
+ g_signal_connect(wifi_object, "handle-get-sim-auth",
G_CALLBACK(handle_get_sim_auth), NULL);
- g_signal_connect(netconfigwifi, "handle-get-sim-imsi",
+ g_signal_connect(wifi_object, "handle-get-sim-imsi",
G_CALLBACK(handle_get_sim_imsi), NULL);
- g_signal_connect(netconfigwifi, "handle-req-aka-auth",
+ g_signal_connect(wifi_object, "handle-req-aka-auth",
G_CALLBACK(handle_req_aka_auth), NULL);
- g_signal_connect(netconfigwifi, "handle-req-sim-auth",
+ g_signal_connect(wifi_object, "handle-req-sim-auth",
G_CALLBACK(handle_req_sim_auth), NULL);
// WIFI MDM blacklist
- g_signal_connect(netconfigwifi, "handle-check-black-list",
+ g_signal_connect(wifi_object, "handle-check-black-list",
G_CALLBACK(handle_check_black_list), NULL);
- if (!g_dbus_interface_skeleton_export(interface, connection,
+ if (!g_dbus_interface_skeleton_export(interface_wifi, connection,
NETCONFIG_WIFI_PATH, NULL)) {
ERR("Export WIFI_PATH for wifi failed");
}
- interface = NULL;
+ /*Interface connman.Agent*/
+ connman_agent_object = net_connman_agent_skeleton_new();
- /*Interface 2*/
- netconnmanagent = net_connman_agent_skeleton_new();
-
- interface = G_DBUS_INTERFACE_SKELETON(netconnmanagent);
- g_signal_connect(netconnmanagent, "handle-report-error",
+ interface_connman_agent = G_DBUS_INTERFACE_SKELETON(connman_agent_object);
+ g_signal_connect(connman_agent_object, "handle-report-error",
G_CALLBACK(handle_report_error), NULL);
- g_signal_connect(netconnmanagent, "handle-request-browser",
+ g_signal_connect(connman_agent_object, "handle-request-browser",
G_CALLBACK(handle_request_browser), NULL);
- g_signal_connect(netconnmanagent, "handle-request-input",
+ g_signal_connect(connman_agent_object, "handle-request-input",
G_CALLBACK(handle_request_input), NULL);
- g_signal_connect(netconnmanagent, "handle-set-field",
+ g_signal_connect(connman_agent_object, "handle-set-field",
G_CALLBACK(handle_set_field), NULL);
- if (!g_dbus_interface_skeleton_export(interface, connection,
+ if (!g_dbus_interface_skeleton_export(interface_connman_agent, connection,
NETCONFIG_WIFI_PATH, NULL)) {
ERR("Export WIFI_PATH for agent failed");
}
- interface = NULL;
-
- /*Interface 3*/
- netconfigwififirmware = wifi_firmware_skeleton_new();
+ /*Interface netconfig.wifi.Firmware*/
+ wififirmware_object = wifi_firmware_skeleton_new();
- interface = G_DBUS_INTERFACE_SKELETON(netconfigwififirmware);
- g_signal_connect(netconfigwififirmware, "handle-start",
+ interface_wifi_firmware = G_DBUS_INTERFACE_SKELETON(wififirmware_object);
+ g_signal_connect(wififirmware_object, "handle-start",
G_CALLBACK(handle_start), NULL);
- g_signal_connect(netconfigwififirmware, "handle-stop",
+ g_signal_connect(wififirmware_object, "handle-stop",
G_CALLBACK(handle_stop), NULL);
- if (!g_dbus_interface_skeleton_export(interface, connection,
+ if (!g_dbus_interface_skeleton_export(interface_wifi_firmware, connection,
NETCONFIG_WIFI_PATH, NULL)) {
ERR("Export WIFI_PATH for firmware failed");
}
- netconfig_wifi_power_initialize();
+ _set_wifi_mac_address();
+
+ wifi_power_initialize();
return;
}
+void wifi_object_deinit(void)
+{
+ g_object_unref(wifi_object);
+ g_object_unref(connman_agent_object);
+ g_object_unref(wififirmware_object);
+
+ wifi_power_deinitialize();
+}
projects / platform / core / connectivity / net-config.git / blobdiff