mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-24 18:20:07 +01:00
* Kill dhcpcd. We now use "dhcdbd", a dbus daemon that controls dhclient. This means that NetworkManager shouldn't have DHCP issues anymore. It also means you need dhcdbd, which you can get here (get the latest one): http://people.redhat.com/jvdias/dhcdbd/ Technically NetworkManager can use any DHCP daemon that uses the same DBUS interface as dhcdbd. * Rewrite device activation to facilitate the new DHCP infrastructure and future improvements. Its now "activation request" based, ie there is a single activation request composed of the device, access point, and other info which follows the entire activation process. There are 5 stages of the activation process which correspond to: 1) Device preparation 2) Device configuration (bring it up, set ESSID/Key/etc) 3) IP Config Start (fire off DHCP if we're using it) 4) IP Config Get (grab config from DHCP or static config files) 5) IP Config Commit (set device's IP address, DNS, etc) Note that there is no longer a "scanning" step, since the access point must be known _before_ activation starts. If the access point drops out or does not exist for some reason, the entire activation process fails and must be restarted for a different access point or device. Patch from Bill Moss: * gnome/applet/applet.c - Fix type of vpn_failure dialog -> vpn_banner dialog git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@597 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
803 lines
18 KiB
C
803 lines
18 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 <glib.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <linux/sockios.h>
|
|
#include <syslog.h>
|
|
#include <stdarg.h>
|
|
#include <sys/time.h>
|
|
#include <string.h>
|
|
#include <signal.h>
|
|
#include <iwlib.h>
|
|
|
|
#include "NetworkManager.h"
|
|
#include "NetworkManagerUtils.h"
|
|
#include "nm-utils.h"
|
|
|
|
|
|
struct NMSock
|
|
{
|
|
int fd;
|
|
char *func;
|
|
char *desc;
|
|
NMDevice *dev;
|
|
};
|
|
|
|
static GSList *sock_list = NULL;
|
|
static GStaticMutex sock_list_mutex = G_STATIC_MUTEX_INIT;
|
|
|
|
typedef struct MutexDesc
|
|
{
|
|
GMutex *mutex;
|
|
char *desc;
|
|
} MutexDesc;
|
|
|
|
GSList *mutex_descs = NULL;
|
|
|
|
/*#define LOCKING_DEBUG*/
|
|
|
|
|
|
static MutexDesc *nm_find_mutex_desc (GMutex *mutex)
|
|
{
|
|
GSList *elt;
|
|
|
|
for (elt = mutex_descs; elt; elt = g_slist_next (elt))
|
|
{
|
|
MutexDesc *desc = (MutexDesc *)(elt->data);
|
|
if (desc && (desc->mutex == mutex))
|
|
return desc;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_register_mutex_desc
|
|
*
|
|
* Associate a description with a particular mutex.
|
|
*
|
|
*/
|
|
void nm_register_mutex_desc (GMutex *mutex, char *string)
|
|
{
|
|
if (!(nm_find_mutex_desc (mutex)))
|
|
{
|
|
MutexDesc *desc = g_malloc0 (sizeof (MutexDesc));
|
|
desc->mutex = mutex;
|
|
desc->desc = g_strdup (string);
|
|
mutex_descs = g_slist_append (mutex_descs, desc);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_try_acquire_mutex
|
|
*
|
|
* Tries to acquire a given mutex, sleeping a bit between tries.
|
|
*
|
|
* Returns: FALSE if mutex was not acquired
|
|
* TRUE if mutex was successfully acquired
|
|
*/
|
|
gboolean nm_try_acquire_mutex (GMutex *mutex, const char *func)
|
|
{
|
|
g_return_val_if_fail (mutex != NULL, FALSE);
|
|
|
|
if (g_mutex_trylock (mutex))
|
|
{
|
|
#ifdef LOCKING_DEBUG
|
|
if (func)
|
|
{
|
|
MutexDesc *desc = nm_find_mutex_desc (mutex);
|
|
nm_debug ("MUTEX: <%s %p> acquired by %s", desc ? desc->desc : "(none)", mutex, func);
|
|
}
|
|
#endif
|
|
return (TRUE);
|
|
}
|
|
|
|
#ifdef LOCKING_DEBUG
|
|
if (func)
|
|
{
|
|
MutexDesc *desc = nm_find_mutex_desc (mutex);
|
|
nm_debug ("MUTEX: <%s %p> FAILED to be acquired by %s", desc ? desc->desc : "(none)", mutex, func);
|
|
}
|
|
#endif
|
|
return (FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_lock_mutex
|
|
*
|
|
* Blocks until a mutex is grabbed, with debugging.
|
|
*
|
|
*/
|
|
void nm_lock_mutex (GMutex *mutex, const char *func)
|
|
{
|
|
#ifdef LOCKING_DEBUG
|
|
if (func)
|
|
{
|
|
MutexDesc *desc = nm_find_mutex_desc (mutex);
|
|
nm_debug ("MUTEX: <%s %p> being acquired by %s", desc ? desc->desc : "(none)", mutex, func);
|
|
}
|
|
#endif
|
|
g_mutex_lock (mutex);
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_unlock_mutex
|
|
*
|
|
* Simply unlocks a mutex, balances nm_try_acquire_mutex()
|
|
*
|
|
*/
|
|
void nm_unlock_mutex (GMutex *mutex, const char *func)
|
|
{
|
|
g_return_if_fail (mutex != NULL);
|
|
|
|
#ifdef LOCKING_DEBUG
|
|
if (func)
|
|
{
|
|
MutexDesc *desc = nm_find_mutex_desc (mutex);
|
|
nm_debug ("MUTEX: <%s %p> released by %s", desc ? desc->desc : "(none)", mutex, func);
|
|
}
|
|
#endif
|
|
|
|
g_mutex_unlock (mutex);
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_dev_sock_open
|
|
*
|
|
* Open a socket to a network device and store some debug info about it.
|
|
*
|
|
*/
|
|
NMSock *nm_dev_sock_open (NMDevice *dev, SockType type, const char *func_name, const char *desc)
|
|
{
|
|
NMSock *sock = NULL;
|
|
|
|
sock = g_malloc0 (sizeof (NMSock));
|
|
|
|
sock->fd = -1;
|
|
|
|
switch (type)
|
|
{
|
|
case DEV_WIRELESS:
|
|
sock->fd = iw_sockets_open ();
|
|
break;
|
|
|
|
case DEV_GENERAL:
|
|
if ((sock->fd = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
|
|
if ((sock->fd = socket (PF_PACKET, SOCK_DGRAM, 0)) < 0)
|
|
sock->fd = socket (PF_INET6, SOCK_DGRAM, 0);
|
|
break;
|
|
|
|
case NETWORK_CONTROL:
|
|
sock->fd = socket (AF_PACKET, SOCK_PACKET, htons (ETH_P_ALL));
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (sock->fd < 0)
|
|
{
|
|
g_free (sock);
|
|
nm_warning ("Could not open control socket for device '%s'.", dev ? nm_device_get_iface (dev) : "none");
|
|
return NULL;
|
|
}
|
|
|
|
sock->func = func_name ? g_strdup (func_name) : NULL;
|
|
sock->desc = desc ? g_strdup (desc) : NULL;
|
|
sock->dev = dev;
|
|
if (sock->dev)
|
|
nm_device_ref (sock->dev);
|
|
|
|
/* Add the sock to our global sock list for tracking */
|
|
g_static_mutex_lock (&sock_list_mutex);
|
|
sock_list = g_slist_append (sock_list, sock);
|
|
g_static_mutex_unlock (&sock_list_mutex);
|
|
|
|
return sock;
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_dev_sock_close
|
|
*
|
|
* Close a socket and free its debug data.
|
|
*
|
|
*/
|
|
void nm_dev_sock_close (NMSock *sock)
|
|
{
|
|
GSList *elt;
|
|
|
|
g_return_if_fail (sock != NULL);
|
|
|
|
close (sock->fd);
|
|
g_free (sock->func);
|
|
g_free (sock->desc);
|
|
if (sock->dev)
|
|
nm_device_unref (sock->dev);
|
|
|
|
memset (sock, 0, sizeof (NMSock));
|
|
|
|
g_static_mutex_lock (&sock_list_mutex);
|
|
for (elt = sock_list; elt; elt = g_slist_next (elt))
|
|
{
|
|
NMSock *temp_sock = (NMSock *)(elt->data);
|
|
if (temp_sock == sock)
|
|
{
|
|
sock_list = g_slist_remove_link (sock_list, elt);
|
|
g_slist_free (elt);
|
|
break;
|
|
}
|
|
}
|
|
g_static_mutex_unlock (&sock_list_mutex);
|
|
|
|
g_free (sock);
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_dev_sock_get_fd
|
|
*
|
|
* Return the fd associated with an NMSock
|
|
*
|
|
*/
|
|
int nm_dev_sock_get_fd (NMSock *sock)
|
|
{
|
|
g_return_val_if_fail (sock != NULL, -1);
|
|
|
|
return sock->fd;
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_print_open_socks
|
|
*
|
|
* Print a list of currently open and registered NMSocks.
|
|
*
|
|
*/
|
|
void nm_print_open_socks (void)
|
|
{
|
|
GSList *elt = NULL;
|
|
int i = 0;
|
|
|
|
nm_debug ("Open Sockets List:");
|
|
g_static_mutex_lock (&sock_list_mutex);
|
|
for (elt = sock_list; elt; elt = g_slist_next (elt))
|
|
{
|
|
NMSock *sock = (NMSock *)(elt->data);
|
|
if (sock)
|
|
{
|
|
i++;
|
|
nm_debug (" %d: %s fd:%d F:'%s' D:'%s'", i, sock->dev ? nm_device_get_iface (sock->dev) : "",
|
|
sock->fd, sock->func, sock->desc);
|
|
}
|
|
}
|
|
g_static_mutex_unlock (&sock_list_mutex);
|
|
nm_debug ("Open Sockets List Done.");
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_null_safe_strcmp
|
|
*
|
|
* Doesn't freaking segfault if s1/s2 are NULL
|
|
*
|
|
*/
|
|
int nm_null_safe_strcmp (const char *s1, const char *s2)
|
|
{
|
|
if (!s1 && !s2)
|
|
return 0;
|
|
if (!s1 && s2)
|
|
return -1;
|
|
if (s1 && !s2)
|
|
return 1;
|
|
|
|
return (strcmp (s1, s2));
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_ethernet_address_is_valid
|
|
*
|
|
* Compares an ethernet address against known invalid addresses.
|
|
*
|
|
*/
|
|
gboolean nm_ethernet_address_is_valid (const struct ether_addr *test_addr)
|
|
{
|
|
gboolean valid = FALSE;
|
|
struct ether_addr invalid_addr1 = { {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF} };
|
|
struct ether_addr invalid_addr2 = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
|
|
struct ether_addr invalid_addr3 = { {0x44, 0x44, 0x44, 0x44, 0x44, 0x44} };
|
|
struct ether_addr invalid_addr4 = { {0x00, 0x30, 0xb4, 0x00, 0x00, 0x00} }; /* prism54 dummy MAC */
|
|
|
|
g_return_val_if_fail (test_addr != NULL, FALSE);
|
|
|
|
/* Compare the AP address the card has with invalid ethernet MAC addresses. */
|
|
if ( (memcmp(test_addr, &invalid_addr1, sizeof(struct ether_addr)) != 0)
|
|
&& (memcmp(test_addr, &invalid_addr2, sizeof(struct ether_addr)) != 0)
|
|
&& (memcmp(test_addr, &invalid_addr3, sizeof(struct ether_addr)) != 0)
|
|
&& (memcmp(test_addr, &invalid_addr4, sizeof(struct ether_addr)) != 0)
|
|
&& ((test_addr->ether_addr_octet[0] & 1) == 0)) /* Multicast addresses */
|
|
valid = TRUE;
|
|
|
|
return (valid);
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_dispose_scan_results
|
|
*
|
|
* Free memory used by the wireless scan results structure
|
|
*
|
|
*/
|
|
void nm_dispose_scan_results (wireless_scan *result_list)
|
|
{
|
|
wireless_scan *tmp = result_list;
|
|
|
|
while (tmp)
|
|
{
|
|
wireless_scan *tmp2 = tmp;
|
|
|
|
tmp = tmp->next;
|
|
free (tmp2);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_spawn_process
|
|
*
|
|
* Wrap g_spawn_sync in a usable manner
|
|
*
|
|
*/
|
|
int nm_spawn_process (char *args)
|
|
{
|
|
gint num_args;
|
|
char **argv = NULL;
|
|
int exit_status = -1;
|
|
GError *error = NULL;
|
|
char *so = NULL;
|
|
char *se = NULL;
|
|
|
|
g_return_val_if_fail (args != NULL, -1);
|
|
|
|
if (g_shell_parse_argv (args, &num_args, &argv, &error))
|
|
{
|
|
GError *error2 = NULL;
|
|
|
|
if (!g_spawn_sync ("/", argv, NULL, 0, NULL, NULL, &so, &se, &exit_status, &error2))
|
|
nm_warning ("nm_spawn_process('%s'): could not spawn process. (%s)\n", args, error2->message);
|
|
|
|
if (so) g_free(so);
|
|
if (se) g_free(se);
|
|
if (argv) g_strfreev (argv);
|
|
if (error2) g_error_free (error2);
|
|
} else nm_warning ("nm_spawn_process('%s'): could not parse arguments (%s)\n", args, error->message);
|
|
|
|
if (error) g_error_free (error);
|
|
|
|
return (exit_status);
|
|
}
|
|
|
|
|
|
typedef struct driver_support
|
|
{
|
|
char *name;
|
|
NMDriverSupportLevel level;
|
|
} driver_support;
|
|
|
|
|
|
/* Blacklist of unsupported wireless drivers */
|
|
static driver_support wireless_driver_blacklist[] =
|
|
{
|
|
{NULL, NM_DRIVER_UNSUPPORTED}
|
|
};
|
|
|
|
|
|
/* Blacklist of unsupported wired drivers. Drivers/cards that don't support
|
|
* link detection should be blacklisted.
|
|
*/
|
|
static driver_support wired_driver_blacklist[] =
|
|
{
|
|
/* Completely unsupported drivers */
|
|
{NULL, NM_DRIVER_UNSUPPORTED}
|
|
};
|
|
|
|
|
|
/*
|
|
* nm_get_device_driver_name
|
|
*
|
|
*
|
|
*/
|
|
char *nm_get_device_driver_name (LibHalContext *ctx, NMDevice *dev)
|
|
{
|
|
char *udi = NULL;
|
|
char *driver_name = NULL;
|
|
|
|
g_return_val_if_fail (ctx != NULL, NULL);
|
|
g_return_val_if_fail (dev != NULL, NULL);
|
|
|
|
if ((udi = nm_device_get_udi (dev)))
|
|
{
|
|
char *parent_udi = libhal_device_get_property_string (ctx, udi, "info.parent", NULL);
|
|
|
|
if (parent_udi && libhal_device_property_exists (ctx, parent_udi, "info.linux.driver", NULL))
|
|
driver_name = libhal_device_get_property_string (ctx, parent_udi, "info.linux.driver", NULL);
|
|
g_free(parent_udi);
|
|
}
|
|
|
|
return (driver_name);
|
|
}
|
|
|
|
/*
|
|
* nm_get_wireless_driver_support_level
|
|
*
|
|
* Blacklist certain wireless devices.
|
|
*
|
|
*/
|
|
NMDriverSupportLevel nm_get_wireless_driver_support_level (LibHalContext *ctx, NMDevice *dev, char **driver)
|
|
{
|
|
NMDriverSupportLevel level = NM_DRIVER_FULLY_SUPPORTED;
|
|
char *driver_name = NULL;
|
|
|
|
g_return_val_if_fail (ctx != NULL, NM_DRIVER_UNSUPPORTED);
|
|
g_return_val_if_fail (dev != NULL, NM_DRIVER_UNSUPPORTED);
|
|
g_return_val_if_fail (driver != NULL, NM_DRIVER_UNSUPPORTED);
|
|
g_return_val_if_fail (*driver == NULL, NM_DRIVER_UNSUPPORTED);
|
|
|
|
if ((driver_name = nm_get_device_driver_name (ctx, dev)))
|
|
{
|
|
driver_support *drv;
|
|
for (drv = &wireless_driver_blacklist[0]; drv->name; drv++)
|
|
{
|
|
if (!strcmp (drv->name, driver_name))
|
|
{
|
|
level = drv->level;
|
|
break;
|
|
}
|
|
}
|
|
*driver = g_strdup (driver_name);
|
|
g_free (driver_name);
|
|
}
|
|
|
|
/* Check for carrier detection support */
|
|
if ((level != NM_DRIVER_UNSUPPORTED) && !nm_device_get_supports_wireless_scan (dev))
|
|
level = NM_DRIVER_NO_WIRELESS_SCAN;
|
|
|
|
return (level);
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_get_wired_driver_support_level
|
|
*
|
|
* Blacklist certain devices.
|
|
*
|
|
*/
|
|
NMDriverSupportLevel nm_get_wired_driver_support_level (LibHalContext *ctx, NMDevice *dev, char **driver)
|
|
{
|
|
NMDriverSupportLevel level = NM_DRIVER_FULLY_SUPPORTED;
|
|
char *driver_name = NULL;
|
|
char *usb_test;
|
|
char *udi;
|
|
|
|
g_return_val_if_fail (ctx != NULL, NM_DRIVER_UNSUPPORTED);
|
|
g_return_val_if_fail (dev != NULL, NM_DRIVER_UNSUPPORTED);
|
|
g_return_val_if_fail (driver != NULL, NM_DRIVER_UNSUPPORTED);
|
|
g_return_val_if_fail (*driver == NULL, NM_DRIVER_UNSUPPORTED);
|
|
|
|
if ((driver_name = nm_get_device_driver_name (ctx, dev)))
|
|
{
|
|
driver_support *drv;
|
|
for (drv = &wired_driver_blacklist[0]; drv->name; drv++)
|
|
{
|
|
if (!strcmp (drv->name, driver_name))
|
|
{
|
|
level = drv->level;
|
|
break;
|
|
}
|
|
}
|
|
*driver = g_strdup (driver_name);
|
|
g_free (driver_name);
|
|
}
|
|
|
|
/* cipsec devices are also explicitly unsupported at this time */
|
|
if (strstr (nm_device_get_iface (dev), "cipsec"))
|
|
level = NM_DRIVER_UNSUPPORTED;
|
|
|
|
/* Ignore Ethernet-over-USB devices too for the moment (Red Hat #135722) */
|
|
udi = nm_device_get_udi (dev);
|
|
if ( libhal_device_property_exists (ctx, udi, "usb.interface.class", NULL)
|
|
&& (usb_test = libhal_device_get_property_string (ctx, udi, "usb.interface.class", NULL)))
|
|
{
|
|
libhal_free_string (usb_test);
|
|
level = NM_DRIVER_UNSUPPORTED;
|
|
}
|
|
|
|
/* Check for carrier detection support */
|
|
if ((level != NM_DRIVER_UNSUPPORTED) && !nm_device_get_supports_carrier_detect(dev))
|
|
level = NM_DRIVER_NO_CARRIER_DETECT;
|
|
|
|
return (level);
|
|
}
|
|
|
|
|
|
/*
|
|
* nm_get_driver_support_level
|
|
*
|
|
* Return the driver support level for a particular device.
|
|
*
|
|
*/
|
|
NMDriverSupportLevel nm_get_driver_support_level (LibHalContext *ctx, NMDevice *dev)
|
|
{
|
|
char *driver = NULL;
|
|
NMDriverSupportLevel level = NM_DRIVER_UNSUPPORTED;
|
|
|
|
g_return_val_if_fail (ctx != NULL, NM_DRIVER_UNSUPPORTED);
|
|
g_return_val_if_fail (dev != NULL, NM_DRIVER_UNSUPPORTED);
|
|
|
|
if (nm_device_is_wireless (dev))
|
|
level = nm_get_wireless_driver_support_level (ctx, dev, &driver);
|
|
else if (nm_device_is_wired (dev))
|
|
level = nm_get_wired_driver_support_level (ctx, dev, &driver);
|
|
|
|
switch (level)
|
|
{
|
|
case NM_DRIVER_NO_CARRIER_DETECT:
|
|
nm_info ("%s: Driver '%s' does not support carrier detection.\n"
|
|
"\tYou must switch to it manually.", nm_device_get_iface (dev), driver);
|
|
break;
|
|
case NM_DRIVER_NO_WIRELESS_SCAN:
|
|
nm_info ("%s: Driver '%s' does not support wireless scanning.\n"
|
|
"\tNetworkManager will not be able to fully use the card.",
|
|
nm_device_get_iface (dev), driver);
|
|
break;
|
|
case NM_DRIVER_FULLY_SUPPORTED:
|
|
nm_info ("%s: Driver support level for '%s' is fully-supported",
|
|
nm_device_get_iface (dev), driver);
|
|
break;
|
|
default:
|
|
nm_info ("%s: Driver support level for '%s' is unsupported",
|
|
nm_device_get_iface (dev), driver);
|
|
break;
|
|
}
|
|
|
|
g_free (driver);
|
|
return (level);
|
|
}
|
|
|
|
static inline int nm_timeval_cmp(const struct timeval *a,
|
|
const struct timeval *b)
|
|
{
|
|
int x;
|
|
x = a->tv_sec - b->tv_sec;
|
|
x *= G_USEC_PER_SEC;
|
|
if (x)
|
|
return x;
|
|
x = a->tv_usec - b->tv_usec;
|
|
if (x)
|
|
return x;
|
|
return 0;
|
|
}
|
|
|
|
static inline int nm_timeval_has_passed(const struct timeval *a)
|
|
{
|
|
struct timeval current;
|
|
|
|
gettimeofday(¤t, NULL);
|
|
|
|
return (nm_timeval_cmp(¤t, a) >= 0);
|
|
}
|
|
|
|
static inline void nm_timeval_add(struct timeval *a,
|
|
const struct timeval *b)
|
|
{
|
|
struct timeval b1;
|
|
|
|
memmove(&b1, b, sizeof b1);
|
|
|
|
/* normalize a and b to be positive for everything */
|
|
while (a->tv_usec < 0)
|
|
{
|
|
a->tv_sec--;
|
|
a->tv_usec += G_USEC_PER_SEC;
|
|
}
|
|
while (b1.tv_usec < 0)
|
|
{
|
|
b1.tv_sec--;
|
|
b1.tv_usec += G_USEC_PER_SEC;
|
|
}
|
|
|
|
/* now add secs and usecs */
|
|
a->tv_sec += b1.tv_sec;
|
|
a->tv_usec += b1.tv_usec;
|
|
|
|
/* and handle our overflow */
|
|
if (a->tv_usec > G_USEC_PER_SEC)
|
|
{
|
|
a->tv_sec++;
|
|
a->tv_usec -= G_USEC_PER_SEC;
|
|
}
|
|
}
|
|
|
|
static void nm_v_wait_for_completion_or_timeout(
|
|
const int max_tries,
|
|
const struct timeval *max_time,
|
|
const guint interval_usecs,
|
|
nm_completion_func test_func,
|
|
nm_completion_func action_func,
|
|
nm_completion_args args)
|
|
{
|
|
int try;
|
|
gboolean finished = FALSE;
|
|
struct timeval finish_time;
|
|
|
|
g_return_if_fail (test_func || action_func);
|
|
|
|
if (max_time) {
|
|
gettimeofday(&finish_time, NULL);
|
|
nm_timeval_add(&finish_time, max_time);
|
|
}
|
|
|
|
try = -1;
|
|
while (!finished &&
|
|
(max_tries == NM_COMPLETION_TRIES_INFINITY || try < max_tries))
|
|
{
|
|
if (max_time && nm_timeval_has_passed(&finish_time))
|
|
break;
|
|
try++;
|
|
if (test_func)
|
|
{
|
|
finished = (*test_func)(try, args);
|
|
if (finished)
|
|
break;
|
|
}
|
|
|
|
/* #define NM_SLEEP_DEBUG */
|
|
#ifdef NM_SLEEP_DEBUG
|
|
syslog (LOG_INFO, "sleeping or %d usecs", interval_usecs);
|
|
#endif
|
|
g_usleep(interval_usecs);
|
|
if (action_func)
|
|
finished = (*action_func)(try, args);
|
|
}
|
|
}
|
|
|
|
/* these should probably be moved to NetworkManagerUtils.h as macros
|
|
* since they don't do varargs stuff any more */
|
|
void nm_wait_for_completion_or_timeout(
|
|
const int max_tries,
|
|
const struct timeval *max_time,
|
|
const guint interval_usecs,
|
|
nm_completion_func test_func,
|
|
nm_completion_func action_func,
|
|
nm_completion_args args)
|
|
{
|
|
nm_v_wait_for_completion_or_timeout(max_tries, max_time,
|
|
interval_usecs, test_func,
|
|
action_func, args);
|
|
}
|
|
|
|
void nm_wait_for_completion(
|
|
const int max_tries,
|
|
const guint interval_usecs,
|
|
nm_completion_func test_func,
|
|
nm_completion_func action_func,
|
|
nm_completion_args args)
|
|
{
|
|
nm_v_wait_for_completion_or_timeout(max_tries, NULL,
|
|
interval_usecs, test_func,
|
|
action_func, args);
|
|
}
|
|
|
|
void nm_wait_for_timeout(
|
|
const struct timeval *max_time,
|
|
const guint interval_usecs,
|
|
nm_completion_func test_func,
|
|
nm_completion_func action_func,
|
|
nm_completion_args args)
|
|
{
|
|
nm_v_wait_for_completion_or_timeout(-1, max_time, interval_usecs,
|
|
test_func, action_func, args);
|
|
}
|
|
|
|
/* you can use these, but they're really just examples */
|
|
gboolean nm_completion_boolean_test(int tries, nm_completion_args args)
|
|
{
|
|
gboolean *condition = (gboolean *)args[0];
|
|
char *message = (char *)args[1];
|
|
int log_level = (int)args[2];
|
|
int log_interval = (int)args[3];
|
|
|
|
g_return_val_if_fail (condition != NULL, TRUE);
|
|
|
|
if (message)
|
|
if ((log_interval == 0 && tries == 0) || (log_interval != 0 && tries % log_interval == 0))
|
|
{
|
|
if (log_level == LOG_WARNING)
|
|
nm_warning_str (message);
|
|
else if (log_level == LOG_ERR)
|
|
nm_error_str (message);
|
|
else if (log_level == LOG_DEBUG)
|
|
nm_debug_str (message);
|
|
else
|
|
nm_info_str (message);
|
|
}
|
|
|
|
if (*condition)
|
|
return TRUE;
|
|
return FALSE;
|
|
}
|
|
|
|
gboolean nm_completion_boolean_function1_test(int tries,
|
|
nm_completion_args args)
|
|
{
|
|
nm_completion_boolean_function_1 condition = args[0];
|
|
char *message = args[1];
|
|
int log_level = (int)args[2];
|
|
int log_interval = (int)args[3];
|
|
u_int64_t arg0;
|
|
|
|
memcpy(&arg0, &args[4], sizeof (arg0));
|
|
|
|
g_return_val_if_fail (condition, TRUE);
|
|
|
|
if (message)
|
|
if ((log_interval == 0 && tries == 0)
|
|
|| (log_interval != 0 && tries % log_interval == 0))
|
|
syslog(log_level, message);
|
|
|
|
if (!(*condition)(arg0))
|
|
return TRUE;
|
|
return FALSE;
|
|
}
|
|
|
|
gboolean nm_completion_boolean_function2_test(int tries,
|
|
nm_completion_args args)
|
|
{
|
|
nm_completion_boolean_function_2 condition = args[0];
|
|
char *message = args[1];
|
|
int log_level = (int)args[2];
|
|
int log_interval = (int)args[3];
|
|
u_int64_t arg0, arg1;
|
|
|
|
memcpy(&arg0, &args[4], sizeof (arg0));
|
|
memcpy(&arg1, &args[4]+sizeof (arg0), sizeof (arg1));
|
|
|
|
g_return_val_if_fail (condition, TRUE);
|
|
|
|
if (message)
|
|
if ((log_interval == 0 && tries == 0)
|
|
|| (log_interval != 0 && tries % log_interval == 0))
|
|
syslog(log_level, message);
|
|
|
|
if (!(*condition)(arg0, arg1))
|
|
return TRUE;
|
|
return FALSE;
|
|
}
|
|
|