NetworkManager/src/NetworkManagerAP.c
Robert Paskowitz 3ad9d0615c 2004-10-13 Dan Williams <dcbw@redhat.com>
* panel-applet/NMWirelessApplet.c
		- Add function to print out applet_state in a readable
			manner

	* src/NetworkManager.c
		- (main): Don't segfault when nm_dbus_init() fails, we had
			a left-over call to hal_shutdown() into which we passed NULL

	* src/NetworkManagerAP.c
		- (nm_ap_set_essid): Allow NULL essids

	* src/NetworkManagerAPList.[ch]
		- More use of nm_ap_list_[un]lock ()
		- (nm_ap_list_get_ap_by_essid): don't warn when looking for a NULL
			network/essid, just return nothing.  Also skip over NULL
			essid access points in the list when searching
		- (nm_ap_list_get_ap_by_address): new function
		- (nm_ap_list_update_network): set the access point's key source to
			NULL when the key returned from NetworkManagerInfo is NULL or
			of 0 length
		- nm_ap_list_update_keys() -> nm_ap_list_update_properties(), and
			copy timestamp over too
		- (nm_ap_list_copy_essids_by_address): new function, attempt to
			find the correct ESSID for a blank-essid access point by searching
			through another list and matching access point MAC addresses
		- (nm_ap_list_diff): exclude blank-essid access points from the diffs

	* src/NetworkManagerDbus.c
		- (nm_dbus_nm_set_active_device): deal with random networks the user
			may specify.  This is mainly for access points that don't
			broadcast their essid.  So if the user tells us to associate with
			some random ESSID that's not in our access point list, we find
			out if the access point does in fact exist (by attempting association
			and then matching that access point's MAC address with the essid the
			user gave us) and then we switch to it.
		- (nm_dbus_devices_handle_request): don't add blank-essid access points
			to the returned list of networks for the "getNetworks" method

	* src/NetworkManagerDevice.[ch]
		- Extra debugging info for link detection
		- (nm_device_ap_list_get_ap_by_address): new function, return an AP
			based on MAC address
		- (nm_device_get_path_for_ap): ignore blank-essid access points
		- (nm_device_wireless_network_exists): new function, find out whether
			a random ESSID exists by attempting to associate with it
		- (nm_device_do_normal_scan): allow blank-essid access points in our
			device list as long as they have an AP MAC address we can use.
			Also send WirelessNetwork[Dis]Appeared signals for non-active
			devices too.  Lets the applet update more frequently.

	* src/backends/NetworkManagerGentoo.c
		- Patch from: Robert Paskowitz
			- Update backend code for Gentoo
			- Implement nm_system_device_update_config_info ()

	* test/nmclienttest.c
		- (set_network_device): new function, takes a command-line argument
			and tells NetworkManager to use that wireless network


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@222 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2004-10-13 20:57:23 +00:00

417 lines
7.6 KiB
C

/* NetworkManager -- Network link manager
*
* Dan Williams <dcbw@redhat.com>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* (C) Copyright 2004 Red Hat, Inc.
*/
#include "NetworkManagerAP.h"
#include "NetworkManagerUtils.h"
#include "NetworkManagerWireless.h"
/*
* Encapsulates Access Point information
*/
struct NMAccessPoint
{
guint refcount;
char *essid;
struct ether_addr *address;
gint8 strength;
double freq;
guint16 rate;
gboolean encrypted;
gboolean invalid;
gboolean matched; // used in ap list diffing
gboolean trusted;
/* Things from user prefs */
char *enc_key;
NMAPEncMethod enc_method;
GTimeVal timestamp;
};
/*
* nm_ap_new
*
* Create a new, blank user access point info structure
*
*/
NMAccessPoint * nm_ap_new (void)
{
NMAccessPoint *ap;
ap = g_new0 (NMAccessPoint, 1);
if (!ap)
{
syslog (LOG_ERR, "nm_ap_new() could not allocate a new user access point info structure. Not enough memory?");
return (NULL);
}
ap->refcount = 1;
return (ap);
}
/*
* nm_ap_new_from_ap
*
* Create a new user access point info structure, duplicating an existing one
*
*/
NMAccessPoint * nm_ap_new_from_ap (NMAccessPoint *src_ap)
{
NMAccessPoint *new_ap;
struct ether_addr *new_addr;
g_return_val_if_fail (src_ap != NULL, NULL);
new_addr = g_new0 (struct ether_addr, 1);
g_return_val_if_fail (new_addr != NULL, NULL);
new_ap = nm_ap_new();
if (!new_ap)
{
syslog (LOG_ERR, "nm_ap_new_from_uap() could not allocate a new user access point structure. Not enough memory?");
return (NULL);
}
new_ap->refcount = 1;
if (src_ap->essid && (strlen (src_ap->essid) > 0))
new_ap->essid = g_strdup (src_ap->essid);
if (src_ap->address)
{
memcpy (new_addr, src_ap->address, sizeof (struct ether_addr));
new_ap->address = new_addr;
}
new_ap->strength = src_ap->strength;
new_ap->freq = src_ap->freq;
new_ap->rate = src_ap->rate;
new_ap->encrypted = src_ap->encrypted;
if (src_ap->enc_key && (strlen (src_ap->enc_key) > 0))
new_ap->enc_key = g_strdup (src_ap->enc_key);
return (new_ap);
}
/*
* AP refcounting functions
*/
void nm_ap_ref (NMAccessPoint *ap)
{
g_return_if_fail (ap != NULL);
ap->refcount++;
}
void nm_ap_unref (NMAccessPoint *ap)
{
g_return_if_fail (ap != NULL);
ap->refcount--;
if (ap->refcount == 0)
{
g_free (ap->essid);
g_free (ap->address);
g_free (ap->enc_key);
ap->essid = NULL;
ap->enc_key = NULL;
g_free (ap);
}
}
/*
* Get/set functions for timestamp
*
*/
const GTimeVal *nm_ap_get_timestamp (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, 0);
return (&ap->timestamp);
}
void nm_ap_set_timestamp (NMAccessPoint *ap, const GTimeVal *timestamp)
{
g_return_if_fail (ap != NULL);
ap->timestamp = *timestamp;
}
/*
* Get/set functions for essid
*
*/
char * nm_ap_get_essid (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, NULL);
return (ap->essid);
}
void nm_ap_set_essid (NMAccessPoint *ap, char * essid)
{
g_return_if_fail (ap != NULL);
if (ap->essid)
{
g_free (ap->essid);
ap->essid = NULL;
}
if (essid)
ap->essid = g_strdup (essid);
}
/*
* Get/set functions for encryption key
*
*/
char * nm_ap_get_enc_key_source (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, NULL);
return (ap->enc_key);
}
void nm_ap_set_enc_key_source (NMAccessPoint *ap, char * key, NMAPEncMethod method)
{
g_return_if_fail (ap != NULL);
if (ap->enc_key)
g_free (ap->enc_key);
ap->enc_key = g_strdup (key);
ap->enc_method = method;
}
char *nm_ap_get_enc_key_hashed (NMAccessPoint *ap)
{
char *hashed = NULL;
char *source_key;
g_return_val_if_fail (ap != NULL, NULL);
source_key = nm_ap_get_enc_key_source (ap);
switch (ap->enc_method)
{
case (NM_AP_ENC_METHOD_128_BIT_PASSPHRASE):
if (source_key)
hashed = nm_wireless_128bit_key_from_passphrase (source_key);
break;
case (NM_AP_ENC_METHOD_40_BIT_PASSPHRASE):
case (NM_AP_ENC_METHOD_128_BIT_HEX_KEY):
case (NM_AP_ENC_METHOD_UNKNOWN):
if (source_key)
hashed = g_strdup (source_key);
break;
default:
break;
}
return (hashed);
}
/*
* Get/set functions for encrypted flag
*
*/
gboolean nm_ap_get_encrypted (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, FALSE);
return (ap->encrypted);
}
void nm_ap_set_encrypted (NMAccessPoint *ap, gboolean encrypted)
{
g_return_if_fail (ap != NULL);
ap->encrypted = encrypted;
}
/*
* Get/set functions for address
*
*/
struct ether_addr * nm_ap_get_address (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, NULL);
return (ap->address);
}
void nm_ap_set_address (NMAccessPoint *ap, const struct ether_addr * addr)
{
struct ether_addr *new_addr;
g_return_if_fail (ap != NULL);
new_addr = g_new0 (struct ether_addr, 1);
g_return_if_fail (new_addr != NULL);
if (ap->address)
g_free (ap->address);
memcpy (new_addr, addr, sizeof (struct ether_addr));
ap->address = new_addr;
}
/*
* Get/set functions for strength
*
*/
gint8 nm_ap_get_strength (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, 0);
return (ap->strength);
}
void nm_ap_set_strength (NMAccessPoint *ap, gint8 strength)
{
g_return_if_fail (ap != NULL);
ap->strength = strength;
}
/*
* Get/set functions for frequency
*
*/
double nm_ap_get_freq (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, 0);
return (ap->freq);
}
void nm_ap_set_freq (NMAccessPoint *ap, double freq)
{
g_return_if_fail (ap != NULL);
ap->freq = freq;
}
/*
* Get/set functions for rate
*
*/
guint16 nm_ap_get_rate (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, 0);
return (ap->rate);
}
void nm_ap_set_rate (NMAccessPoint *ap, guint16 rate)
{
g_return_if_fail (ap != NULL);
ap->rate = rate;
}
/*
* Get/set functions for "invalid" access points, ie ones
* for which a user explicitly does not wish to connect to
* (by cancelling requests for WEP key, for example)
*
*/
gboolean nm_ap_get_invalid (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, TRUE);
return (ap->invalid);
}
void nm_ap_set_invalid (NMAccessPoint *ap, gboolean invalid)
{
g_return_if_fail (ap != NULL);
ap->invalid = invalid;
}
/*
* Get/set functions for "matched", which is used by
* the ap list diffing functions to speed up the diff
*
*/
gboolean nm_ap_get_matched (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, TRUE);
return (ap->matched);
}
void nm_ap_set_matched (NMAccessPoint *ap, gboolean matched)
{
g_return_if_fail (ap != NULL);
ap->matched = matched;
}
/*
* Get/Set functions to indicate that an access point is
* 'trusted'
*
*/
gboolean nm_ap_get_trusted (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, FALSE);
return (ap->trusted);
}
void nm_ap_set_trusted (NMAccessPoint *ap, gboolean trusted)
{
g_return_if_fail (ap != NULL);
ap->trusted = trusted;
}
/*
* Return the encryption method the user specified for this access point.
*
*/
const NMAPEncMethod nm_ap_get_enc_method (NMAccessPoint *ap)
{
g_return_val_if_fail (ap != NULL, TRUE);
return (ap->enc_method);
}