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

D-Bus: Add getter and setter for P2P IP address config parameters

Browse source 
This patch adds setter and getter for P2P IP address config parameters:
1. ip_addr_go
2. ip_addr_mask
3. ip_addr_start
4. ip_addr_end

Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
This commit is contained in:
Nishant Chaprana 2016-11-03 16:22:43 +05:30 committed by Jouni Malinen
parent d503eeead1
commit 046fa6fd11
1 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -28,6 +28,18 @@
#include "../p2p_supplicant.h" #include "../p2p_supplicant.h"
#include "../wifi_display.h" #include "../wifi_display.h"
static int wpas_dbus_validate_dbus_ipaddr(struct wpa_dbus_dict_entry entry)
{
if (entry.type != DBUS_TYPE_ARRAY ||
entry.array_type != DBUS_TYPE_BYTE ||
entry.array_len != 4)
return 0;
return 1;
}
/** /**
* Parses out the mac address from the peer object path. * Parses out the mac address from the peer object path.
* @peer_path - object path of the form * @peer_path - object path of the form
@ -867,6 +879,35 @@ dbus_bool_t wpas_dbus_getter_p2p_device_config(
goto err_no_mem; goto err_no_mem;
} }
/* GO IP address */
if (WPA_GET_BE32(wpa_s->conf->ip_addr_go) &&
!wpa_dbus_dict_append_byte_array(&dict_iter, "IpAddrGo",
(char *) wpa_s->conf->ip_addr_go,
4))
goto err_no_mem;
/* IP address mask */
if (WPA_GET_BE32(wpa_s->conf->ip_addr_mask) &&
!wpa_dbus_dict_append_byte_array(&dict_iter, "IpAddrMask",
(char *) wpa_s->conf->ip_addr_mask,
4))
goto err_no_mem;
/* IP address start */
if (WPA_GET_BE32(wpa_s->conf->ip_addr_start) &&
!wpa_dbus_dict_append_byte_array(&dict_iter, "IpAddrStart",
(char *)
wpa_s->conf->ip_addr_start,
4))
goto err_no_mem;
/* IP address end */
if (WPA_GET_BE32(wpa_s->conf->ip_addr_end) &&
!wpa_dbus_dict_append_byte_array(&dict_iter, "IpAddrEnd",
(char *) wpa_s->conf->ip_addr_end,
4))
goto err_no_mem;
/* Vendor Extensions */ /* Vendor Extensions */
for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) { for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
if (wpa_s->conf->wps_vendor_ext[i] == NULL) if (wpa_s->conf->wps_vendor_ext[i] == NULL)
@ -1051,6 +1092,26 @@ dbus_bool_t wpas_dbus_setter_p2p_device_config(
wpa_s->conf->p2p_intra_bss = entry.bool_value; wpa_s->conf->p2p_intra_bss = entry.bool_value;
wpa_s->conf->changed_parameters |= wpa_s->conf->changed_parameters |=
CFG_CHANGED_P2P_INTRA_BSS; CFG_CHANGED_P2P_INTRA_BSS;
} else if (os_strcmp(entry.key, "IpAddrGo") == 0) {
if (!wpas_dbus_validate_dbus_ipaddr(entry))
goto error;
os_memcpy(wpa_s->conf->ip_addr_go,
entry.bytearray_value, 4);
} else if (os_strcmp(entry.key, "IpAddrMask") == 0) {
if (!wpas_dbus_validate_dbus_ipaddr(entry))
goto error;
os_memcpy(wpa_s->conf->ip_addr_mask,
entry.bytearray_value, 4);
} else if (os_strcmp(entry.key, "IpAddrStart") == 0) {
if (!wpas_dbus_validate_dbus_ipaddr(entry))
goto error;
os_memcpy(wpa_s->conf->ip_addr_start,
entry.bytearray_value, 4);
} else if (os_strcmp(entry.key, "IpAddrEnd") == 0) {
if (!wpas_dbus_validate_dbus_ipaddr(entry))
goto error;
os_memcpy(wpa_s->conf->ip_addr_end,
entry.bytearray_value, 4);
} else if (os_strcmp(entry.key, "GroupIdle") == 0 && } else if (os_strcmp(entry.key, "GroupIdle") == 0 &&
entry.type == DBUS_TYPE_UINT32) entry.type == DBUS_TYPE_UINT32)
wpa_s->conf->p2p_group_idle = entry.uint32_value; wpa_s->conf->p2p_group_idle = entry.uint32_value;