X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gsupplicant%2Fsupplicant.c;h=bb1bfa713cbe1283fdc989a0c0d155129f7ec79f;hb=2bd325428feab81382b17b062d4e3b49ede180e4;hp=cfdb183ac500fdf656d29676acd1f3d00f12e19e;hpb=a424f79696a666ac27812d23af170552e760309d;p=platform%2Fupstream%2Fconnman.git

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index cfdb183..bb1bfa7 100755
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -398,6 +398,11 @@ struct interface_create_data {
 	char *ifname;
 	char *driver;
 	char *bridge;
+#if defined TIZEN_EXT
+	unsigned int mac_addr;
+	unsigned int preassoc_mac_addr;
+	unsigned int random_mac_lifetime;
+#endif /* TIZEN_EXT */
 #if defined TIZEN_EXT_WIFI_MESH
 	char *parent_ifname;
 	bool is_mesh_interface;
@@ -5354,7 +5359,7 @@ static void country_result(const char *error,
 		regdom->callback(result, regdom->alpha2,
 					(void *) regdom->user_data);
 
-	g_free(regdom);
+	dbus_free(regdom);
 }
 
 static void country_params(DBusMessageIter *iter, void *user_data)
@@ -5686,6 +5691,19 @@ static void interface_create_params(DBusMessageIter *iter, void *user_data)
 					DBUS_TYPE_STRING, &config_file);
 	}
 
+#ifdef TIZEN_EXT
+	if (!g_strcmp0(data->driver, "wifi")) {
+		supplicant_dbus_dict_append_basic(&dict, "MacAddr",
+				DBUS_TYPE_UINT32, &data->mac_addr);
+
+		supplicant_dbus_dict_append_basic(&dict, "PreassocMacAddr",
+				DBUS_TYPE_UINT32, &data->preassoc_mac_addr);
+
+		supplicant_dbus_dict_append_basic(&dict, "RandAddrLifetime",
+				DBUS_TYPE_UINT32, &data->random_mac_lifetime);
+	}
+#endif /* TIZEN_EXT */
+
 #if defined TIZEN_EXT_WIFI_MESH
 	if (data->is_mesh_interface) {
 		if (data->parent_ifname)
@@ -8680,3 +8698,176 @@ void g_supplicant_unregister(const GSupplicantCallbacks *callbacks)
 	callbacks_pointer = NULL;
 	eap_methods = 0;
 }
+
+#ifdef TIZEN_EXT
+struct supplicant_mac_policy {
+	GSupplicantMacPolicyCallback callback;
+	dbus_uint32_t policy;
+	const void *user_data;
+};
+
+static void mac_policy_result(const char *error,
+				DBusMessageIter *iter, void *user_data)
+{
+	struct supplicant_mac_policy *data = user_data;
+	int result = 0;
+
+	if (!user_data)
+		return;
+
+	if (error) {
+		SUPPLICANT_DBG("Mac policy setting failure %s", error);
+		result = -EINVAL;
+	}
+
+	if (data->callback)
+		data->callback(result, data->policy,
+					(void *) data->user_data);
+
+	dbus_free(data);
+}
+
+static void mac_policy_params(DBusMessageIter *iter, void *user_data)
+{
+	struct supplicant_mac_policy *data = user_data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &(data->policy));
+}
+
+int g_supplicant_interface_set_mac_policy(GSupplicantInterface *interface,
+					GSupplicantMacPolicyCallback callback,
+							unsigned int policy,
+							void *user_data)
+{
+	struct supplicant_mac_policy *data = NULL;
+	int ret;
+
+	if (!system_available)
+		return -EFAULT;
+
+	if (!interface)
+		return -EINVAL;
+
+	data = dbus_malloc0(sizeof(*data));
+	if (!data)
+		return -ENOMEM;
+
+	data->callback = callback;
+	data->policy = policy;
+	data->user_data = user_data;
+
+	ret =  supplicant_dbus_property_set(interface->path,
+				SUPPLICANT_INTERFACE ".Interface",
+				"MacAddr", DBUS_TYPE_INT32_AS_STRING,
+				mac_policy_params, mac_policy_result, data, NULL);
+	if (ret < 0) {
+		SUPPLICANT_DBG("Unable to set MacAddr configuration");
+		dbus_free(data);
+	}
+
+	return ret;
+}
+
+int g_supplicant_interface_set_preassoc_mac_policy(GSupplicantInterface *interface,
+					GSupplicantMacPolicyCallback callback,
+							unsigned int policy,
+							void *user_data)
+{
+	struct supplicant_mac_policy *data;
+	int ret;
+
+	if (!system_available)
+		return -EFAULT;
+
+	if (!interface)
+		return -EINVAL;
+
+	data = dbus_malloc0(sizeof(*data));
+	if (!data)
+		return -ENOMEM;
+
+	data->callback = callback;
+	data->policy = policy;
+	data->user_data = user_data;
+
+	ret =  supplicant_dbus_property_set(interface->path,
+				SUPPLICANT_INTERFACE ".Interface",
+				"PreassocMacAddr", DBUS_TYPE_INT32_AS_STRING,
+				mac_policy_params, mac_policy_result, data, NULL);
+	if (ret < 0) {
+		SUPPLICANT_DBG("Unable to set PreassocMacAddr configuration");
+		dbus_free(data);
+	}
+
+	return ret;
+}
+
+struct supplicant_random_mac_lifetime {
+	GSupplicantRandomMaclifetimeCallback callback;
+	dbus_uint32_t lifetime;
+	const void *user_data;
+};
+
+static void random_mac_lifetime_result(const char *error,
+				DBusMessageIter *iter, void *user_data)
+{
+	struct supplicant_random_mac_lifetime *data = user_data;
+	int result = 0;
+
+	if (!user_data)
+		return;
+
+	if (error) {
+		SUPPLICANT_DBG("Random Mac lifetime setting failure %s", error);
+		result = -EINVAL;
+	}
+
+	if (data->callback)
+		data->callback(result, data->lifetime,
+					(void *) data->user_data);
+
+	dbus_free(data);
+}
+
+static void random_mac_lifetime_params(DBusMessageIter *iter, void *user_data)
+{
+	struct supplicant_random_mac_lifetime *data = user_data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &(data->lifetime));
+}
+
+int g_supplicant_interface_set_random_mac_lifetime(GSupplicantInterface *interface,
+					GSupplicantRandomMaclifetimeCallback callback,
+							unsigned int lifetime,
+							void *user_data)
+{
+	struct supplicant_random_mac_lifetime *data;
+	int ret;
+
+	if (!system_available)
+		return -EFAULT;
+
+	if (!interface)
+		return -EINVAL;
+
+	data = dbus_malloc0(sizeof(*data));
+	if (!data)
+		return -ENOMEM;
+
+	data->callback = callback;
+	data->lifetime = lifetime;
+	data->user_data = user_data;
+
+	ret =  supplicant_dbus_property_set(interface->path,
+				SUPPLICANT_INTERFACE ".Interface",
+				"RandAddrLifetime", DBUS_TYPE_UINT32_AS_STRING,
+				random_mac_lifetime_params, random_mac_lifetime_result,
+				data, NULL);
+	if (ret < 0) {
+		SUPPLICANT_DBG("Unable to set RandAddrLifetime configuration");
+		dbus_free(data);
+	}
+
+	return ret;
+}
+#endif