unsigned int g_supplicant_network_get_maxrate(GSupplicantNetwork *network);
const char *g_supplicant_network_get_enc_mode(GSupplicantNetwork *network);
bool g_supplicant_network_get_rsn_mode(GSupplicantNetwork *network);
-unsigned int g_supplicant_network_is_hs20AP(GSupplicantNetwork *network);
+bool g_supplicant_network_is_hs20AP(GSupplicantNetwork *network);
const char *g_supplicant_network_get_eap(GSupplicantNetwork *network);
const char *g_supplicant_network_get_identity(GSupplicantNetwork *network);
const char *g_supplicant_network_get_phase2(GSupplicantNetwork *network);
dbus_bool_t ft_ieee8021x;
char *wifi_vsie;
unsigned int wifi_vsie_len;
+ dbus_bool_t hs20;
#endif
unsigned int wps_capabilities;
};
GHashTable *bss_table;
GHashTable *config_table;
#if defined TIZEN_EXT
- unsigned int isHS20AP;
+ bool isHS20AP;
char *eap;
char *identity;
char *phase2;
}
#if defined TIZEN_EXT
-unsigned int g_supplicant_network_is_hs20AP(GSupplicantNetwork *network)
+bool g_supplicant_network_is_hs20AP(GSupplicantNetwork *network)
{
if (!network)
return 0;
SUPPLICANT_DBG("Failed to allocate memory for wifi_vsie");
}
}
+
+ network->isHS20AP = bss->hs20;
#endif
SUPPLICANT_DBG("New network %s created", network->name);
bss->rsn_selected = FALSE;
supplicant_dbus_property_foreach(iter, bss_wpa, bss);
+#if defined TIZEN_EXT
+ } else if (g_strcmp0(key, "HS20") == 0) {
+ dbus_bool_t hs20 = FALSE;
+ dbus_message_iter_get_basic(iter, &hs20);
+ bss->hs20 = hs20;
+#endif
} else if (g_strcmp0(key, "IEs") == 0)
bss_process_ies(iter, bss);
else
const char *proxies);
void connman_network_clear_associating(struct connman_network *network);
-int connman_network_set_is_hs20AP(struct connman_network *network,
- unsigned int isHS20AP);
-unsigned int connman_network_get_is_hs20AP(struct connman_network *network);
int connman_network_set_keymgmt(struct connman_network *network,
unsigned int keymgmt);
g_supplicant_network_get_rsn_mode(supplicant_network));
connman_network_set_keymgmt(network,
g_supplicant_network_get_keymgmt(supplicant_network));
+ connman_network_set_bool(network, "WiFi.HS20AP",
+ g_supplicant_network_is_hs20AP(supplicant_network));
#endif
connman_network_set_available(network, true);
connman_network_set_string(network, "WiFi.Mode", mode);
struct wifi_data *wifi;
const char *identifier;
struct connman_network *connman_network;
- unsigned int ishs20AP = 0;
+ bool ishs20AP = 0;
char *temp = NULL;
interface = g_supplicant_network_get_interface(network);
}
ishs20AP = g_supplicant_network_is_hs20AP(network);
- connman_network_set_is_hs20AP(connman_network, ishs20AP);
if (ishs20AP &&
g_strcmp0(g_supplicant_network_get_security(network), "ieee8021x") == 0) {
char encryption_mode[WIFI_ENCYPTION_MODE_LEN_MAX];
unsigned char bssid[WIFI_BSSID_LEN_MAX];
unsigned int maxrate;
- unsigned int isHS20AP;
+ bool isHS20AP;
unsigned int keymgmt;
char *keymgmt_type;
bool rsn_mode;
return 0;
}
-int connman_network_set_is_hs20AP(struct connman_network *network,
- unsigned int isHS20AP)
-{
- if (!network)
- return 0;
-
- network->wifi.isHS20AP = isHS20AP;
-
- return 0;
-}
-
-unsigned int connman_network_get_is_hs20AP(struct connman_network *network)
-{
- if (!network)
- return 0;
-
- return network->wifi.isHS20AP;
-}
-
int connman_network_set_keymgmt(struct connman_network *network,
unsigned int keymgmt)
{
#if defined TIZEN_EXT
else if (g_strcmp0(key, "DefaultInternet") == 0)
network->default_internet = value;
+ else if (g_strcmp0(key, "WiFi.HS20AP") == 0)
+ network->wifi.isHS20AP = value;
#endif
return -EINVAL;
#if defined TIZEN_EXT
else if (g_str_equal(key, "DefaultInternet"))
return network->default_internet;
+ else if (g_str_equal(key, "WiFi.HS20AP"))
+ return network->wifi.isHS20AP;
#endif
return false;
maxrate = connman_network_get_maxrate(network);
frequency = connman_network_get_frequency(network);
enc_mode = connman_network_get_enc_mode(network);
- passpoint = connman_network_get_is_hs20AP(network);
+ passpoint = connman_network_get_bool(network, "WiFi.HS20AP");
keymgmt = connman_network_get_keymgmt(network);
snprintf(bssid_str, WIFI_BSSID_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x",