Commit graph

58 commits

Author SHA1 Message Date
Thomas Graf
18088e0d07 trivial: add nm_device_get_connection()
Shortcut to access the connection linked to the activation
request of a device.

The patch only replaces usage with nm_device_get_connection()
if the existing code assumes that an activation request must
be available.

Signed-off-by: Thomas Graf <tgraf@redhat.com>
2011-12-06 16:10:23 -06:00
Thomas Graf
5b7503e95e core: use nm_connection_get_setting_<type>() whenever possible
Leads to shorter, easier to read code and improves type casting safety.

Signed-off-by: Thomas Graf <tgraf@redhat.com>
2011-12-06 16:06:43 -06:00
Dan Williams
2099459794 core: add device factory infrastructure and make WiMAX a plugin
This allows us to package WiMAX separately so you can choose
to install WiMAX or not.  For package-based distros you can now
install libnm-device-plugin-wimax.so in a separate package that
links to/requires the Intel WiMAX service instead of having the
main NM package require it and pull it in by default.  This
plugin infrastructure will be extended to other device types
as well.
2011-12-02 13:30:08 -06:00
Dan Williams
da8e21a7d7 core: kill NMDeviceInterface 2011-12-02 13:30:07 -06:00
Dan Williams
6d567e71e6 core: move NMDeviceInterface properties and methods to nm-device.c 2011-12-02 13:30:07 -06:00
Dan Williams
827d9defb9 core: move nm_device_interface_set_enabled() to nm-device.c 2011-12-02 13:30:07 -06:00
Dan Williams
777d9cb182 core: kill IS_ACTIVATING_STATE() 2011-12-02 13:30:06 -06:00
Dan Williams
f8852bf4a4 core: kill nm_device_interface_get_state() 2011-12-02 13:30:06 -06:00
Dan Winship
2510c617ec libnm-util: add ether_ntoa/ether_aton-like utility methods
nm_utils_hwaddr_ntoa() and nm_utils_hwaddr_aton() are like
ether_ntoa()/ether_aton(), but handle IPoIB too.

nm_utils_hwaddr_atoba() is like _aton() but returns a GByteArray,
since that's what's wanted in many places.

Also remove nm_ether_ntop() and replace uses of it with
nm_utils_hwaddr_ntoa().
2011-11-17 13:37:08 -06:00
Thomas Graf
8509e45f31 wimax: include $(LIBNL_CFLAGS) in CFLAGS because nm-device-wimax.c needs nm-system.c
Signed-off-by: Thomas Graf <tgraf@redhat.com>
2011-11-14 18:43:25 -06:00
Dan Williams
c2d2f403a5 wimax: fix link timeout interval
Should be seconds, not milliseconds.
2011-10-28 11:27:05 -05:00
Thomas Graf
00f2b0a9bb core: Include <linux/if.h> instead of <net/if.h>
NM already includes <linux/if.h> in some places, f.e. nm-netlink-monitor and
we can't mix usage of the two. Stick to using <linux/if.h> as it provides
additional flag definitions such as operational link state and link mode.

Signed-off-by: Thomas Graf <tgraf@redhat.com>
2011-09-30 00:18:24 -05:00
Dan Williams
7e96da83e7 wimax: log connection progress information
We don't do anything with it yet, but it's nice to know for debugging.
2011-09-21 00:30:51 -05:00
Dan Williams
4ac8b1cf8e wimax: more verbose interface add/remove logging 2011-09-19 16:44:06 -05:00
Dan Williams
3d898d1b66 wimax: fix connect-during-scan after d4ff43bc1e
Oops; mark prepare_done during stage1 not stage2 since stage1 is Prepare
and stage2 isn't.
2011-09-07 17:20:42 -05:00
Dan Williams
d4ff43bc1e wimax: fix Active NSP notification issue
A race condition meant that sometimes, if the wimax device finished
scanning while stage1 (Prepare) was scheduled but hadn't executed yet:

NetworkManager[8700]: <info> (wmx0): device state change: disconnected -> prepare (reason 'none') [30 40 0]
NetworkManager[8700]: <info> Activation (wmx0) Stage 1 of 5 (Device Prepare) scheduled...
NetworkManager[8700]: <info> (wmx0): wimax state change scanning -> ready (reason 0)

the code would schedule stage2 which meant that stage1 was completely
skipped.  But that's where the active-nsp property was set, which
meant clients would not be notified of the new active NSP.  This
caused nm-applet to show a zero-signal-strength icon for WiMAX
because libnm-glib didn't know there was an active NSP, even though
NM was connected.
2011-09-07 14:20:30 -05:00
Dan Williams
c742cc83fd core: convert up/down check to netlink and use interface index not iface 2011-07-22 13:49:49 -05:00
Dan Williams
d2d1f2e9e0 core: use interface indexes more 2011-07-22 13:37:29 -05:00
Dan Williams
bcba83592e wimax: make sure current NSP is cleared when appropriate
When removing all NSPs in the scan list clearly we should be clearing
out the current NSP as well, since it just got removed from the scan
list.  And make sure the current NSP is cleared when activation fails
or when the device becomes disconnected, since it's not connected to
anything and thus can't have a current NSP either.

The current NSP should only be set during the activation attempt and
while the device is connected.
2011-05-11 15:21:05 -05:00
Dan Williams
f74c9ebe8f wimax: don't attempt to connect while device is scanning
The WiMAX SDK will reject connect requests while the device is scanning,
which happens when right after suspend or when the wimax radio is
turned on.  Postpone the connect attempt until the device says it's
not scanning anymore instead of having the connect attempt fail
and be retried.
2011-05-11 15:21:05 -05:00
Dan Williams
e20d64f76b wimax: handle device removal when the WiMAX Network Service goes away
There's some confusion in the code about indexes; there's the SDK index
from the NS, and there's the internal device index.  Of course we've
got to use the internal device index to remove it from our list, so we
need to convert the SDK index to an internal index before we can call
iwmx_sdk_dev_rm().

Second, the:

if (device_id_list_size < devid->deviceIndex) {

check is useless because by the time we get here, the device is already
gone from the SDK's device list, so this always triggers of the NS
quits.  So just run this check when devices get added to ensure the
NS isn't lying to us.  The, if we get a device removal event, match
up the SDK index with some internal device's SDK index and remove that.
2011-04-01 17:57:09 -05:00
Dan Williams
b2036e264c wimax: log a message when connecting to an NSP 2011-03-17 23:58:50 -05:00
Dan Williams
b21fc6ed45 wimax: use setting accessor helpers 2011-03-15 10:33:04 -05:00
Dan Williams
0e348bad2a wimax: fix dbus-glib assert when wimax strength overflows
Ran into a case right underneath a tower where the Intel WiMAX SDK
reported signal strength as 32767 which is pretty clearly an overflow
of a 16-bit int somewhere in the WiMAX stack.  Since our internal
NMWimaxNsp GObject property for signal-quality has a max value of
100, dbus-glib got pretty angry when GObject failed to return
something because the property value was out of range, leading
to malformed message and the bus daemon kicking us off, and finally
an assertion somewhere.  Fun.
2011-03-11 18:20:42 -06:00
Dan Williams
a4ab74d903 core: don't autocomplete non-IPv6-capable connections with IPv6 enabled
Mobile broadband and PPPoE don't yet support IPv6, so don't enable
IPv6 on these connections when completing them.
2011-02-25 11:58:16 -06:00
Dan Williams
3b61adec74 core: consolidate deactivation methods
deactivate_quickly is misnamed these days; it was originally used
for quickly tearing down a device for sleep and such.  But these
days it's used for the bulk of device deactivation.  Only the wifi
class used the actual deactivate method.  So combine the two and
make device implementations less complicated.
2011-02-24 11:27:42 -06:00
Dan Williams
eab5851145 libnm-util: remove nm_warning/nm_info/nm_error macros
Clients need to do their own logging using glib or whatever; these
macros while somewhat helpful were not flexible and are not a
substitute for actual logging in the client.  g_warning, g_message,
and g_error are more suitable anyway.
2011-02-23 11:42:04 -06:00
Dan Williams
53766ae291 core: move generic connection complete function to a generic location
Out of NMDevice specific places to the utils code, so it can be used
more easily from everywhere.  There's nothing device-specific about
it anyway.
2011-01-13 13:28:52 -06:00
Dan Williams
8259b35ee5 wimax: add connection completion function 2011-01-12 17:46:43 -06:00
Dan Williams
9d24269e30 wimax: add Center Frequency, RSSI, CINR, TX Power, and BSID properties
Useful diagnostic/support info when device is connected.
2011-01-06 15:18:19 -06:00
Dan Williams
430151d6c2 build: make WiMAX support optional 2011-01-05 18:23:08 -06:00
Dan Williams
6971dcd34e wimax: logging cleanup 2011-01-05 17:54:05 -06:00
Dan Williams
6ab1f4f420 wimax: only update NSP properties if they've changed 2011-01-05 17:39:14 -06:00
Dan Williams
13794bfeb6 wimax: poll connected network signal strength 2011-01-05 16:57:56 -06:00
Dan Williams
f87e2251d7 wimax: turn off wimaxd's fast reconnect logic
It eventually gets confusing for everyone.  NM is the policy, so
handle reconnect there.
2011-01-05 16:34:51 -06:00
Dan Williams
89095e9fa7 wimax: fix debug log format string 2011-01-05 16:30:58 -06:00
Dan Williams
5cbe6da10e wimax: release and renew DHCP lease when requested by wimaxd 2011-01-05 16:23:22 -06:00
Dan Williams
6ae91e2f67 wimax: if the device is connected at startup, force it to disconnect
Otherwise it doesn't auto-scan and we get no network list.  As a later
optimization, we could detect this, call iwmx_sdk_get_connected_network()
to get the current NSP, match that up with a connection, and "assume"
the connection like we do for Ethernet devices.
2011-01-05 15:39:07 -06:00
Dan Williams
71adbcbb20 Revert "wimax: if the device is connected at startup, force it to disconnect"
This reverts commit 9c99066d6c.

Yay for finger-memory of git commit -a...
2011-01-05 15:38:03 -06:00
Dan Williams
9c99066d6c wimax: if the device is connected at startup, force it to disconnect
Otherwise it doesn't auto-scan and we get no network list.  As a later
optimization, we could detect this, call iwmx_sdk_get_connected_network()
to get the current NSP, match that up with a connection, and "assume"
the connection like we do for Ethernet devices.
2011-01-05 15:30:59 -06:00
Dan Williams
a9918eefac wimax: protect device add/remove with a mutex
Sometimes the add/remove code will get re-entered by the SDK because
the SDK is stupid.  Lock the code to ensure we don't double-detect
the same device.
2011-01-05 15:27:48 -06:00
Dan Williams
bee33b9a26 wimax: notify listeners of new wimax devices
If wimaxd gets started after NetworkManager, we need to notify
NetworkManager that the daemon has found and set up any wimax
interface it finds.  Most of the code for this was there but
not previously hooked up.
2011-01-05 15:13:04 -06:00
Dan Williams
e598b18656 wimax: add link timeout 2011-01-05 14:06:48 -06:00
Dan Williams
d1c7f3d992 wimax: handle media status change events
Which we need to use for DHCP renew.
2011-01-05 09:59:08 -06:00
Dan Williams
31a0dfa533 wimax: reduce connect timeout a bit 2011-01-04 18:51:51 -06:00
Dan Williams
568f11ee54 wimax: fix disconnect conditions
Only fail an activated device if it's actually activated, and
only fail an activating device if the timeout triggers or if
the connect callback indicates failure, not based on device state.
2011-01-04 18:50:48 -06:00
Dan Williams
597c2aeb80 wimax: fix a few SDK return value checks 2011-01-04 18:50:25 -06:00
Dan Williams
30721f8aa7 wimax: set initial device status 2011-01-04 18:26:52 -06:00
Dan Williams
a802c7f40d wimax: work around wide-char stupidity in Intel WiMAX SDK
The SDK internally use wchar_t for NSP names even though the
names are actually UTF-8 (since the driver uses UTF-8/ASCII). So
work around that by using the full network name buffer in case
the NSP name is an odd number of characters and thus widechar
comparison functions like wcscmp() would fail when given ASCII.
2011-01-04 18:25:14 -06:00
Dan Williams
d11b7bc611 wimax: do nothing if state isn't actually changing 2011-01-04 18:24:10 -06:00