DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

D-Bus: Add WPS manufacturer as property

Browse source 
Signed-off-by: Avichal Agarwal <avichal.a@samsung.com>
Signed-off-by: Kyeong-Chae Lim <kcya.lim@samsung.com>
Signed-off-by: Mayank Haarit <mayank.h@samsung.com>
This commit is contained in:
Avichal Agarwal 2016-12-21 17:54:21 +05:30 • committed by Jouni Malinen
parent b20f031c68
commit 318d4b5beb
3 changed files with 67 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wpa_supplicant/dbus/dbus_new.c
View file

@ -3240,6 +3240,12 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
wpas_dbus_setter_wps_device_name, wpas_dbus_setter_wps_device_name,
NULL NULL
}, },
{
"Manufacturer", WPAS_DBUS_NEW_IFACE_WPS, "s",
wpas_dbus_getter_wps_manufacturer,
wpas_dbus_setter_wps_manufacturer,
NULL
},
#endif /* CONFIG_WPS */ #endif /* CONFIG_WPS */
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
{ "P2PDeviceConfig", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}", { "P2PDeviceConfig", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}",

2
wpa_supplicant/dbus/dbus_new_handlers.h
View file

@ -188,6 +188,8 @@ DECLARE_ACCESSOR(wpas_dbus_getter_config_methods);
DECLARE_ACCESSOR(wpas_dbus_setter_config_methods); DECLARE_ACCESSOR(wpas_dbus_setter_config_methods);
DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_name); DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_name);
DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_name); DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_name);
DECLARE_ACCESSOR(wpas_dbus_getter_wps_manufacturer);
DECLARE_ACCESSOR(wpas_dbus_setter_wps_manufacturer);
DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message, DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);

59
wpa_supplicant/dbus/dbus_new_handlers_wps.c
View file

@ -513,3 +513,62 @@ dbus_bool_t wpas_dbus_setter_wps_device_name(
return TRUE; return TRUE;
} }
/**
* wpas_dbus_getter_wps_manufacturer - Get current manufacturer name
* @iter: Pointer to incoming dbus message iter
* @error: Location to store error on failure
* @user_data: Function specific data
* Returns: TRUE on success, FALSE on failure
*
* Getter for "Manufacturer" property.
*/
dbus_bool_t wpas_dbus_getter_wps_manufacturer(
const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{
struct wpa_supplicant *wpa_s = user_data;
char *manufacturer = wpa_s->conf->manufacturer;
if (!manufacturer)
manufacturer = "";
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
&manufacturer, error);
}
/**
* wpas_dbus_setter_wps_manufacturer - Set current manufacturer name
* @iter: Pointer to incoming dbus message iter
* @error: Location to store error on failure
* @user_data: Function specific data
* Returns: TRUE on success, FALSE on failure
*
* Setter for "Manufacturer" property.
*/
dbus_bool_t wpas_dbus_setter_wps_manufacturer(
const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{
struct wpa_supplicant *wpa_s = user_data;
char *methods, *manufacturer;
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_STRING,
&methods))
return FALSE;
if (os_strlen(methods) > WPS_MANUFACTURER_MAX_LEN)
return FALSE;
manufacturer = os_strdup(methods);
if (!manufacturer)
return FALSE;
os_free(wpa_s->conf->manufacturer);
wpa_s->conf->manufacturer = manufacturer;
wpa_s->conf->changed_parameters |= CFG_CHANGED_WPS_STRING;
wpa_supplicant_update_config(wpa_s);
return TRUE;
}