diff mbox series

wpa_supplicant: Fix build with !CONFIG_AP and CONFIG_CTRL_IFACE_DBUS_NEW

Message ID 838cee8eac66f8a842b30631625da20a4fa87631.1546194955.git.mprivozn@redhat.com
State Accepted
Headers show
Series wpa_supplicant: Fix build with !CONFIG_AP and CONFIG_CTRL_IFACE_DBUS_NEW | expand

Commit Message

Michal Prívozník Dec. 30, 2018, 6:36 p.m. UTC 
If the CONFIG_CTRL_IFACE_DBUS_NEW is enabled but CONFIG_AP is
disabled the build fails. This is because dbus getters try to
access ap_iface member of wpa_supplicant struct which is defined
if and only if CONFIG_AP is enabled.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

Not subscribed to the list, please keep me CC'ed.

 wpa_supplicant/dbus/dbus_new_handlers.c | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

Comments

Jouni Malinen Dec. 31, 2018, 2:01 p.m. UTC | #1 
On Sun, Dec 30, 2018 at 07:36:22PM +0100, Michal Privoznik wrote:
> If the CONFIG_CTRL_IFACE_DBUS_NEW is enabled but CONFIG_AP is
> disabled the build fails. This is because dbus getters try to
> access ap_iface member of wpa_supplicant struct which is defined
> if and only if CONFIG_AP is enabled.

Thanks, applied.
diff mbox series

Patch

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 2a6ad5818..edb9a65b3 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -3823,7 +3823,9 @@  dbus_bool_t wpas_dbus_getter_stas(
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
 	struct wpa_supplicant *wpa_s = user_data;
+#ifdef CONFIG_AP
 	struct hostapd_data *hapd;
+#endif /* CONFIG_AP */
 	struct sta_info *sta = NULL;
 	char **paths = NULL;
 	unsigned int i = 0, num = 0;
@@ -3835,11 +3837,13 @@  dbus_bool_t wpas_dbus_getter_stas(
 		return FALSE;
 	}
 
+#ifdef CONFIG_AP
 	if (wpa_s->ap_iface) {
 		hapd = wpa_s->ap_iface->bss[0];
 		sta = hapd->sta_list;
 		num = hapd->num_sta;
 	}
+#endif /* CONFIG_AP */
 
 	paths = os_calloc(num, sizeof(char *));
 	if (!paths) {
@@ -3887,6 +3891,7 @@  dbus_bool_t wpas_dbus_getter_sta_address(
 	const struct wpa_dbus_property_desc *property_desc,
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+#ifdef CONFIG_AP
 	struct sta_handler_args *args = user_data;
 	struct sta_info *sta;
 
@@ -3897,6 +3902,9 @@  dbus_bool_t wpas_dbus_getter_sta_address(
 	return wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
 						      sta->addr, ETH_ALEN,
 						      error);
+#else /* CONFIG_AP */
+    return FALSE;
+#endif /* CONFIG_AP */
 }
 
 
@@ -3913,6 +3921,7 @@  dbus_bool_t wpas_dbus_getter_sta_aid(
 	const struct wpa_dbus_property_desc *property_desc,
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+#ifdef CONFIG_AP
 	struct sta_handler_args *args = user_data;
 	struct sta_info *sta;
 
@@ -3923,6 +3932,9 @@  dbus_bool_t wpas_dbus_getter_sta_aid(
 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT16,
 						&sta->aid,
 						error);
+#else /* CONFIG_AP */
+    return FALSE;
+#endif /* CONFIG_AP */
 }
 
 
@@ -3939,6 +3951,7 @@  dbus_bool_t wpas_dbus_getter_sta_caps(
 	const struct wpa_dbus_property_desc *property_desc,
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+#ifdef CONFIG_AP
 	struct sta_handler_args *args = user_data;
 	struct sta_info *sta;
 
@@ -3949,6 +3962,9 @@  dbus_bool_t wpas_dbus_getter_sta_caps(
 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT16,
 						&sta->capability,
 						error);
+#else /* CONFIG_AP */
+    return FALSE;
+#endif /* CONFIG_AP */
 }
 
 
@@ -3965,6 +3981,7 @@  dbus_bool_t wpas_dbus_getter_sta_rx_packets(
 	const struct wpa_dbus_property_desc *property_desc,
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+#ifdef CONFIG_AP
 	struct sta_handler_args *args = user_data;
 	struct sta_info *sta;
 	struct hostap_sta_driver_data data;
@@ -3984,6 +4001,9 @@  dbus_bool_t wpas_dbus_getter_sta_rx_packets(
 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT64,
 						&data.rx_packets,
 						error);
+#else /* CONFIG_AP */
+    return FALSE;
+#endif /* CONFIG_AP */
 }
 
 
@@ -4000,6 +4020,7 @@  dbus_bool_t wpas_dbus_getter_sta_tx_packets(
 	const struct wpa_dbus_property_desc *property_desc,
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+#ifdef CONFIG_AP
 	struct sta_handler_args *args = user_data;
 	struct sta_info *sta;
 	struct hostap_sta_driver_data data;
@@ -4019,6 +4040,9 @@  dbus_bool_t wpas_dbus_getter_sta_tx_packets(
 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT64,
 						&data.tx_packets,
 						error);
+#else /* CONFIG_AP */
+    return FALSE;
+#endif /* CONFIG_AP */
 }
 
 
@@ -4035,6 +4059,7 @@  dbus_bool_t wpas_dbus_getter_sta_tx_bytes(
 	const struct wpa_dbus_property_desc *property_desc,
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+#ifdef CONFIG_AP
 	struct sta_handler_args *args = user_data;
 	struct sta_info *sta;
 	struct hostap_sta_driver_data data;
@@ -4054,6 +4079,9 @@  dbus_bool_t wpas_dbus_getter_sta_tx_bytes(
 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT64,
 						&data.tx_bytes,
 						error);
+#else /* CONFIG_AP */
+    return FALSE;
+#endif /* CONFIG_AP */
 }
 
 
@@ -4070,6 +4098,7 @@  dbus_bool_t wpas_dbus_getter_sta_rx_bytes(
 	const struct wpa_dbus_property_desc *property_desc,
 	DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+#ifdef CONFIG_AP
 	struct sta_handler_args *args = user_data;
 	struct sta_info *sta;
 	struct hostap_sta_driver_data data;
@@ -4089,6 +4118,9 @@  dbus_bool_t wpas_dbus_getter_sta_rx_bytes(
 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT64,
 						&data.rx_bytes,
 						error);
+#else /* CONFIG_AP */
+    return FALSE;
+#endif /* CONFIG_AP */
 }