fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 09:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-11-26 Dan Williams <dcbw@redhat.com>

Browse source 
Scan using wpa_supplicant over DBus.

	* src/nm-device-802-11-wireless.c
		- remove wireless extensions netlink event handler bits
			(wireless_event_helper, nm_device_802_11_wireless_event)
		- remove wireless extensions scan event handler bits
			(process_scan_results, add_new_ap_to_device_list, hexstr2bin,
			hex2byte, hex2num, request_and_convert_scan_results,
			free_process_scan_cb_data, scan_results_timeout,
			schedule_scan_results_timeout, cancel_scan_results_timeout)
		- Rename nm_device_802_11_wireless_scan() -> request_wireless_scan()
			and request scans from the supplicant interface rather than directly
		- Move functionality of convert_scan_results() to cull_scan_list() and
			supplicant_iface_scanned_ap_cb()
		- (supplicant_iface_scan_result_cb): new function; schedule a new scan
			at the scan interval when the current scan has finished
		- (supplicant_iface_state_cb): start scanning when the supplicant
			interface enters the READY state, and stop scanning when it
			enters the DOWN state
		- (cull_scan_list): weed out old access points from the scan list
		- (supplicant_iface_scanned_ap_cb): convert a supplicant scanned access
			point into an NMAccessPoint and merge it into the device's scan list

	* src/supplicant-manager/nm-supplicant-interface.c
	  src/supplicant-manager/nm-supplicant-interface.h
		- Add a new signal "scan-result" which is issued when the supplicant
			notifies NM that a scan has completed
		- Add a new signal "scanned-ap" that notifies listeners of a new access
			point found in the scan.  Called once for each access point that
			the supplicant interface object receives from the supplicant as a
			result of the "scanResults" method call
		- (wpas_iface_query_scan_results): don't wait 4s before querying
			for the initial scan results
		- (scan_request_cb): new function; send listeners the result
			(success, error) of a wireless scan request
		- (nm_supplicant_interface_request_scan): new function; ask the
			supplicant to perform an immediate wireless scan


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2128 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-11-26 20:49:48 +00:00
parent a600258e3b
commit 56621e5f66
4 changed files with 516 additions and 784 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ChangeLog
View file

@ -1,3 +1,43 @@
2006-11-26 Dan Williams <dcbw@redhat.com>
Scan using wpa_supplicant over DBus.
* src/nm-device-802-11-wireless.c
- remove wireless extensions netlink event handler bits
(wireless_event_helper, nm_device_802_11_wireless_event)
- remove wireless extensions scan event handler bits
(process_scan_results, add_new_ap_to_device_list, hexstr2bin,
hex2byte, hex2num, request_and_convert_scan_results,
free_process_scan_cb_data, scan_results_timeout,
schedule_scan_results_timeout, cancel_scan_results_timeout)
- Rename nm_device_802_11_wireless_scan() -> request_wireless_scan()
and request scans from the supplicant interface rather than directly
- Move functionality of convert_scan_results() to cull_scan_list() and
supplicant_iface_scanned_ap_cb()
- (supplicant_iface_scan_result_cb): new function; schedule a new scan
at the scan interval when the current scan has finished
- (supplicant_iface_state_cb): start scanning when the supplicant
interface enters the READY state, and stop scanning when it
enters the DOWN state
- (cull_scan_list): weed out old access points from the scan list
- (supplicant_iface_scanned_ap_cb): convert a supplicant scanned access
point into an NMAccessPoint and merge it into the device's scan list
* src/supplicant-manager/nm-supplicant-interface.c
src/supplicant-manager/nm-supplicant-interface.h
- Add a new signal "scan-result" which is issued when the supplicant
notifies NM that a scan has completed
- Add a new signal "scanned-ap" that notifies listeners of a new access
point found in the scan. Called once for each access point that
the supplicant interface object receives from the supplicant as a
result of the "scanResults" method call
- (wpas_iface_query_scan_results): don't wait 4s before querying
for the initial scan results
- (scan_request_cb): new function; send listeners the result
(success, error) of a wireless scan request
- (nm_supplicant_interface_request_scan): new function; ask the
supplicant to perform an immediate wireless scan
2006-11-25 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/Makefile.am

1102
src/nm-device-802-11-wireless.c
View file

File diff suppressed because it is too large Load diff

147
src/supplicant-manager/nm-supplicant-interface.c
View file

@ -68,7 +68,8 @@ static void nm_supplicant_interface_set_state (NMSupplicantInterface * self,
enum {
STATE, /* change in the interface's state */
REMOVED, /* interface was removed by the supplicant */
SCAN_RESULTS, /* interface has new scan results */
SCANNED_AP, /* interface saw a new access point from a scan */
SCAN_RESULT, /* result of a wireless scan request */
LAST_SIGNAL
};
static guint nm_supplicant_interface_signals[LAST_SIGNAL] = { 0 };
@ -97,6 +98,7 @@ struct _NMSupplicantInterfacePrivate
char * wpas_net_op;
guint32 wpas_sig_handler_id;
GSource * scan_results_timeout;
guint32 last_scan;
NMSupplicantConnection * con;
@ -389,15 +391,25 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
G_TYPE_NONE, 0);
klass->removed = NULL;
nm_supplicant_interface_signals[SCAN_RESULTS] =
g_signal_new ("scan-results",
nm_supplicant_interface_signals[SCANNED_AP] =
g_signal_new ("scanned-ap",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NMSupplicantInterfaceClass, scan_results),
G_STRUCT_OFFSET (NMSupplicantInterfaceClass, scanned_ap),
NULL, NULL,
nm_marshal_VOID__UINT_UINT,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
klass->scan_results = NULL;
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
klass->scanned_ap = NULL;
nm_supplicant_interface_signals[SCAN_RESULT] =
g_signal_new ("scan-result",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NMSupplicantInterfaceClass, scan_result),
NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT);
klass->scan_result = NULL;
}
GType
@ -473,6 +485,10 @@ bssid_properties_cb (DBusPendingCall * pcall,
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
g_signal_emit (G_OBJECT (self),
nm_supplicant_interface_signals[SCANNED_AP],
0,
reply);
out:
if (reply)
@ -558,6 +574,12 @@ scan_results_cb (DBusPendingCall * pcall,
goto out;
}
/* Notify listeners of the result of the scan */
g_signal_emit (G_OBJECT (self),
nm_supplicant_interface_signals[SCAN_RESULT],
0,
NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS);
/* Fire off a "properties" call for each returned BSSID */
for (item = bssids; *item; item++) {
request_bssid_properties (self, *item);
@ -576,9 +598,10 @@ static gboolean
request_scan_results (gpointer user_data)
{
NMSupplicantInterface * self = (NMSupplicantInterface *) user_data;
DBusMessage * message = NULL;
DBusPendingCall * pcall;
DBusConnection * connection;
DBusMessage * message = NULL;
DBusPendingCall * pcall;
DBusConnection * connection;
GTimeVal cur_time;
if (!self || !self->priv->wpas_iface_op) {
nm_warning ("Invalid user_data or bad supplicant interface object path.");
@ -612,6 +635,9 @@ request_scan_results (gpointer user_data)
}
add_pcall (self, pcall);
g_get_current_time (&cur_time);
self->priv->last_scan = cur_time.tv_sec;
out:
if (message)
dbus_message_unref (message);
@ -642,8 +668,12 @@ wpas_iface_query_scan_results (NMSupplicantInterface * self)
if (!app_data)
return;
/* Only fetch scan results every 4s max */
source = g_timeout_source_new (4000);
/* Only fetch scan results every 4s max, but initially do it right away */
if (self->priv->last_scan == 0) {
source = g_idle_source_new ();
} else {
source = g_timeout_source_new (4000);
}
g_source_set_callback (source, request_scan_results, self, NULL);
id = g_source_attach (source, app_data->main_context);
self->priv->scan_results_timeout = source;
@ -978,3 +1008,96 @@ nm_supplicant_interface_get_device (NMSupplicantInterface * self)
return self->priv->dev;
}
static void
scan_request_cb (DBusPendingCall * pcall,
NMSupplicantInterface * self)
{
DBusError error;
DBusMessage * reply = NULL;
guint32 success = FALSE;
guint32 scan_result = NM_SUPPLICANT_INTERFACE_SCAN_RESULT_ERROR;
g_return_if_fail (pcall != NULL);
g_return_if_fail (self != NULL);
dbus_error_init (&error);
nm_dbus_send_with_callback_replied (pcall, __func__);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
if (!dbus_message_get_args (reply,
&error,
DBUS_TYPE_UINT32, &success,
DBUS_TYPE_INVALID)) {
nm_warning ("could not get scan request result: %s - %s.",
error.name,
error.message);
goto out;
}
/* Notify listeners of the result of the scan */
if (success == 1)
scan_result = NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS;
g_signal_emit (G_OBJECT (self),
nm_supplicant_interface_signals[SCAN_RESULT],
0,
scan_result);
out:
if (reply)
dbus_message_unref (reply);
if (dbus_error_is_set (&error))
dbus_error_free (&error);
remove_pcall (self, pcall);
}
gboolean
nm_supplicant_interface_request_scan (NMSupplicantInterface * self)
{
DBusConnection * dbus_connection;
DBusMessage * message = NULL;
gboolean success = FALSE;
DBusPendingCall * pcall;
g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (self->priv->state != NM_SUPPLICANT_INTERFACE_STATE_READY, FALSE);
dbus_connection = nm_dbus_manager_get_dbus_connection (self->priv->dbus_mgr);
if (!dbus_connection) {
nm_warning ("could not get the dbus connection.");
goto out;
}
message = dbus_message_new_method_call (WPAS_DBUS_SERVICE,
self->priv->wpas_iface_op,
WPAS_DBUS_IFACE_INTERFACE,
"scan");
if (!message) {
nm_warning ("Not enough memory to allocate dbus message.");
goto out;
}
pcall = nm_dbus_send_with_callback (dbus_connection,
message,
(DBusPendingCallNotifyFunction) scan_request_cb,
self,
NULL,
__func__);
if (!pcall) {
nm_warning ("could not send dbus message.");
goto out;
}
add_pcall (self, pcall);
success = TRUE;
out:
if (message)
dbus_message_unref (message);
return success;
}

11
src/supplicant-manager/nm-supplicant-interface.h
View file

@ -51,6 +51,11 @@ enum {
};
enum {
NM_SUPPLICANT_INTERFACE_SCAN_RESULT_ERROR = 0,
NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS
};
#define NM_TYPE_SUPPLICANT_INTERFACE (nm_supplicant_interface_get_type ())
#define NM_SUPPLICANT_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterface))
#define NM_SUPPLICANT_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterfaceClass))
@ -80,7 +85,9 @@ struct _NMSupplicantInterfaceClass
void (* removed) (NMSupplicantInterface * iface);
void (* scan_results) (NMSupplicantInterface * iface);
void (* scanned_ap) (NMSupplicantInterface * iface, DBusMessage * message);
void (* scan_result) (NMSupplicantInterface * iface, guint32 result);
};
@ -94,6 +101,8 @@ void nm_supplicant_interface_set_connection (NMSupplicantInterface * iface,
NMDevice * nm_supplicant_interface_get_device (NMSupplicantInterface * iface);
gboolean nm_supplicant_interface_request_scan (NMSupplicantInterface * self);
G_END_DECLS
#endif /* NM_SUPPLICANT_INTERFACE_H */