X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=plugins%2Fsupplicant.h;h=fb49722bca0247551cacebc3a685b61c96ea66d8;hb=ec02283f6e4bcfa2cda224cbc23b398c2862c5d1;hp=849a59dab845e375fd430e9d5f6811c4a6c6d109;hpb=decb27a1cd8cfb19eafd80fc46bc328161738898;p=connman

diff --git a/plugins/supplicant.h b/plugins/supplicant.h
index 849a59d..fb49722 100644
--- a/plugins/supplicant.h
+++ b/plugins/supplicant.h
@@ -20,45 +20,7 @@
  */
 
 #include <connman/device.h>
-#include <connman/element.h>
-
-#define SUPPLICANT_NAME  "fi.epitest.hostap.WPASupplicant"
-#define SUPPLICANT_INTF  "fi.epitest.hostap.WPASupplicant"
-#define SUPPLICANT_PATH  "/fi/epitest/hostap/WPASupplicant"
-
-enum supplicant_state {
-	STATE_INACTIVE,
-	STATE_SCANNING,
-	STATE_ASSOCIATING,
-	STATE_ASSOCIATED,
-	STATE_4WAY_HANDSHAKE,
-	STATE_GROUP_HANDSHAKE,
-	STATE_COMPLETED,
-	STATE_DISCONNECTED,
-};
-
-struct supplicant_network {
-	gchar *identifier;
-	guint8 *ssid;
-	guint ssid_len;
-	guint16 capabilities;
-	gboolean adhoc;
-	gboolean has_wep;
-	gboolean has_wpa;
-	gboolean has_rsn;
-	gint32 quality;
-	gint32 noise;
-	gint32 level;
-	gint32 maxrate;
-};
-
-struct supplicant_callback {
-	void (*state_change) (struct connman_device *device,
-						enum supplicant_state state);
-	void (*clear_results) (struct connman_device *device);
-	void (*scan_result) (struct connman_device *device,
-					struct supplicant_network *network);
-};
+#include <connman/network.h>
 
 struct supplicant_driver {
 	const char *name;
@@ -69,15 +31,9 @@ struct supplicant_driver {
 int supplicant_register(struct supplicant_driver *driver);
 void supplicant_unregister(struct supplicant_driver *driver);
 
-void __supplicant_activate(DBusConnection *conn);
-
-int __supplicant_start(struct connman_device *device,
-					struct supplicant_callback *callback);
-int __supplicant_stop(struct connman_device *device);
-
-int __supplicant_scan(struct connman_device *device);
+int supplicant_start(struct connman_device *device);
+int supplicant_stop(struct connman_device *device);
+int supplicant_scan(struct connman_device *device);
 
-int __supplicant_connect(struct connman_element *element,
-				const unsigned char *ssid, int ssid_len,
-				const char *security, const char *passphrase);
-int __supplicant_disconnect(struct connman_element *element);
+int supplicant_connect(struct connman_network *network);
+int supplicant_disconnect(struct connman_network *network);