ifdef CONFIG_CTRL_IFACE_DBUS
DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE
-DBUS_OBJS += dbus/ctrl_iface_dbus.o dbus/ctrl_iface_dbus_handlers.o
+DBUS_OBJS += dbus/dbus.o dbus/dbus_handlers.o
ifdef CONFIG_WPS
DBUS_OBJS += dbus/dbus_handlers_wps.o
endif
ifdef CONFIG_CTRL_IFACE_DBUS_NEW
DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_NEW
DBUS_OBJS ?= dbus/dbus_dict_helpers.o
-DBUS_OBJS += dbus/ctrl_iface_dbus_new_helpers.o
-DBUS_OBJS += dbus/ctrl_iface_dbus_new.o dbus/ctrl_iface_dbus_new_handlers.o
+DBUS_OBJS += dbus/dbus_new_helpers.o
+DBUS_OBJS += dbus/dbus_new.o dbus/dbus_new_handlers.o
ifdef CONFIG_WPS
DBUS_OBJS += dbus/dbus_new_handlers_wps.o
endif
CFLAGS += $(DBUS_INCLUDE)
LIB_OBJS= \
- ctrl_iface_dbus.o \
- ctrl_iface_dbus_handlers.o \
- ctrl_iface_dbus_new.o \
- ctrl_iface_dbus_new_handlers.o \
- ctrl_iface_dbus_new_helpers.o \
+ dbus.o \
+ dbus_handlers.o \
+ dbus_new.o \
+ dbus_new_handlers.o \
+ dbus_new_helpers.o \
dbus_dict_helpers.o
ifdef CONFIG_WPS
#include "common.h"
#include "eloop.h"
-#include "../config.h"
-#include "../wpa_supplicant_i.h"
#include "drivers/driver.h"
#include "wps/wps.h"
-#include "ctrl_iface_dbus.h"
-#include "ctrl_iface_dbus_handlers.h"
+#include "../config.h"
+#include "../wpa_supplicant_i.h"
+#include "dbus.h"
+#include "dbus_handlers.h"
#define _DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR)
#define DBUS_VER(major, minor) ((major) << 8 | (minor))
#include "includes.h"
#include "common.h"
+#include "eap_peer/eap_methods.h"
+#include "common/ieee802_11_defs.h"
+#include "eapol_supp/eapol_supp_sm.h"
+#include "rsn_supp/wpa.h"
#include "../config.h"
#include "../wpa_supplicant_i.h"
#include "../driver_i.h"
-#include "ctrl_iface_dbus.h"
-#include "ctrl_iface_dbus_handlers.h"
#include "../notify.h"
-#include "eap_peer/eap_methods.h"
-#include "dbus_dict_helpers.h"
-#include "common/ieee802_11_defs.h"
#include "../wpas_glue.h"
-#include "eapol_supp/eapol_supp_sm.h"
-#include "rsn_supp/wpa.h"
+#include "dbus.h"
+#include "dbus_handlers.h"
+#include "dbus_dict_helpers.h"
extern int wpa_debug_level;
extern int wpa_debug_show_keys;
#include "../config.h"
#include "../wpa_supplicant_i.h"
#include "../wps_supplicant.h"
-#include "ctrl_iface_dbus.h"
-#include "ctrl_iface_dbus_handlers.h"
+#include "dbus.h"
+#include "dbus_handlers.h"
/**
* wpas_dbus_iface_wps_pbc - Request credentials using WPS PBC method
#include "includes.h"
#include "common.h"
-#include "../config.h"
-#include "../wpa_supplicant_i.h"
#include "drivers/driver.h"
#include "wps/wps.h"
-#include "ctrl_iface_dbus_new_helpers.h"
+#include "../config.h"
+#include "../wpa_supplicant_i.h"
+#include "dbus_new_helpers.h"
#include "dbus_dict_helpers.h"
-#include "ctrl_iface_dbus_new.h"
-#include "ctrl_iface_dbus_new_handlers.h"
+#include "dbus_new.h"
+#include "dbus_new_handlers.h"
/**
* wpas_dbus_set_path - Assign a dbus path to an interface
#include "includes.h"
#include "common.h"
+#include "common/ieee802_11_defs.h"
+#include "eap_peer/eap_methods.h"
+#include "eapol_supp/eapol_supp_sm.h"
#include "../config.h"
#include "../wpa_supplicant_i.h"
#include "../driver_i.h"
-#include "ctrl_iface_dbus_new_helpers.h"
-#include "ctrl_iface_dbus_new.h"
-#include "ctrl_iface_dbus_new_handlers.h"
#include "../notify.h"
-#include "eap_peer/eap_methods.h"
-#include "dbus_dict_helpers.h"
-#include "common/ieee802_11_defs.h"
#include "../wpas_glue.h"
-#include "eapol_supp/eapol_supp_sm.h"
+#include "dbus_new_helpers.h"
+#include "dbus_new.h"
+#include "dbus_new_handlers.h"
+#include "dbus_dict_helpers.h"
extern int wpa_debug_level;
extern int wpa_debug_show_keys;
#include "../config.h"
#include "../wpa_supplicant_i.h"
#include "../wps_supplicant.h"
-#include "ctrl_iface_dbus_new_helpers.h"
-#include "ctrl_iface_dbus_new.h"
-#include "ctrl_iface_dbus_new_handlers.h"
+#include "dbus_new_helpers.h"
+#include "dbus_new.h"
+#include "dbus_new_handlers.h"
#include "dbus_dict_helpers.h"
/**
#include "common.h"
#include "eloop.h"
-#include "ctrl_iface_dbus_new_helpers.h"
+#include "dbus_new_helpers.h"
/**
* struct wpa_dbus_method_desc - DBus method description