summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgsupplicant/supplicant.c13
-rwxr-xr-xsrc/inet.c7
-rwxr-xr-xsrc/network.c11
-rwxr-xr-xsrc/rtnl.c5
-rwxr-xr-xsrc/service.c6
-rwxr-xr-xsrc/wispr.c5
6 files changed, 38 insertions, 9 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 834be59..fc8fd3d 100755
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -4216,8 +4216,13 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface,
data->interface = interface;
data->path = g_strdup(interface->path);
+#if defined TIZEN_EXT
+ data->interface->scan_callback = data->callback = callback;
+ data->interface->scan_data = data->user_data = user_data;
+#else
data->callback = callback;
data->user_data = user_data;
+#endif
data->scan_params = scan_data;
interface->scan_callback = callback;
@@ -4485,8 +4490,10 @@ static void add_network_security_tls(DBusMessageIter *dict,
if (!ssid->private_key_path)
return;
+#if !defined TIZEN_EXT
if (!ssid->private_key_passphrase)
return;
+#endif
if (ssid->ca_cert_path)
supplicant_dbus_dict_append_basic(dict, "ca_cert",
@@ -4495,9 +4502,11 @@ static void add_network_security_tls(DBusMessageIter *dict,
supplicant_dbus_dict_append_basic(dict, "private_key",
DBUS_TYPE_STRING,
&ssid->private_key_path);
+#if !defined TIZEN_EXT
supplicant_dbus_dict_append_basic(dict, "private_key_passwd",
DBUS_TYPE_STRING,
&ssid->private_key_passphrase);
+#endif
supplicant_dbus_dict_append_basic(dict, "client_cert",
DBUS_TYPE_STRING,
&ssid->client_cert_path);
@@ -4529,8 +4538,10 @@ static void add_network_security_peap(DBusMessageIter *dict,
if (!ssid->private_key_path)
return;
+#if !defined TIZEN_EXT
if (!ssid->private_key_passphrase)
return;
+#endif
supplicant_dbus_dict_append_basic(dict, "client_cert",
DBUS_TYPE_STRING,
@@ -4540,9 +4551,11 @@ static void add_network_security_peap(DBusMessageIter *dict,
DBUS_TYPE_STRING,
&ssid->private_key_path);
+#if !defined TIZEN_EXT
supplicant_dbus_dict_append_basic(dict, "private_key_passwd",
DBUS_TYPE_STRING,
&ssid->private_key_passphrase);
+#endif
}
diff --git a/src/inet.c b/src/inet.c
index bfad01c..972fdff 100755
--- a/src/inet.c
+++ b/src/inet.c
@@ -2706,7 +2706,14 @@ char **__connman_inet_get_running_interfaces(void)
g_free(ifr);
if (count < numif)
+ {
+ char **prev_result = result;
result = g_try_realloc(result, (count + 1) * sizeof(char *));
+ if (!result) {
+ g_free(prev_result);
+ goto error;
+ }
+ }
return result;
diff --git a/src/network.c b/src/network.c
index ad67746..4b2ae11 100755
--- a/src/network.c
+++ b/src/network.c
@@ -1311,15 +1311,8 @@ static gboolean __connman_network_clear_associating_delayed(gpointer user_data)
if (network->associating == FALSE &&
state_ipv4 == CONNMAN_SERVICE_STATE_ASSOCIATION &&
- state_ipv6 == CONNMAN_SERVICE_STATE_ASSOCIATION) {
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_IDLE,
- CONNMAN_IPCONFIG_TYPE_IPV4);
-
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_IDLE,
- CONNMAN_IPCONFIG_TYPE_IPV6);
- }
+ state_ipv6 == CONNMAN_SERVICE_STATE_ASSOCIATION)
+ connman_network_clear_associating(network);
return FALSE;
}
diff --git a/src/rtnl.c b/src/rtnl.c
index dc15b33..684668b 100755
--- a/src/rtnl.c
+++ b/src/rtnl.c
@@ -100,6 +100,7 @@ static bool ether_blacklisted(const char *name)
return false;
}
+#if !defined TIZEN_EXT
static bool wext_interface(char *ifname)
{
struct iwreq wrq;
@@ -121,6 +122,7 @@ static bool wext_interface(char *ifname)
return true;
}
+#endif
#if defined TIZEN_EXT
static bool __connman_rtnl_is_cellular_device(const char *name)
@@ -222,6 +224,8 @@ static void read_uevent(struct interface_data *interface)
if (found_devtype)
goto out;
+#if !defined TIZEN_EXT
+ /* TIZEN does not use old wext interface */
/* We haven't got a DEVTYPE, let's check if it's a wireless device */
if (wext_interface(name)) {
interface->service_type = CONNMAN_SERVICE_TYPE_WIFI;
@@ -229,6 +233,7 @@ static void read_uevent(struct interface_data *interface)
connman_error("%s runs an unsupported 802.11 driver", name);
}
+#endif
out:
g_free(name);
diff --git a/src/service.c b/src/service.c
index 11a510d..ca29119 100755
--- a/src/service.c
+++ b/src/service.c
@@ -1896,8 +1896,10 @@ static void state_changed(struct connman_service *service)
if (!str)
return;
+#if !defined TIZEN_EXT
if (!allow_property_changed(service))
return;
+#endif
connman_dbus_property_changed_basic(service->path,
CONNMAN_SERVICE_INTERFACE, "State",
@@ -2716,11 +2718,13 @@ static void append_wifi_ext_info(DBusMessageIter *dict,
unsigned int maxrate;
uint16_t frequency;
const char *enc_mode;
+ gboolean passpoint;
bssid = connman_network_get_bssid(network);
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);
snprintf(bssid_str, WIFI_BSSID_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x",
bssid[0], bssid[1], bssid[2],
@@ -2734,6 +2738,8 @@ static void append_wifi_ext_info(DBusMessageIter *dict,
DBUS_TYPE_UINT16, &frequency);
connman_dbus_dict_append_basic(dict, "EncryptionMode",
DBUS_TYPE_STRING, &enc_mode);
+ connman_dbus_dict_append_basic(dict, "Passpoint",
+ DBUS_TYPE_BOOLEAN, &passpoint);
}
#endif
diff --git a/src/wispr.c b/src/wispr.c
index ef4bdab..330aa1d 100755
--- a/src/wispr.c
+++ b/src/wispr.c
@@ -926,6 +926,11 @@ int __connman_wispr_start(struct connman_service *service,
DBG("service %p", service);
+#if defined TIZEN_EXT
+ if (connman_service_get_type(service) == CONNMAN_SERVICE_TYPE_CELLULAR)
+ return -EPERM;
+#endif
+
if (!wispr_portal_list)
return -EINVAL;