mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-01 00:58:00 +02:00
92412357c3
The port to the new supplicant D-Bus API for NM 0.9 had one unfinished piece, which was to remove old APs from the scan list when the supplicant returned no scan results or there was a scan error. In this case, the removal code would not be called. This wasn't much of a problem until836f7d177ewhich began removing APs from the scan list correctly in this case. This uncovered a bug in NM's wpa_supplicant management code, which was that NM only updates its internal AP object 'last seen' timestamp when the AP is reported by the supplicant as a completely new BSS (in merge_scanned_ap()). But the new supplicant D-Bus interface only reports the BSS as "new" when the supplicant doesn't know about the BSS, either because it is a new BSS or because it's been removed from the supplicant's scan list at some point in the past. Thus for BSSes that are consistently kept in the supplicant's scan list, because the wifi driver is actually doing its job and reporting them consistently in scan results, NM would not be updating the 'last seen' value for the corresponding NM AP objects. Due to836f7d177ethis would cause APs that should be kept to be removed from the NM scan list. To fix this, have the NMAccessPoint object track which supplicant dbus object it came from, and have NMSupplicantInterface listen for PropertyChanged signals for those APs the supplicant knows about. When something changes (like signal strength as the result of updated scan results) update the AP's 'last seen' timestamp since it clearly still exists in the scan list. This way we update the timestamp both when the supplicant finds a new AP and when it updates the properties of existing APs.
121 lines
4.8 KiB
C
121 lines
4.8 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/* NetworkManager -- Network link manager
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright (C) 2004 - 2011 Red Hat, Inc.
|
|
* Copyright (C) 2006 - 2008 Novell, Inc.
|
|
*/
|
|
|
|
#ifndef NM_ACCESS_POINT_H
|
|
#define NM_ACCESS_POINT_H
|
|
|
|
#include <glib.h>
|
|
#include <glib-object.h>
|
|
#include "NetworkManager.h"
|
|
#include "nm-connection.h"
|
|
|
|
#define NM_TYPE_AP (nm_ap_get_type ())
|
|
#define NM_AP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AP, NMAccessPoint))
|
|
#define NM_AP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_AP, NMAccessPointClass))
|
|
#define NM_IS_AP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_AP))
|
|
#define NM_IS_AP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_AP))
|
|
#define NM_AP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_AP, NMAccessPointClass))
|
|
|
|
#define NM_AP_FLAGS "flags"
|
|
#define NM_AP_WPA_FLAGS "wpa-flags"
|
|
#define NM_AP_RSN_FLAGS "rsn-flags"
|
|
#define NM_AP_SSID "ssid"
|
|
#define NM_AP_FREQUENCY "frequency"
|
|
#define NM_AP_HW_ADDRESS "hw-address"
|
|
#define NM_AP_MODE "mode"
|
|
#define NM_AP_MAX_BITRATE "max-bitrate"
|
|
#define NM_AP_STRENGTH "strength"
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
} NMAccessPoint;
|
|
|
|
typedef struct {
|
|
GObjectClass parent;
|
|
|
|
/* Signals */
|
|
void (*properties_changed) (NMAccessPoint *ap, GHashTable *properties);
|
|
} NMAccessPointClass;
|
|
|
|
GType nm_ap_get_type (void);
|
|
|
|
NMAccessPoint * nm_ap_new_from_properties (const char *supplicant_path,
|
|
GHashTable *properties);
|
|
NMAccessPoint * nm_ap_new_fake_from_connection (NMConnection *connection);
|
|
void nm_ap_export_to_dbus (NMAccessPoint *ap);
|
|
|
|
const char * nm_ap_get_dbus_path (NMAccessPoint *ap);
|
|
|
|
const char * nm_ap_get_supplicant_path (NMAccessPoint *ap);
|
|
void nm_ap_set_supplicant_path (NMAccessPoint *ap,
|
|
const char *path);
|
|
|
|
const GByteArray * nm_ap_get_ssid (const NMAccessPoint * ap);
|
|
void nm_ap_set_ssid (NMAccessPoint * ap, const GByteArray * ssid);
|
|
|
|
NM80211ApFlags nm_ap_get_flags (NMAccessPoint *ap);
|
|
void nm_ap_set_flags (NMAccessPoint *ap, NM80211ApFlags flags);
|
|
|
|
NM80211ApSecurityFlags nm_ap_get_wpa_flags (NMAccessPoint *ap);
|
|
void nm_ap_set_wpa_flags (NMAccessPoint *ap, NM80211ApSecurityFlags flags);
|
|
|
|
NM80211ApSecurityFlags nm_ap_get_rsn_flags (NMAccessPoint *ap);
|
|
void nm_ap_set_rsn_flags (NMAccessPoint *ap, NM80211ApSecurityFlags flags);
|
|
|
|
const struct ether_addr * nm_ap_get_address (const NMAccessPoint *ap);
|
|
void nm_ap_set_address (NMAccessPoint *ap, const struct ether_addr *addr);
|
|
|
|
NM80211Mode nm_ap_get_mode (NMAccessPoint *ap);
|
|
void nm_ap_set_mode (NMAccessPoint *ap, const NM80211Mode mode);
|
|
|
|
gint8 nm_ap_get_strength (NMAccessPoint *ap);
|
|
void nm_ap_set_strength (NMAccessPoint *ap, gint8 strength);
|
|
|
|
guint32 nm_ap_get_freq (NMAccessPoint *ap);
|
|
void nm_ap_set_freq (NMAccessPoint *ap, guint32 freq);
|
|
|
|
guint32 nm_ap_get_max_bitrate (NMAccessPoint *ap);
|
|
void nm_ap_set_max_bitrate (NMAccessPoint *ap, guint32 bitrate);
|
|
|
|
gboolean nm_ap_get_fake (const NMAccessPoint *ap);
|
|
void nm_ap_set_fake (NMAccessPoint *ap, gboolean fake);
|
|
|
|
gboolean nm_ap_get_broadcast (NMAccessPoint *ap);
|
|
void nm_ap_set_broadcast (NMAccessPoint *ap, gboolean broadcast);
|
|
|
|
glong nm_ap_get_last_seen (const NMAccessPoint *ap);
|
|
void nm_ap_set_last_seen (NMAccessPoint *ap, const glong last_seen);
|
|
|
|
gboolean nm_ap_check_compatible (NMAccessPoint *self,
|
|
NMConnection *connection);
|
|
|
|
gboolean nm_ap_complete_connection (NMAccessPoint *self,
|
|
NMConnection *connection,
|
|
gboolean lock_bssid,
|
|
GError **error);
|
|
|
|
NMAccessPoint * nm_ap_match_in_list (NMAccessPoint *find_ap,
|
|
GSList *ap_list,
|
|
gboolean strict_match);
|
|
|
|
void nm_ap_dump (NMAccessPoint *ap, const char *prefix);
|
|
|
|
#endif /* NM_ACCESS_POINT_H */
|