From fc8661a24c02afd9ce17a52facae4a2a9144e602 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 4 Aug 2009 11:17:02 -0400 Subject: [PATCH 01/22] libnm-util: fix verifying METHOD_IGNORE in NMSettingIP6Config --- libnm-util/nm-setting-ip6-config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index d9da92fa8..2998223ca 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -436,6 +436,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } } else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) + || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_SHARED)) { if (!priv->ignore_auto_dns) { From 2e849a0cb89366dffb77a36fc88cbdb0e014b412 Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Wed, 12 Aug 2009 17:15:59 -0500 Subject: [PATCH 02/22] system-settings: fix crasher (lp:411668) --- src/system-settings/nm-sysconfig-settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c index 99f71c166..99963d5da 100644 --- a/src/system-settings/nm-sysconfig-settings.c +++ b/src/system-settings/nm-sysconfig-settings.c @@ -172,7 +172,7 @@ static void find_by_path (gpointer key, gpointer data, gpointer user_data) { FindConnectionInfo *info = user_data; - NMSysconfigConnection *exported = NM_SYSCONFIG_CONNECTION (data); + NMSysconfigConnection *exported = NM_SYSCONFIG_CONNECTION (key); const char *path; if (!info->found) { From 107ac822080fa988bcb97e743b6b29268ec5997f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 13 Aug 2009 09:18:26 -0500 Subject: [PATCH 03/22] build: fix distcheck --- system-settings/plugins/ifcfg-rh/tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/system-settings/plugins/ifcfg-rh/tests/Makefile.am b/system-settings/plugins/ifcfg-rh/tests/Makefile.am index 195ab1fc8..cc2d7fbe8 100644 --- a/system-settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/system-settings/plugins/ifcfg-rh/tests/Makefile.am @@ -33,7 +33,6 @@ endif EXTRA_DIST = \ iscsiadm-test-dhcp \ iscsiadm-test-static \ - iscsiadm-test-malformed \ iscsiadm-test-bad-ipaddr \ iscsiadm-test-bad-gateway \ iscsiadm-test-bad-dns1 \ From 98078b2609a0c8f8f325d7d9363f29facde1b1cd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 13 Aug 2009 16:56:44 -0500 Subject: [PATCH 04/22] vpn: document VPN Ip4Config key/value pairs --- include/NetworkManagerVPN.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/NetworkManagerVPN.h b/include/NetworkManagerVPN.h index c33c9b3ed..3d6b0fdee 100644 --- a/include/NetworkManagerVPN.h +++ b/include/NetworkManagerVPN.h @@ -114,18 +114,53 @@ typedef enum { } NMVPNPluginFailure; +/* uint32: IP address of the public external VPN gateway (network byte order) */ #define NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY "gateway" + +/* uint32: IP address of the internal gateway of the subnet the VPN interface is + * on (network byte order) + */ #define NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY "internal-gateway" + +/* uint32: IP address of the VPN interface (network byte order) */ #define NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS "address" + +/* uint32: IP address of the other side of Point-to-Point connection if the VPN + * uses Point-to-Point configuration. (network byte order) + */ #define NM_VPN_PLUGIN_IP4_CONFIG_PTP "ptp" + +/* uint32: IP prefix of the VPN interface; 1 - 32 inclusive */ #define NM_VPN_PLUGIN_IP4_CONFIG_PREFIX "prefix" + +/* array of uint32: IP addresses of DNS servers for the VPN (network byte order) */ #define NM_VPN_PLUGIN_IP4_CONFIG_DNS "dns" + +/* array of uint32: IP addresses of NBNS/WINS servers for the VPN (network byte order) */ #define NM_VPN_PLUGIN_IP4_CONFIG_NBNS "nbns" + +/* uint32: Message Segment Size that the VPN interface should use */ #define NM_VPN_PLUGIN_IP4_CONFIG_MSS "mss" + +/* uint32: Maximum Transfer Unit that the VPN interface should use */ #define NM_VPN_PLUGIN_IP4_CONFIG_MTU "mtu" + +/* string: VPN interface name (tun0, tap0, etc) */ #define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV "tundev" + +/* string: DNS domain name */ #define NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN "domain" + +/* string: Login message */ #define NM_VPN_PLUGIN_IP4_CONFIG_BANNER "banner" + +/* array of (uint32, uint32, uint32, uint32): custom routes the client should + * apply. In the order of: + * 1: destination IP address (network byte order) + * 2: destination prefix (1 - 32 inclusive) + * 3: IP address of next hop (network byte order) + * 4: route metric + */ #define NM_VPN_PLUGIN_IP4_CONFIG_ROUTES "routes" /* Deprecated */ From 465bc8ea46ca3dd851959fda6ac13cbc576b5945 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 13 Aug 2009 17:01:06 -0500 Subject: [PATCH 05/22] vpn: clarify VPN Ip4Config docs --- include/NetworkManagerVPN.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/NetworkManagerVPN.h b/include/NetworkManagerVPN.h index 3d6b0fdee..cc6903993 100644 --- a/include/NetworkManagerVPN.h +++ b/include/NetworkManagerVPN.h @@ -118,11 +118,11 @@ typedef enum { #define NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY "gateway" /* uint32: IP address of the internal gateway of the subnet the VPN interface is - * on (network byte order) + * on, if the VPN uses subnet configuration (network byte order) */ #define NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY "internal-gateway" -/* uint32: IP address of the VPN interface (network byte order) */ +/* uint32: internal IP address of the local VPN interface (network byte order) */ #define NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS "address" /* uint32: IP address of the other side of Point-to-Point connection if the VPN From 8777cea8dcf6ec35627816bd0c6c4c6f4300e876 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 17 Aug 2009 09:20:58 -0500 Subject: [PATCH 06/22] vpn: further clarify VPN IP4 config dict argument types --- include/NetworkManagerVPN.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/NetworkManagerVPN.h b/include/NetworkManagerVPN.h index cc6903993..d792847d6 100644 --- a/include/NetworkManagerVPN.h +++ b/include/NetworkManagerVPN.h @@ -154,8 +154,11 @@ typedef enum { /* string: Login message */ #define NM_VPN_PLUGIN_IP4_CONFIG_BANNER "banner" -/* array of (uint32, uint32, uint32, uint32): custom routes the client should - * apply. In the order of: +/* array of array of uint32: custom routes the client should apply. NOTE: NM + * expects the D-Bus argument signature "aau" here. i.e., an array of + * routes, where each route is a 4-element array of uint32 values. + * + * Each route consists of the following 4 uint32 values, in this order: * 1: destination IP address (network byte order) * 2: destination prefix (1 - 32 inclusive) * 3: IP address of next hop (network byte order) From a90491e8d87cf33d7da0ddfc4b66c00cc9458abb Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 17 Aug 2009 14:39:22 -0500 Subject: [PATCH 07/22] gsm: reset secrets tries counter to avoid asking for secrets we don't need The counter wasn't getting reset, so the second time the connection was activated, secrets would be requested even though they weren't needed. --- src/modem-manager/nm-modem-gsm.c | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c index 058c789bb..cdacd7b78 100644 --- a/src/modem-manager/nm-modem-gsm.c +++ b/src/modem-manager/nm-modem-gsm.c @@ -388,6 +388,46 @@ real_connection_secrets_updated (NMDevice *dev, nm_device_activate_schedule_stage1_device_prepare (dev); } +static NMActStageReturn +real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) +{ + NMActRequest *req; + NMConnection *connection; + + req = nm_device_get_act_request (device); + g_assert (req); + + /* Clear secrets tries counter since secrets were successfully used + * already if we get here. + */ + connection = nm_act_request_get_connection (req); + g_assert (connection); + g_object_set_data (G_OBJECT (connection), GSM_SECRETS_TRIES, NULL); + + if (NM_DEVICE_CLASS (nm_modem_gsm_parent_class)->act_stage2_config) + return NM_DEVICE_CLASS (nm_modem_gsm_parent_class)->act_stage2_config (device, reason); + + return NM_ACT_STAGE_RETURN_SUCCESS; +} + +static void +real_deactivate_quickly (NMDevice *device) +{ + NMActRequest *req; + NMConnection *connection; + + req = nm_device_get_act_request (device); + if (req) { + /* Clear the secrets attempts counter */ + connection = nm_act_request_get_connection (req); + g_assert (connection); + g_object_set_data (G_OBJECT (connection), GSM_SECRETS_TRIES, NULL); + } + + if (NM_DEVICE_CLASS (nm_modem_gsm_parent_class)->deactivate_quickly) + NM_DEVICE_CLASS (nm_modem_gsm_parent_class)->deactivate_quickly (device); +} + static gboolean real_check_connection_compatible (NMDevice *device, NMConnection *connection, @@ -445,6 +485,8 @@ nm_modem_gsm_class_init (NMModemGsmClass *klass) device_class->get_best_auto_connection = real_get_best_auto_connection; device_class->connection_secrets_updated = real_connection_secrets_updated; device_class->act_stage1_prepare = real_act_stage1_prepare; + device_class->act_stage2_config = real_act_stage2_config; + device_class->deactivate_quickly = real_deactivate_quickly; device_class->check_connection_compatible = real_check_connection_compatible; modem_class->get_ppp_name = real_get_ppp_name; From 377b116651257438cf9b48ab1ca0ddb1dd96a4cf Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 17 Aug 2009 14:43:37 -0500 Subject: [PATCH 08/22] gsm: harmonize GSM network modes with ModemManager API --- src/modem-manager/nm-modem-gsm.c | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c index cdacd7b78..d1949c509 100644 --- a/src/modem-manager/nm-modem-gsm.c +++ b/src/modem-manager/nm-modem-gsm.c @@ -13,22 +13,22 @@ #include "nm-device-gsm-glue.h" -// FIXME: use MM headers when MM exports this stuff typedef enum { - MM_MODEM_GSM_NETWORK_MODE_ANY = 0, - MM_MODEM_GSM_NETWORK_MODE_GPRS = 1, - MM_MODEM_GSM_NETWORK_MODE_EDGE = 2, - MM_MODEM_GSM_NETWORK_MODE_UMTS = 3, - MM_MODEM_GSM_NETWORK_MODE_HSDPA = 4, - MM_MODEM_GSM_NETWORK_MODE_2G_PREFERRED = 5, - MM_MODEM_GSM_NETWORK_MODE_3G_PREFERRED = 6, - MM_MODEM_GSM_NETWORK_MODE_2G_ONLY = 7, - MM_MODEM_GSM_NETWORK_MODE_3G_ONLY = 8, - MM_MODEM_GSM_NETWORK_MODE_HSUPA = 9, - MM_MODEM_GSM_NETWORK_MODE_HSPA = 10, + MM_MODEM_GSM_MODE_UNKNOWN = 0x00000000, + MM_MODEM_GSM_MODE_ANY = 0x00000001, + MM_MODEM_GSM_MODE_GPRS = 0x00000002, + MM_MODEM_GSM_MODE_EDGE = 0x00000004, + MM_MODEM_GSM_MODE_UMTS = 0x00000008, + MM_MODEM_GSM_MODE_HSDPA = 0x00000010, + MM_MODEM_GSM_MODE_2G_PREFERRED = 0x00000020, + MM_MODEM_GSM_MODE_3G_PREFERRED = 0x00000040, + MM_MODEM_GSM_MODE_2G_ONLY = 0x00000080, + MM_MODEM_GSM_MODE_3G_ONLY = 0x00000100, + MM_MODEM_GSM_MODE_HSUPA = 0x00000200, + MM_MODEM_GSM_MODE_HSPA = 0x00000400, - MM_MODEM_GSM_NETWORK_MODE_LAST = MM_MODEM_GSM_NETWORK_MODE_HSPA -} MMModemGsmNetworkMode; + MM_MODEM_GSM_MODE_LAST = MM_MODEM_GSM_MODE_HSPA +} MMModemGsmMode; #define GSM_SECRETS_TRIES "gsm-secrets-tries" @@ -229,19 +229,19 @@ create_connect_properties (NMConnection *connection) switch (nm_setting_gsm_get_network_type (setting)) { case NM_GSM_NETWORK_UMTS_HSPA: - value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_NETWORK_MODE_HSDPA); + value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_MODE_3G_ONLY); break; case NM_GSM_NETWORK_GPRS_EDGE: - value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_NETWORK_MODE_EDGE); + value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_MODE_2G_ONLY); break; case NM_GSM_NETWORK_PREFER_UMTS_HSPA: - value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_NETWORK_MODE_3G_PREFERRED); + value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_MODE_3G_PREFERRED); break; case NM_GSM_NETWORK_PREFER_GPRS_EDGE: - value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_NETWORK_MODE_2G_PREFERRED); + value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_MODE_2G_PREFERRED); break; default: - value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_NETWORK_MODE_ANY); + value_hash_add_uint (properties, "network_mode", MM_MODEM_GSM_MODE_ANY); break; } From 3e221833da98d1d5bf60a34243961ce7049e05cd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 17 Aug 2009 15:35:02 -0500 Subject: [PATCH 09/22] ppp: start PPP at activation stage3 instead of stage2 With the addition of IPv6, both v4 and v6 configuration are run in parallel, and when both have finished, then activation can proceed. Unfortunately, two of the 3 users of PPP (PPPoE and 3G) ran PPP at stage2, and when the PPP IPv4 config was received, jumped directly to activation stage4. That caused the IPv6 code never to run, and thus we hung at stage4 waiting for it to complete when nothing had started it in the first place. Instead, move PPP to stage3 so that nm_device_activate_stage3_ip_config_start() can kick off both v4 and v6 IP code and we can successfully complete IP configuration in all cases. PPP previously being in stage2 was an artifact of the more simplistic pre-IPv6 configuration code where it didn't matter if you skipped stage3. --- src/modem-manager/nm-modem.c | 33 ++++------------------------ src/nm-device-ethernet.c | 42 ++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 48f9296ed..528f08bcd 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -152,7 +152,7 @@ ppp_stats (NMPPPManager *ppp_manager, } static NMActStageReturn -ppp_stage2_config (NMDevice *device, NMDeviceStateReason *reason) +ppp_stage3_ip4_config_start (NMDevice *device, NMDeviceStateReason *reason) { NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (device); NMActRequest *req; @@ -246,7 +246,7 @@ static_stage3_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_da } static NMActStageReturn -static_stage3_config (NMDevice *device, NMDeviceStateReason *reason) +static_stage3_ip4_config_start (NMDevice *device, NMDeviceStateReason *reason) { dbus_g_proxy_begin_call (nm_modem_get_proxy (NM_MODEM (device), MM_DBUS_INTERFACE_MODEM), "GetIP4Config", static_stage3_done, @@ -278,30 +278,6 @@ static_stage4 (NMDevice *device, NMIP4Config **config, NMDeviceStateReason *reas /*****************************************************************************/ -static NMActStageReturn -real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) -{ - NMActStageReturn ret; - - switch (NM_MODEM_GET_PRIVATE (device)->ip_method) { - case MM_MODEM_IP_METHOD_PPP: - ret = ppp_stage2_config (device, reason); - break; - case MM_MODEM_IP_METHOD_STATIC: - ret = NM_ACT_STAGE_RETURN_SUCCESS; - break; - case MM_MODEM_IP_METHOD_DHCP: - ret = NM_ACT_STAGE_RETURN_SUCCESS; - break; - default: - g_warning ("Invalid IP method"); - ret = NM_ACT_STAGE_RETURN_FAILURE; - break; - } - - return ret; -} - static NMActStageReturn real_act_stage3_ip4_config_start (NMDevice *device, NMDeviceStateReason *reason) { @@ -309,10 +285,10 @@ real_act_stage3_ip4_config_start (NMDevice *device, NMDeviceStateReason *reason) switch (NM_MODEM_GET_PRIVATE (device)->ip_method) { case MM_MODEM_IP_METHOD_PPP: - ret = NM_ACT_STAGE_RETURN_SUCCESS; + ret = ppp_stage3_ip4_config_start (device, reason); break; case MM_MODEM_IP_METHOD_STATIC: - ret = static_stage3_config (device, reason); + ret = static_stage3_ip4_config_start (device, reason); break; case MM_MODEM_IP_METHOD_DHCP: ret = NM_DEVICE_CLASS (nm_modem_parent_class)->act_stage3_ip4_config_start (device, reason); @@ -610,7 +586,6 @@ nm_modem_class_init (NMModemClass *klass) object_class->finalize = finalize; device_class->get_generic_capabilities = real_get_generic_capabilities; - device_class->act_stage2_config = real_act_stage2_config; device_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start; device_class->act_stage4_get_ip4_config = real_act_stage4_get_ip4_config; device_class->deactivate_quickly = real_deactivate_quickly; diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index bdb740ed9..f4f84d599 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -1260,7 +1260,7 @@ ppp_ip4_config (NMPPPManager *ppp_manager, } static NMActStageReturn -pppoe_stage2_config (NMDeviceEthernet *self, NMDeviceStateReason *reason) +pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reason) { NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self); NMConnection *connection; @@ -1304,35 +1304,48 @@ pppoe_stage2_config (NMDeviceEthernet *self, NMDeviceStateReason *reason) static NMActStageReturn real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) { - NMSettingConnection *s_connection; + NMSettingConnection *s_con; const char *connection_type; - NMActStageReturn ret; + NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS; g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); - s_connection = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION)); - g_assert (s_connection); + s_con = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION)); + g_assert (s_con); - connection_type = nm_setting_connection_get_connection_type (s_connection); + /* 802.1x has to run before any IP configuration since the 802.1x auth + * process opens the port up for normal traffic. + */ + connection_type = nm_setting_connection_get_connection_type (s_con); if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) { NMSetting8021x *security; security = (NMSetting8021x *) device_get_setting (device, NM_TYPE_SETTING_802_1X); if (security) ret = nm_8021x_stage2_config (NM_DEVICE_ETHERNET (device), reason); - else - ret = NM_ACT_STAGE_RETURN_SUCCESS; - } else if (!strcmp (connection_type, NM_SETTING_PPPOE_SETTING_NAME)) - ret = pppoe_stage2_config (NM_DEVICE_ETHERNET (device), reason); - else { - nm_warning ("Invalid connection type '%s' for ethernet device", connection_type); - *reason = NM_DEVICE_STATE_REASON_CONFIG_FAILED; - ret = NM_ACT_STAGE_RETURN_FAILURE; } return ret; } +static NMActStageReturn +real_act_stage3_ip4_config_start (NMDevice *device, NMDeviceStateReason *reason) +{ + NMSettingConnection *s_con; + const char *connection_type; + + g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); + + s_con = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION)); + g_assert (s_con); + + connection_type = nm_setting_connection_get_connection_type (s_con); + if (!strcmp (connection_type, NM_SETTING_PPPOE_SETTING_NAME)) + return pppoe_stage3_ip4_config_start (NM_DEVICE_ETHERNET (device), reason); + + return NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->act_stage3_ip4_config_start (device, reason); +} + static NMActStageReturn real_act_stage4_get_ip4_config (NMDevice *device, NMIP4Config **config, @@ -1775,6 +1788,7 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass) parent_class->check_connection_compatible = real_check_connection_compatible; parent_class->act_stage2_config = real_act_stage2_config; + parent_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start; parent_class->act_stage4_get_ip4_config = real_act_stage4_get_ip4_config; parent_class->deactivate_quickly = real_deactivate_quickly; parent_class->spec_match_list = spec_match_list; From c2fb1f850a8b94091ec109740b1c87be85b2aa15 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 17 Aug 2009 19:48:42 -0500 Subject: [PATCH 10/22] gsm/bt: fix merge of user-defined IPv4 settings --- src/modem-manager/nm-modem.c | 10 +++++++++- src/nm-device-bt.c | 9 +++++++++ src/nm-device-ethernet.c | 10 ++++++---- src/nm-device.c | 7 +++++-- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 528f08bcd..e2b695030 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -14,6 +14,7 @@ #include "nm-modem-types.h" #include "nm-utils.h" #include "nm-serial-device-glue.h" +#include "NetworkManagerUtils.h" G_DEFINE_TYPE (NMModem, nm_modem, NM_TYPE_DEVICE) @@ -196,12 +197,19 @@ ppp_stage3_ip4_config_start (NMDevice *device, NMDeviceStateReason *reason) static NMActStageReturn ppp_stage4 (NMDevice *device, NMIP4Config **config, NMDeviceStateReason *reason) { - NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (device); + NMConnection *connection; + NMSettingIP4Config *s_ip4; *config = priv->pending_ip4_config; priv->pending_ip4_config = NULL; + /* Merge user-defined overrides into the IP4Config to be applied */ + connection = nm_act_request_get_connection (nm_device_get_act_request (device)); + g_assert (connection); + s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); + nm_utils_merge_ip4_config (*config, s_ip4); + return NM_ACT_STAGE_RETURN_SUCCESS; } diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c index 06a4d8d0f..43e3a44eb 100644 --- a/src/nm-device-bt.c +++ b/src/nm-device-bt.c @@ -37,6 +37,7 @@ #include "nm-setting-cdma.h" #include "nm-setting-gsm.h" #include "nm-device-bt-glue.h" +#include "NetworkManagerUtils.h" #define BLUETOOTH_DUN_UUID "dun" #define BLUETOOTH_NAP_UUID "nap" @@ -455,10 +456,18 @@ static NMActStageReturn ppp_stage4 (NMDevice *device, NMIP4Config **config, NMDeviceStateReason *reason) { NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device); + NMConnection *connection; + NMSettingIP4Config *s_ip4; *config = priv->pending_ip4_config; priv->pending_ip4_config = NULL; + /* Merge user-defined overrides into the IP4Config to be applied */ + connection = nm_act_request_get_connection (nm_device_get_act_request (device)); + g_assert (connection); + s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); + nm_utils_merge_ip4_config (*config, s_ip4); + return NM_ACT_STAGE_RETURN_SUCCESS; } diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index f4f84d599..ef4d58e15 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -1384,14 +1384,16 @@ real_act_stage4_get_ip4_config (NMDevice *device, NMConnection *connection; NMSettingIP4Config *s_ip4; - connection = nm_act_request_get_connection (nm_device_get_act_request (device)); - g_assert (connection); - s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); - /* PPPoE */ *config = priv->pending_ip4_config; priv->pending_ip4_config = NULL; + + /* Merge user-defined overrides into the IP4Config to be applied */ + connection = nm_act_request_get_connection (nm_device_get_act_request (device)); + g_assert (connection); + s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); nm_utils_merge_ip4_config (*config, s_ip4); + ret = NM_ACT_STAGE_RETURN_SUCCESS; } diff --git a/src/nm-device.c b/src/nm-device.c index 18a85160c..209ce4760 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -1223,6 +1223,7 @@ real_act_stage4_get_ip4_config (NMDevice *self, if (nm_device_get_use_dhcp (self)) { *config = nm_dhcp_manager_get_ip4_config (priv->dhcp_manager, ip_iface); if (*config) { + /* Merge user-defined overrides into the IP4Config to be applied */ nm_utils_merge_ip4_config (*config, s_ip4); nm_dhcp4_config_reset (priv->dhcp4_config); @@ -1247,9 +1248,10 @@ real_act_stage4_get_ip4_config (NMDevice *self, *config = aipd_get_ip4_config (self, reason); } else if (!strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) { *config = nm_ip4_config_new (); - if (*config) + if (*config) { + /* Merge user-defined overrides into the IP4Config to be applied */ nm_utils_merge_ip4_config (*config, s_ip4); - else + } else *reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE; } else if (!strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_SHARED)) { *config = nm_device_new_ip4_shared_config (self, reason); @@ -1448,6 +1450,7 @@ real_act_stage4_get_ip6_config (NMDevice *self, return NM_ACT_STAGE_RETURN_FAILURE; } + /* Merge user-defined overrides into the IP6Config to be applied */ if (!strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) nm_utils_merge_ip6_config (*config, s_ip6); From b62702d33754e5444447535b3d4b475cb56fd944 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 17 Aug 2009 19:55:01 -0500 Subject: [PATCH 11/22] modem: don't send PropertyChanged signals for private properties --- src/modem-manager/nm-modem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index e2b695030..451bb3a57 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -607,7 +607,7 @@ nm_modem_class_init (NMModemClass *klass) "DBus path", "DBus path", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT)); g_object_class_install_property (object_class, PROP_DEVICE, @@ -615,7 +615,7 @@ nm_modem_class_init (NMModemClass *klass) "Device", "Master modem parent device", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT)); g_object_class_install_property (object_class, PROP_IP_METHOD, @@ -625,7 +625,7 @@ nm_modem_class_init (NMModemClass *klass) MM_MODEM_IP_METHOD_PPP, MM_MODEM_IP_METHOD_DHCP, MM_MODEM_IP_METHOD_PPP, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | NM_PROPERTY_PARAM_NO_EXPORT)); /* Signals */ signals[PPP_STATS] = From 80d48837ce15da8826f5d21ec909feca0f16273d Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 17 Aug 2009 15:24:29 -0400 Subject: [PATCH 12/22] ipv6: fix up no-duplicates logic in nm_ip6_config_add_nameserver --- src/nm-ip6-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 990ba3df3..66c328eef 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -204,7 +204,7 @@ void nm_ip6_config_add_nameserver (NMIP6Config *config, const struct in6_addr *n /* No dupes */ nameservers = (struct in6_addr *)priv->nameservers->data; for (i = 0; i < priv->nameservers->len; i++) { - g_return_if_fail (memcmp (nameserver, &nameservers[i], sizeof (struct in6_addr)) == 0); + g_return_if_fail (memcmp (nameserver, &nameservers[i], sizeof (struct in6_addr)) != 0); } g_array_append_val (priv->nameservers, *nameserver); From a8ca7f537d0cdbba972a86ae8ddcecdae30ac8d1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 18 Aug 2009 12:26:52 -0500 Subject: [PATCH 13/22] ppp: work around PPP bug that returns bogus nameservers Work around a PPP bug (#1732) which causes many mobile broadband providers to return 10.11.12.13 and 10.11.12.14 for the DNS servers. Apparently fixed in ppp-2.4.5 but we've had some reports that this is not the case. http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=2e09ef6886bbf00bc5a9a641110f801e372ffde6 http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=f8191bf07df374f119a07910a79217c7618f113e --- src/modem-manager/nm-modem.c | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 451bb3a57..03fe5a814 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -129,6 +129,44 @@ ppp_ip4_config (NMPPPManager *ppp_manager, gpointer user_data) { NMDevice *device = NM_DEVICE (user_data); + guint32 i, num; + guint32 bad_dns1 = htonl (0x0A0B0C0D); + guint32 good_dns1 = htonl (0x04020201); /* GTE nameserver */ + guint32 bad_dns2 = htonl (0x0A0B0C0E); + guint32 good_dns2 = htonl (0x04020202); /* GTE nameserver */ + + /* Work around a PPP bug (#1732) which causes many mobile broadband + * providers to return 10.11.12.13 and 10.11.12.14 for the DNS servers. + * Apparently fixed in ppp-2.4.5 but we've had some reports that this is + * not the case. + * + * http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=2e09ef6886bbf00bc5a9a641110f801e372ffde6 + * http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=f8191bf07df374f119a07910a79217c7618f113e + */ + + num = nm_ip4_config_get_num_nameservers (config); + if (num == 2) { + gboolean found1 = FALSE, found2 = FALSE; + + for (i = 0; i < num; i++) { + guint32 ns = nm_ip4_config_get_nameserver (config, i); + + if (ns == bad_dns1) + found1 = TRUE; + else if (ns == bad_dns2) + found2 = TRUE; + } + + /* Be somewhat conservative about substitutions; the "bad" nameservers + * could actually be valid in some cases, so only substitute if ppp + * returns *only* the two bad nameservers. + */ + if (found1 && found2) { + nm_ip4_config_reset_nameservers (config); + nm_ip4_config_add_nameserver (config, good_dns1); + nm_ip4_config_add_nameserver (config, good_dns2); + } + } nm_device_set_ip_iface (device, iface); NM_MODEM_GET_PRIVATE (device)->pending_ip4_config = g_object_ref (config); From 0fb5560b797f5cdc66101f95cf068b34b2554ed1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 20 Aug 2009 10:23:47 -0500 Subject: [PATCH 14/22] udev: fix ibmebus/ehea device detection (rh #511304) (rh #516591) The driver is on the grandparent, not the parent. --- src/nm-udev-manager.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c index 191ba4f14..be0825c6b 100644 --- a/src/nm-udev-manager.c +++ b/src/nm-udev-manager.c @@ -285,8 +285,8 @@ device_creator (NMUdevManager *manager, gboolean sleeping) { GObject *device = NULL; - const char *ifname, *driver, *path; - GUdevDevice *parent; + const char *ifname, *driver, *path, *subsys; + GUdevDevice *parent = NULL, *grandparent = NULL; gint ifindex; ifname = g_udev_device_get_name (udev_device); @@ -304,19 +304,27 @@ device_creator (NMUdevManager *manager, parent = g_udev_device_get_parent (udev_device); if (parent) { driver = g_udev_device_get_driver (parent); - g_object_unref (parent); + if (!driver) { + /* try the grandparent only if it's an ibmebus device */ + subsys = g_udev_device_get_subsystem (parent); + if (subsys && !strcmp (subsys, "ibmebus")) { + grandparent = g_udev_device_get_parent (parent); + if (grandparent) + driver = g_udev_device_get_driver (grandparent); + } + } } } if (!driver) { nm_warning ("%s: couldn't determine device driver; ignoring...", path); - return NULL; + goto out; } ifindex = g_udev_device_get_sysfs_attr_as_int (udev_device, "ifindex"); if (ifindex <= 0) { nm_warning ("%s: device had invalid ifindex %d; ignoring...", path, (guint32) ifindex); - return NULL; + goto out; } if (is_olpc_mesh (udev_device)) /* must be before is_wireless */ @@ -326,6 +334,11 @@ device_creator (NMUdevManager *manager, else device = (GObject *) nm_device_ethernet_new (path, ifname, driver, ifindex); +out: + if (grandparent) + g_object_unref (grandparent); + if (parent) + g_object_unref (parent); return device; } From 0877323e8d87a39a85b5894f15be994c4b7df3e3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 20 Aug 2009 11:30:52 -0500 Subject: [PATCH 15/22] libnm-glib: add NMIP6Config object that proxies device's IP6 config --- docs/libnm-glib/Makefile.am | 3 +- docs/libnm-glib/libnm-glib-docs.sgml | 1 + docs/libnm-glib/libnm-glib.types | 2 + include/NetworkManager.h | 1 + introspection/nm-device.xml | 5 + libnm-glib/Makefile.am | 12 +- libnm-glib/libnm_glib.ver | 10 + libnm-glib/nm-device.c | 96 ++++++ libnm-glib/nm-device.h | 3 + libnm-glib/nm-ip4-config.c | 30 +- libnm-glib/nm-ip6-config.c | 436 +++++++++++++++++++++++++++ libnm-glib/nm-ip6-config.h | 65 ++++ libnm-glib/nm-types-private.h | 2 +- libnm-glib/nm-types.c | 146 +++++++++ libnm-glib/nm-types.h | 9 + 15 files changed, 801 insertions(+), 20 deletions(-) create mode 100644 libnm-glib/nm-ip6-config.c create mode 100644 libnm-glib/nm-ip6-config.h diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index 652bd447d..f01d524a1 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -49,7 +49,8 @@ IGNORE_HFILES= \ nm-vpn-plugin-glue.h \ nm-active-connection-bindings.h \ nm-ip4-config-bindings.h \ - nm-dhcp4-config-bindings.h + nm-dhcp4-config-bindings.h \ + nm-ip4-config-bindings.h # Images to copy into HTML directory. HTML_IMAGES = diff --git a/docs/libnm-glib/libnm-glib-docs.sgml b/docs/libnm-glib/libnm-glib-docs.sgml index 5a3ca81b8..8fe5a1d43 100644 --- a/docs/libnm-glib/libnm-glib-docs.sgml +++ b/docs/libnm-glib/libnm-glib-docs.sgml @@ -19,6 +19,7 @@ + diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types index 8c5fcf754..99783ba69 100644 --- a/docs/libnm-glib/libnm-glib.types +++ b/docs/libnm-glib/libnm-glib.types @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -21,3 +22,4 @@ nm_access_point_get_type nm_ip4_config_get_type nm_active_connection_get_type nm_dhcp4_config_get_type +nm_ip6_config_get_type diff --git a/include/NetworkManager.h b/include/NetworkManager.h index f7299e857..63b9dd18b 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -41,6 +41,7 @@ #define NM_DBUS_INTERFACE_ACTIVE_CONNECTION NM_DBUS_INTERFACE ".Connection.Active" #define NM_DBUS_INTERFACE_IP4_CONFIG NM_DBUS_INTERFACE ".IP4Config" #define NM_DBUS_INTERFACE_DHCP4_CONFIG NM_DBUS_INTERFACE ".DHCP4Config" +#define NM_DBUS_INTERFACE_IP6_CONFIG NM_DBUS_INTERFACE ".IP6Config" #define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings" diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index c743f831b..3dbb6e229 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -42,6 +42,11 @@ Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + + + Object path of the Ip6Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + + Whether or not this device is managed by NetworkManager. diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 16de0dd0c..2b39b6408 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -19,7 +19,8 @@ BUILT_SOURCES = \ nm-vpn-plugin-glue.h \ nm-active-connection-bindings.h \ nm-ip4-config-bindings.h \ - nm-dhcp4-config-bindings.h + nm-dhcp4-config-bindings.h \ + nm-ip6-config-bindings.h lib_LTLIBRARIES = libnm_glib.la libnm_glib_vpn.la @@ -53,7 +54,8 @@ libnminclude_HEADERS = \ nm-dbus-connection.h \ nm-dbus-settings.h \ nm-dbus-settings-system.h \ - nm-dhcp4-config.h + nm-dhcp4-config.h \ + nm-ip6-config.h libnm_glib_la_SOURCES = \ libnm_glib.c \ @@ -82,7 +84,8 @@ libnm_glib_la_SOURCES = \ nm-dbus-connection.c \ nm-dbus-settings.c \ nm-dbus-settings-system.c \ - nm-dhcp4-config.c + nm-dhcp4-config.c \ + nm-ip6-config.c libnm_glib_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ @@ -157,6 +160,9 @@ nm-ip4-config-bindings.h: $(top_srcdir)/introspection/nm-ip4-config.xml nm-dhcp4-config-bindings.h: $(top_srcdir)/introspection/nm-dhcp4-config.xml dbus-binding-tool --prefix=nm_dhcp4_config --mode=glib-client --output=$@ $< +nm-ip6-config-bindings.h: $(top_srcdir)/introspection/nm-ip6-config.xml + dbus-binding-tool --prefix=nm_ip6_config --mode=glib-client --output=$@ $< + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc diff --git a/libnm-glib/libnm_glib.ver b/libnm-glib/libnm_glib.ver index e45f34744..81c84b7dd 100644 --- a/libnm-glib/libnm_glib.ver +++ b/libnm-glib/libnm_glib.ver @@ -65,6 +65,7 @@ global: nm_device_get_driver; nm_device_get_iface; nm_device_get_ip4_config; + nm_device_get_ip6_config; nm_device_get_managed; nm_device_get_product; nm_device_get_state; @@ -103,6 +104,15 @@ global: nm_ip4_config_get_routes; nm_ip4_config_get_type; nm_ip4_config_new; + nm_ip6_address_array_get_type; + nm_ip6_address_object_array_get_type; + nm_ip6_config_get_addresses; + nm_ip6_config_get_domains; + nm_ip6_config_get_nameservers; + nm_ip6_config_get_routes; + nm_ip6_config_get_type; + nm_ip6_config_new; + nm_ip6_route_object_array_get_type; nm_object_array_get_type; nm_object_get_connection; nm_object_get_path; diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 944da630b..6cc38a8f5 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -57,6 +57,8 @@ typedef struct { gboolean null_ip4_config; NMDHCP4Config *dhcp4_config; gboolean null_dhcp4_config; + NMIP6Config *ip6_config; + gboolean null_ip6_config; NMDeviceState state; GUdevClient *client; @@ -73,6 +75,7 @@ enum { PROP_MANAGED, PROP_IP4_CONFIG, PROP_DHCP4_CONFIG, + PROP_IP6_CONFIG, PROP_STATE, PROP_PRODUCT, PROP_VENDOR, @@ -177,6 +180,46 @@ demarshal_dhcp4_config (NMObject *object, GParamSpec *pspec, GValue *value, gpoi return TRUE; } +static gboolean +demarshal_ip6_config (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field) +{ + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (object); + const char *path; + NMIP6Config *config = NULL; + DBusGConnection *connection; + + if (!G_VALUE_HOLDS (value, DBUS_TYPE_G_OBJECT_PATH)) + return FALSE; + + priv->null_ip6_config = FALSE; + + path = g_value_get_boxed (value); + if (path) { + if (!strcmp (path, "/")) + priv->null_ip6_config = TRUE; + else { + config = NM_IP6_CONFIG (_nm_object_cache_get (path)); + if (config) + config = g_object_ref (config); + else { + connection = nm_object_get_connection (object); + config = NM_IP6_CONFIG (nm_ip6_config_new (connection, path)); + } + } + } + + if (priv->ip6_config) { + g_object_unref (priv->ip6_config); + priv->ip6_config = NULL; + } + + if (config) + priv->ip6_config = config; + + _nm_object_queue_notify (object, NM_DEVICE_IP6_CONFIG); + return TRUE; +} + static void register_for_property_changed (NMDevice *device) { @@ -189,6 +232,7 @@ register_for_property_changed (NMDevice *device) { NM_DEVICE_MANAGED, _nm_object_demarshal_generic, &priv->managed }, { NM_DEVICE_IP4_CONFIG, demarshal_ip4_config, &priv->ip4_config }, { NM_DEVICE_DHCP4_CONFIG, demarshal_dhcp4_config, &priv->dhcp4_config }, + { NM_DEVICE_IP6_CONFIG, demarshal_ip6_config, &priv->ip6_config }, { NULL }, }; @@ -272,6 +316,8 @@ dispose (GObject *object) g_object_unref (priv->ip4_config); if (priv->dhcp4_config) g_object_unref (priv->dhcp4_config); + if (priv->ip6_config) + g_object_unref (priv->ip6_config); if (priv->client) g_object_unref (priv->client); @@ -322,6 +368,9 @@ get_property (GObject *object, case PROP_DHCP4_CONFIG: g_value_set_object (value, nm_device_get_dhcp4_config (device)); break; + case PROP_IP6_CONFIG: + g_value_set_object (value, nm_device_get_ip6_config (device)); + break; case PROP_STATE: g_value_set_uint (value, nm_device_get_state (device)); break; @@ -443,6 +492,19 @@ nm_device_class_init (NMDeviceClass *device_class) NM_TYPE_DHCP4_CONFIG, G_PARAM_READABLE)); + /** + * NMDevice:ip6-config: + * + * The #NMIP6Config of the device. + **/ + g_object_class_install_property + (object_class, PROP_IP6_CONFIG, + g_param_spec_object (NM_DEVICE_IP6_CONFIG, + "IP6 Config", + "IP6 Config", + NM_TYPE_IP6_CONFIG, + G_PARAM_READABLE)); + /** * NMDevice:state: * @@ -774,6 +836,40 @@ nm_device_get_dhcp4_config (NMDevice *device) return priv->dhcp4_config; } +/** + * nm_device_get_ip6_config: + * @device: a #NMDevice + * + * Gets the current #NMIP6Config associated with the #NMDevice. + * + * Returns: the #NMIP6Config or %NULL if the device is not activated. + **/ +NMIP6Config * +nm_device_get_ip6_config (NMDevice *device) +{ + NMDevicePrivate *priv; + char *path; + GValue value = { 0, }; + + g_return_val_if_fail (NM_IS_DEVICE (device), NULL); + + priv = NM_DEVICE_GET_PRIVATE (device); + if (priv->ip6_config) + return priv->ip6_config; + if (priv->null_ip6_config) + return NULL; + + path = _nm_object_get_object_path_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE, "Ip6Config"); + if (path) { + g_value_init (&value, DBUS_TYPE_G_OBJECT_PATH); + g_value_take_boxed (&value, path); + demarshal_ip6_config (NM_OBJECT (device), NULL, &value, &priv->ip6_config); + g_value_unset (&value); + } + + return priv->ip6_config; +} + /** * nm_device_get_state: * @device: a #NMDevice diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index 1087afb7e..442643214 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -31,6 +31,7 @@ #include "NetworkManager.h" #include "nm-ip4-config.h" #include "nm-dhcp4-config.h" +#include "nm-ip6-config.h" #include "nm-connection.h" G_BEGIN_DECLS @@ -49,6 +50,7 @@ G_BEGIN_DECLS #define NM_DEVICE_MANAGED "managed" #define NM_DEVICE_IP4_CONFIG "ip4-config" #define NM_DEVICE_DHCP4_CONFIG "dhcp4-config" +#define NM_DEVICE_IP6_CONFIG "ip6-config" #define NM_DEVICE_STATE "state" #define NM_DEVICE_VENDOR "vendor" #define NM_DEVICE_PRODUCT "product" @@ -78,6 +80,7 @@ guint32 nm_device_get_capabilities (NMDevice *device); gboolean nm_device_get_managed (NMDevice *device); NMIP4Config * nm_device_get_ip4_config (NMDevice *device); NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *device); +NMIP6Config * nm_device_get_ip6_config (NMDevice *device); NMDeviceState nm_device_get_state (NMDevice *device); const char * nm_device_get_product (NMDevice *device); const char * nm_device_get_vendor (NMDevice *device); diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c index 481b56917..4bedc7a1a 100644 --- a/libnm-glib/nm-ip4-config.c +++ b/libnm-glib/nm-ip4-config.c @@ -353,9 +353,9 @@ nm_ip4_config_get_addresses (NMIP4Config *config) return priv->addresses; if (!_nm_object_get_property (NM_OBJECT (config), - "org.freedesktop.DBus.Properties", - "Addresses", - &value)) { + NM_DBUS_INTERFACE_IP4_CONFIG, + "Addresses", + &value)) { return NULL; } @@ -400,9 +400,9 @@ nm_ip4_config_get_nameservers (NMIP4Config *config) priv = NM_IP4_CONFIG_GET_PRIVATE (config); if (!priv->nameservers) { if (_nm_object_get_property (NM_OBJECT (config), - NM_DBUS_INTERFACE_IP4_CONFIG, - "Nameservers", - &value)) { + NM_DBUS_INTERFACE_IP4_CONFIG, + "Nameservers", + &value)) { array = (GArray *) g_value_get_boxed (&value); if (array && array->len) { priv->nameservers = g_array_sized_new (FALSE, TRUE, sizeof (guint32), array->len); @@ -437,9 +437,9 @@ nm_ip4_config_get_domains (NMIP4Config *config) return handle_ptr_array_return (priv->domains); if (_nm_object_get_property (NM_OBJECT (config), - NM_DBUS_INTERFACE_IP4_CONFIG, - "Domains", - &value)) { + NM_DBUS_INTERFACE_IP4_CONFIG, + "Domains", + &value)) { char **array = NULL, **p; array = (char **) g_value_get_boxed (&value); @@ -475,9 +475,9 @@ nm_ip4_config_get_wins_servers (NMIP4Config *config) priv = NM_IP4_CONFIG_GET_PRIVATE (config); if (!priv->nameservers) { if (_nm_object_get_property (NM_OBJECT (config), - NM_DBUS_INTERFACE_IP4_CONFIG, - "Nameservers", - &value)) { + NM_DBUS_INTERFACE_IP4_CONFIG, + "Nameservers", + &value)) { array = (GArray *) g_value_get_boxed (&value); if (array && array->len) { priv->nameservers = g_array_sized_new (FALSE, TRUE, sizeof (guint32), array->len); @@ -512,9 +512,9 @@ nm_ip4_config_get_routes (NMIP4Config *config) return priv->routes; if (!_nm_object_get_property (NM_OBJECT (config), - "org.freedesktop.DBus.Properties", - "Routes", - &value)) { + NM_DBUS_INTERFACE_IP4_CONFIG, + "Routes", + &value)) { return NULL; } diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c new file mode 100644 index 000000000..f7a210752 --- /dev/null +++ b/libnm-glib/nm-ip6-config.c @@ -0,0 +1,436 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * libnm_glib -- Access network status & information from glib applications + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2007 - 2008 Novell, Inc. + * Copyright (C) 2008 Red Hat, Inc. + */ + +#include + +#include +#include "nm-ip6-config.h" +#include "NetworkManager.h" +#include "nm-types-private.h" +#include "nm-object-private.h" +#include "nm-utils.h" + +G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, NM_TYPE_OBJECT) + +#define NM_IP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_IP6_CONFIG, NMIP6ConfigPrivate)) + +typedef struct { + DBusGProxy *proxy; + + GSList *addresses; + GSList *nameservers; + GPtrArray *domains; + GSList *routes; +} NMIP6ConfigPrivate; + +enum { + PROP_0, + PROP_ADDRESSES, + PROP_NAMESERVERS, + PROP_DOMAINS, + PROP_ROUTES, + + LAST_PROP +}; + +/** + * nm_ip6_config_new: + * @connection: the #DBusGConnection + * @object_path: the DBus object path of the device + * + * Creates a new #NMIP6Config. + * + * Returns: a new IP6 configuration + **/ +GObject * +nm_ip6_config_new (DBusGConnection *connection, const char *object_path) +{ + return (GObject *) g_object_new (NM_TYPE_IP6_CONFIG, + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, object_path, + NULL); +} + +static gboolean +demarshal_ip6_address_array (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (object); + + g_slist_foreach (priv->addresses, (GFunc) nm_ip6_address_unref, NULL); + g_slist_free (priv->addresses); + priv->addresses = NULL; + + priv->addresses = nm_utils_ip6_addresses_from_gvalue (value); + _nm_object_queue_notify (object, NM_IP6_CONFIG_ADDRESSES); + + return TRUE; +} + +static gboolean +demarshal_ip6_nameserver_array (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field) +{ + if (!_nm_ip6_address_array_demarshal (value, (GSList **) field)) + return FALSE; + + if (!strcmp (pspec->name, NM_IP6_CONFIG_NAMESERVERS)) + _nm_object_queue_notify (object, NM_IP6_CONFIG_NAMESERVERS); + + return TRUE; +} + +static gboolean +demarshal_domains (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field) +{ + if (!_nm_string_array_demarshal (value, (GPtrArray **) field)) + return FALSE; + + _nm_object_queue_notify (object, NM_IP6_CONFIG_DOMAINS); + return TRUE; +} + +static gboolean +demarshal_ip6_routes_array (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (object); + + g_slist_foreach (priv->routes, (GFunc) nm_ip6_route_unref, NULL); + g_slist_free (priv->routes); + priv->routes = NULL; + + priv->routes = nm_utils_ip6_routes_from_gvalue (value); + _nm_object_queue_notify (object, NM_IP6_CONFIG_ROUTES); + + return TRUE; +} + +static void +register_for_property_changed (NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + const NMPropertiesChangedInfo property_changed_info[] = { + { NM_IP6_CONFIG_ADDRESSES, demarshal_ip6_address_array, &priv->addresses }, + { NM_IP6_CONFIG_NAMESERVERS, demarshal_ip6_nameserver_array, &priv->nameservers }, + { NM_IP6_CONFIG_DOMAINS, demarshal_domains, &priv->domains }, + { NM_IP6_CONFIG_ROUTES, demarshal_ip6_routes_array, &priv->routes }, + { NULL }, + }; + + _nm_object_handle_properties_changed (NM_OBJECT (config), + priv->proxy, + property_changed_info); +} + +/** + * nm_ip6_config_get_addresses: + * @config: a #NMIP6Config + * + * Gets the IP6 addresses (containing the address, prefix, and gateway). + * + * Returns: the #GSList containing #NMSettingIP6Addresses. This is the internal copy + * used by the configuration and must not be modified. + **/ +const GSList * +nm_ip6_config_get_addresses (NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv; + GValue value = { 0, }; + + g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + + priv = NM_IP6_CONFIG_GET_PRIVATE (config); + if (priv->addresses) + return priv->addresses; + + if (!_nm_object_get_property (NM_OBJECT (config), + "org.freedesktop.DBus.Properties", + "Addresses", + &value)) { + return NULL; + } + + demarshal_ip6_address_array (NM_OBJECT (config), NULL, &value, &priv->addresses); + g_value_unset (&value); + + return priv->addresses; +} + +/** + * nm_ip6_config_get_nameservers: + * @config: a #NMIP6Config + * + * Gets the domain name servers (DNS). + * + * Returns: a #GSList containing elements of type 'struct in6_addr' which contain + * the addresses of nameservers of the configuration. This is the internal copy + * used by the configuration and must not be modified. + **/ +const GSList * +nm_ip6_config_get_nameservers (NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv; + GValue value = {0,}; + + g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); + + priv = NM_IP6_CONFIG_GET_PRIVATE (config); + if (priv->nameservers) + return priv->nameservers; + + if (!_nm_object_get_property (NM_OBJECT (config), + NM_DBUS_INTERFACE_IP6_CONFIG, + "Nameservers", + &value)) { + return NULL; + } + + demarshal_ip6_nameserver_array (NM_OBJECT (config), NULL, &value, &priv->nameservers); + g_value_unset (&value); + + return priv->nameservers; +} + +/** + * nm_ip6_config_get_domains: + * @config: a #NMIP6Config + * + * Gets the domain names. + * + * Returns: the #GPtrArray containing domains as strings. This is the + * internal copy used by the configuration, and must not be modified. + **/ +const GPtrArray * +nm_ip6_config_get_domains (NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv; + GValue value = {0,}; + + g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); + + priv = NM_IP6_CONFIG_GET_PRIVATE (config); + if (priv->domains) + return handle_ptr_array_return (priv->domains); + + if (!_nm_object_get_property (NM_OBJECT (config), + NM_DBUS_INTERFACE_IP6_CONFIG, + "Domains", + &value)) { + return NULL; + } + + demarshal_domains (NM_OBJECT (config), NULL, &value, &priv->domains); + g_value_unset (&value); + + return handle_ptr_array_return (priv->domains); +} + +/** + * nm_ip6_config_get_routes: + * @config: a #NMIP6Config + * + * Gets the routes. + * + * Returns: the #GSList containing #NMSettingIP6Routes. This is the + * internal copy used by the configuration, and must not be modified. + **/ +const GSList * +nm_ip6_config_get_routes (NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv; + GValue value = { 0, }; + + g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + + priv = NM_IP6_CONFIG_GET_PRIVATE (config); + if (priv->routes) + return priv->routes; + + if (!_nm_object_get_property (NM_OBJECT (config), + NM_DBUS_INTERFACE_IP6_CONFIG, + "Routes", + &value)) { + return NULL; + } + + demarshal_ip6_routes_array (NM_OBJECT (config), NULL, &value, &priv->routes); + g_value_unset (&value); + + return priv->routes; +} + +static GObject* +constructor (GType type, + guint n_construct_params, + GObjectConstructParam *construct_params) +{ + GObject *object; + DBusGConnection *connection; + NMIP6ConfigPrivate *priv; + + object = G_OBJECT_CLASS (nm_ip6_config_parent_class)->constructor (type, + n_construct_params, + construct_params); + if (!object) + return NULL; + + priv = NM_IP6_CONFIG_GET_PRIVATE (object); + connection = nm_object_get_connection (NM_OBJECT (object)); + + priv->proxy = dbus_g_proxy_new_for_name (connection, + NM_DBUS_SERVICE, + nm_object_get_path (NM_OBJECT (object)), + NM_DBUS_INTERFACE_IP6_CONFIG); + + register_for_property_changed (NM_IP6_CONFIG (object)); + + return object; +} + +static void +finalize (GObject *object) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (object); + + g_slist_foreach (priv->addresses, (GFunc) nm_ip6_address_unref, NULL); + g_slist_free (priv->addresses); + + g_slist_foreach (priv->routes, (GFunc) nm_ip6_route_unref, NULL); + g_slist_free (priv->routes); + + g_slist_foreach (priv->nameservers, (GFunc) g_free, NULL); + g_slist_free (priv->nameservers); + + if (priv->domains) { + g_ptr_array_foreach (priv->domains, (GFunc) g_free, NULL); + g_ptr_array_free (priv->domains, TRUE); + } + + g_object_unref (priv->proxy); + + G_OBJECT_CLASS (nm_ip6_config_parent_class)->finalize (object); +} + +static void +get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + NMIP6Config *self = NM_IP6_CONFIG (object); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (self); + + switch (prop_id) { + case PROP_ADDRESSES: + nm_utils_ip6_addresses_to_gvalue (priv->addresses, value); + break; + case PROP_NAMESERVERS: + g_value_set_boxed (value, nm_ip6_config_get_nameservers (self)); + break; + case PROP_DOMAINS: + g_value_set_boxed (value, nm_ip6_config_get_domains (self)); + break; + case PROP_ROUTES: + nm_utils_ip6_routes_to_gvalue (priv->routes, value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +nm_ip6_config_init (NMIP6Config *config) +{ +} + +static void +nm_ip6_config_class_init (NMIP6ConfigClass *config_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (config_class); + + g_type_class_add_private (config_class, sizeof (NMIP6ConfigPrivate)); + + /* virtual methods */ + object_class->constructor = constructor; + object_class->get_property = get_property; + object_class->finalize = finalize; + + /* properties */ + + /** + * NMIP6Config:addresses: + * + * The #GPtrArray containing the IPv6 addresses; use + * nm_utils_ip6_addresses_from_gvalue() to return a #GSList of + * #NMSettingIP6Address objects that is more usable than the raw data. + **/ + g_object_class_install_property + (object_class, PROP_ADDRESSES, + g_param_spec_boxed (NM_IP6_CONFIG_ADDRESSES, + "Addresses", + "Addresses", + NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY, + G_PARAM_READABLE)); + + /** + * NMIP6Config:nameservers: + * + * The #GPtrArray containing elements of type 'struct ip6_addr' which + * contain the addresses of nameservers of the configuration. + **/ + g_object_class_install_property + (object_class, PROP_NAMESERVERS, + g_param_spec_boxed (NM_IP6_CONFIG_NAMESERVERS, + "Nameservers", + "Nameservers", + NM_TYPE_IP6_ADDRESS_ARRAY, + G_PARAM_READABLE)); + + /** + * NMIP6Config:domains: + * + * The #GPtrArray containing domain strings of the configuration. + **/ + g_object_class_install_property + (object_class, PROP_DOMAINS, + g_param_spec_boxed (NM_IP6_CONFIG_DOMAINS, + "Domains", + "Domains", + NM_TYPE_STRING_ARRAY, + G_PARAM_READABLE)); + + /** + * NMIP6Config:routes: + * + * The #GPtrArray containing the IPv6 routes; use + * nm_utils_ip6_routes_from_gvalue() to return a #GSList of + * #NMSettingIP6Address objects that is more usable than the raw data. + **/ + g_object_class_install_property + (object_class, PROP_ROUTES, + g_param_spec_boxed (NM_IP6_CONFIG_ROUTES, + "Routes", + "Routes", + NM_TYPE_IP6_ROUTE_OBJECT_ARRAY, + G_PARAM_READABLE)); +} + diff --git a/libnm-glib/nm-ip6-config.h b/libnm-glib/nm-ip6-config.h new file mode 100644 index 000000000..9cccdacb1 --- /dev/null +++ b/libnm-glib/nm-ip6-config.h @@ -0,0 +1,65 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * libnm_glib -- Access network status & information from glib applications + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2007 - 2008 Novell, Inc. + * Copyright (C) 2008 Red Hat, Inc. + */ + +#ifndef NM_IP6_CONFIG_H +#define NM_IP6_CONFIG_H + +#include +#include +#include +#include "nm-object.h" + +G_BEGIN_DECLS + +#define NM_TYPE_IP6_CONFIG (nm_ip6_config_get_type ()) +#define NM_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP6_CONFIG, NMIP6Config)) +#define NM_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) +#define NM_IS_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IP6_CONFIG)) +#define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IP6_CONFIG)) +#define NM_IP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) + +typedef struct { + NMObject parent; +} NMIP6Config; + +typedef struct { + NMObjectClass parent; +} NMIP6ConfigClass; + +#define NM_IP6_CONFIG_ADDRESSES "addresses" +#define NM_IP6_CONFIG_NAMESERVERS "nameservers" +#define NM_IP6_CONFIG_DOMAINS "domains" +#define NM_IP6_CONFIG_ROUTES "routes" + +GType nm_ip6_config_get_type (void); + +GObject *nm_ip6_config_new (DBusGConnection *connection, const char *object_path); + +const GSList * nm_ip6_config_get_addresses (NMIP6Config *config); +const GSList * nm_ip6_config_get_nameservers (NMIP6Config *config); +const GPtrArray *nm_ip6_config_get_domains (NMIP6Config *config); +const GSList * nm_ip6_config_get_routes (NMIP6Config *config); + +G_END_DECLS + +#endif /* NM_IP6_CONFIG_H */ diff --git a/libnm-glib/nm-types-private.h b/libnm-glib/nm-types-private.h index b55a82cc7..178890da1 100644 --- a/libnm-glib/nm-types-private.h +++ b/libnm-glib/nm-types-private.h @@ -34,6 +34,6 @@ gboolean _nm_object_array_demarshal (GValue *value, GPtrArray **dest, DBusGConnection *connection, NMObjectCreatorFunc func); - +gboolean _nm_ip6_address_array_demarshal (GValue *value, GSList **dest); #endif /* NM_TYPES_PRIVATE_H */ diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c index d77751368..baceb86ba 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -28,6 +28,7 @@ #include "nm-object-private.h" #include "nm-object-cache.h" #include "nm-dbus-glib-types.h" +#include "nm-setting-ip6-config.h" static gpointer nm_ssid_copy (GByteArray *src) @@ -275,3 +276,148 @@ _nm_object_array_demarshal (GValue *value, return TRUE; } +/*****************************/ + +static gpointer +nm_ip6_address_object_array_copy (GPtrArray *src) +{ + GPtrArray *dest; + int i; + + dest = g_ptr_array_sized_new (src->len); + for (i = 0; i < src->len; i++) + g_ptr_array_add (dest, nm_ip6_address_dup (g_ptr_array_index (src, i))); + return dest; +} + +static void +nm_ip6_address_object_array_free (GPtrArray *array) +{ + int i; + + for (i = 0; i < array->len; i++) + nm_ip6_address_unref (g_ptr_array_index (array, i)); + g_ptr_array_free (array, TRUE); +} + +GType +nm_ip6_address_object_array_get_type (void) +{ + static GType our_type = 0; + + if (our_type == 0) + our_type = g_boxed_type_register_static (g_intern_static_string ("nm-ip6-address-object-array"), + (GBoxedCopyFunc) nm_ip6_address_object_array_copy, + (GBoxedFreeFunc) nm_ip6_address_object_array_free); + return our_type; +} + +/*****************************/ + +static gpointer +nm_ip6_address_array_copy (GPtrArray *src) +{ + GPtrArray *dest; + int i; + + dest = g_ptr_array_sized_new (src->len); + for (i = 0; i < src->len; i++) { + struct in6_addr *addr = g_ptr_array_index (src, i); + struct in6_addr *dup; + + dup = g_malloc0 (sizeof (struct in6_addr)); + memcpy (dup, addr, sizeof (struct in6_addr)); + g_ptr_array_add (dest, dup); + } + return dest; +} + +static void +nm_ip6_address_array_free (GPtrArray *array) +{ + int i; + + for (i = 0; i < array->len; i++) + g_free (g_ptr_array_index (array, i)); + g_ptr_array_free (array, TRUE); +} + +GType +nm_ip6_address_array_get_type (void) +{ + static GType our_type = 0; + + if (our_type == 0) + our_type = g_boxed_type_register_static (g_intern_static_string ("nm-ip6-address-array"), + (GBoxedCopyFunc) nm_ip6_address_array_copy, + (GBoxedFreeFunc) nm_ip6_address_array_free); + return our_type; +} + +gboolean +_nm_ip6_address_array_demarshal (GValue *value, GSList **dest) +{ + GPtrArray *array; + + if (!G_VALUE_HOLDS (value, DBUS_TYPE_G_UINT_ARRAY)) + return FALSE; + + if (*dest) { + g_slist_foreach (*dest, (GFunc) g_free, NULL); + g_slist_free (*dest); + *dest = NULL; + } + + array = (GPtrArray *) g_value_get_boxed (value); + if (array && array->len) { + int i; + + for (i = 0; i < array->len; i++) { + struct in6_addr *addr = g_ptr_array_index (array, i); + struct in6_addr *dup; + + dup = g_malloc0 (sizeof (struct in6_addr)); + memcpy (dup, addr, sizeof (struct in6_addr)); + *dest = g_slist_append (*dest, dup); + } + } + + return TRUE; +} + +/*****************************/ + +static gpointer +nm_ip6_route_object_array_copy (GPtrArray *src) +{ + GPtrArray *dest; + int i; + + dest = g_ptr_array_sized_new (src->len); + for (i = 0; i < src->len; i++) + g_ptr_array_add (dest, nm_ip6_route_dup (g_ptr_array_index (src, i))); + return dest; +} + +static void +nm_ip6_route_object_array_free (GPtrArray *array) +{ + int i; + + for (i = 0; i < array->len; i++) + nm_ip6_route_unref (g_ptr_array_index (array, i)); + g_ptr_array_free (array, TRUE); +} + +GType +nm_ip6_route_object_array_get_type (void) +{ + static GType our_type = 0; + + if (our_type == 0) + our_type = g_boxed_type_register_static (g_intern_static_string ("nm-ip6-route-object-array"), + (GBoxedCopyFunc) nm_ip6_route_object_array_copy, + (GBoxedFreeFunc) nm_ip6_route_object_array_free); + return our_type; +} + diff --git a/libnm-glib/nm-types.h b/libnm-glib/nm-types.h index e3a18923b..eb3461f7d 100644 --- a/libnm-glib/nm-types.h +++ b/libnm-glib/nm-types.h @@ -38,4 +38,13 @@ GType nm_string_array_get_type (void) G_GNUC_CONST; #define NM_TYPE_OBJECT_ARRAY (nm_object_array_get_type ()) GType nm_object_array_get_type (void) G_GNUC_CONST; +#define NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY (nm_ip6_address_object_array_get_type ()) +GType nm_ip6_address_object_array_get_type (void) G_GNUC_CONST; + +#define NM_TYPE_IP6_ADDRESS_ARRAY (nm_ip6_address_array_get_type ()) +GType nm_ip6_address_array_get_type (void) G_GNUC_CONST; + +#define NM_TYPE_IP6_ROUTE_OBJECT_ARRAY (nm_ip6_route_object_array_get_type ()) +GType nm_ip6_route_object_array_get_type (void) G_GNUC_CONST; + #endif /* NM_TYPES_H */ From 537c2f1f86550087664babbf298693d50de367e6 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 20 Aug 2009 12:31:17 -0500 Subject: [PATCH 16/22] build: always link locally-built libraries first (bgo #580131) --- callouts/Makefile.am | 6 ++--- libnm-util/tests/Makefile.am | 8 +++--- src/Makefile.am | 18 ++++++------- src/bluez-manager/Makefile.am | 4 +-- src/dhcp-manager/Makefile.am | 4 +-- src/modem-manager/Makefile.am | 4 +-- src/ppp-manager/Makefile.am | 8 +++--- src/supplicant-manager/Makefile.am | 4 +-- src/supplicant-manager/tests/Makefile.am | 4 +-- src/system-settings/Makefile.am | 8 +++--- src/tests/Makefile.am | 6 ++--- src/vpn-manager/Makefile.am | 8 +++--- system-settings/plugins/ifcfg-rh/Makefile.am | 6 ++--- .../plugins/ifcfg-rh/tests/Makefile.am | 4 +-- .../plugins/ifcfg-suse/Makefile.am | 6 ++--- system-settings/plugins/ifupdown/Makefile.am | 4 +-- system-settings/plugins/keyfile/Makefile.am | 8 +++--- .../plugins/keyfile/tests/Makefile.am | 4 +-- test/Makefile.am | 27 +++++++++---------- 19 files changed, 69 insertions(+), 72 deletions(-) diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 385537ef6..7acb6f023 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -54,10 +54,10 @@ nm_dispatcher_action_CPPFLAGS = \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dispatcher_action_LDADD = \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ $(top_builddir)/libnm-glib/libnm_glib.la \ - $(top_builddir)/libnm-util/libnm-util.la + $(top_builddir)/libnm-util/libnm-util.la \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) nm-dispatcher-glue.h: nm-dispatcher.xml dbus-binding-tool --prefix=nm_dispatcher --mode=glib-server --output=$@ $< diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index 1cf19cbc4..ea34ebc38 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -14,9 +14,9 @@ test_settings_defaults_CPPFLAGS = \ $(DBUS_CFLAGS) test_settings_defaults_LDADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la + $(DBUS_LIBS) test_crypto_SOURCES = \ test-crypto.c @@ -25,8 +25,8 @@ test_crypto_CPPFLAGS = \ $(GLIB_CFLAGS) test_crypto_LDADD = \ - $(GLIB_LIBS) \ - $(top_builddir)/libnm-util/libtest-crypto.la + $(top_builddir)/libnm-util/libtest-crypto.la \ + $(GLIB_LIBS) if WITH_TESTS diff --git a/src/Makefile.am b/src/Makefile.am index 915e972da..7c198f46d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,10 +44,10 @@ libtest_dhcp_la_CPPFLAGS = \ $(LIBNL_CFLAGS) libtest_dhcp_la_LIBADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ - $(LIBNL_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la + $(LIBNL_LIBS) ########################################### @@ -178,12 +178,6 @@ NetworkManager_CPPFLAGS = \ -DARP_DEBUG NetworkManager_LDADD = \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(HAL_LIBS) \ - $(GUDEV_LIBS) \ - $(LIBNL_LIBS) \ - $(GMODULE_LIBS) \ $(top_builddir)/marshallers/libmarshallers.la \ ./named-manager/libnamed-manager.la \ ./vpn-manager/libvpn-manager.la \ @@ -195,7 +189,13 @@ NetworkManager_LDADD = \ ./bluez-manager/libbluez-manager.la \ ./system-settings/libsystem-settings.la \ ./backends/libnmbackend.la \ - $(top_builddir)/libnm-util/libnm-util.la + $(top_builddir)/libnm-util/libnm-util.la \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) \ + $(HAL_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) \ + $(GMODULE_LIBS) NetworkManager_LDFLAGS = -rdynamic diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am index 17d149a68..a96cbe891 100644 --- a/src/bluez-manager/Makefile.am +++ b/src/bluez-manager/Makefile.am @@ -29,8 +29,8 @@ libbluez_manager_la_CPPFLAGS = \ -DLOCALSTATEDIR=\"$(localstatedir)\" libbluez_manager_la_LIBADD = \ + $(top_builddir)/marshallers/libmarshallers.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ - $(BLUEZ_LIBS) \ - $(top_builddir)/marshallers/libmarshallers.la + $(BLUEZ_LIBS) diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 409e5a313..518bc4109 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -26,9 +26,9 @@ libdhcp_manager_la_CPPFLAGS = \ -DDHCP_CLIENT_PATH=\"$(DHCP_CLIENT_PATH)\" libdhcp_manager_la_LIBADD = \ + $(top_builddir)/marshallers/libmarshallers.la \ $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(top_builddir)/marshallers/libmarshallers.la + $(GLIB_LIBS) EXTRA_DIST = \ nm-dhcp-dhclient.c \ diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am index 5b660d05b..fef879ac4 100644 --- a/src/modem-manager/Makefile.am +++ b/src/modem-manager/Makefile.am @@ -21,8 +21,8 @@ libmodem_manager_la_CPPFLAGS = \ $(DBUS_CFLAGS) libmodem_manager_la_LIBADD = \ - $(DBUS_LIBS) \ - $(top_builddir)/marshallers/libmarshallers.la + $(top_builddir)/marshallers/libmarshallers.la \ + $(DBUS_LIBS) nm-device-cdma-glue.h: $(top_srcdir)/introspection/nm-device-cdma.xml dbus-binding-tool --prefix=nm_device_cdma --mode=glib-server --output=$@ $< diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index e5274e679..ed8c3e929 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -28,9 +28,9 @@ libppp_manager_la_CPPFLAGS = \ -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" libppp_manager_la_LIBADD = \ + $(top_builddir)/marshallers/libmarshallers.la \ $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(top_builddir)/marshallers/libmarshallers.la + $(GLIB_LIBS) pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la @@ -47,9 +47,9 @@ nm_pppd_plugin_la_CPPFLAGS = \ nm_pppd_plugin_la_LDFLAGS = -module -avoid-version nm_pppd_plugin_la_LIBADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la + $(GLIB_LIBS) BUILT_SOURCES = nm-ppp-manager-glue.h diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am index d613e836d..f15ffa9dc 100644 --- a/src/supplicant-manager/Makefile.am +++ b/src/supplicant-manager/Makefile.am @@ -30,7 +30,7 @@ libsupplicant_manager_la_CPPFLAGS = \ -DNM_LOCALSTATEDIR=\"$(localstatedir)\" libsupplicant_manager_la_LIBADD = \ + $(top_builddir)/marshallers/libmarshallers.la \ $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(top_builddir)/marshallers/libmarshallers.la + $(GLIB_LIBS) diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 757f654d1..b5e4db61d 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -14,9 +14,9 @@ test_supplicant_config_CPPFLAGS = \ $(DBUS_CFLAGS) test_supplicant_config_LDADD = \ - $(DBUS_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/supplicant-manager/libsupplicant-manager.la + $(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \ + $(DBUS_LIBS) if WITH_TESTS diff --git a/src/system-settings/Makefile.am b/src/system-settings/Makefile.am index e5c9313f6..c5e1ce00e 100644 --- a/src/system-settings/Makefile.am +++ b/src/system-settings/Makefile.am @@ -42,13 +42,13 @@ libsystem_settings_la_CPPFLAGS = \ -DPLUGINDIR=\"$(pkglibdir)\" libsystem_settings_la_LIBADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ + $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/marshallers/libmarshallers.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ - $(POLKIT_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ - $(top_builddir)/marshallers/libmarshallers.la + $(POLKIT_LIBS) libsystem_settings_la_LDFLAGS = -rdynamic diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 3354e1d08..398042ccb 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -16,11 +16,11 @@ test_dhcp_options_CPPFLAGS = \ $(DBUS_CFLAGS) test_dhcp_options_LDADD = \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/src/dhcp-manager/libdhcp-manager.la \ - $(top_builddir)/src/libtest-dhcp.la + $(top_builddir)/src/libtest-dhcp.la \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) if WITH_TESTS diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am index 9b962a612..107860338 100644 --- a/src/vpn-manager/Makefile.am +++ b/src/vpn-manager/Makefile.am @@ -23,11 +23,11 @@ libvpn_manager_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ -DG_DISABLE_DEPRECATED -libvpn_manager_la_LIBADD = \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ +libvpn_manager_la_LIBADD = \ $(top_builddir)/marshallers/libmarshallers.la \ - $(top_builddir)/libnm-util/libnm-util.la + $(top_builddir)/libnm-util/libnm-util.la \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-server --output=$@ $< diff --git a/system-settings/plugins/ifcfg-rh/Makefile.am b/system-settings/plugins/ifcfg-rh/Makefile.am index e2b0a83c9..7486b5d05 100644 --- a/system-settings/plugins/ifcfg-rh/Makefile.am +++ b/system-settings/plugins/ifcfg-rh/Makefile.am @@ -52,12 +52,12 @@ libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \ libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ - $(GLIB_LIBS) \ - $(GMODULE_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/libnm-glib/libnm_glib.la \ $(top_builddir)/marshallers/libmarshallers.la \ - libifcfg-rh-io.la + libifcfg-rh-io.la \ + $(GLIB_LIBS) \ + $(GMODULE_LIBS) if NO_GIO libnm_settings_plugin_ifcfg_rh_la_LIBADD += \ diff --git a/system-settings/plugins/ifcfg-rh/tests/Makefile.am b/system-settings/plugins/ifcfg-rh/tests/Makefile.am index cc2d7fbe8..20d2d5d0d 100644 --- a/system-settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/system-settings/plugins/ifcfg-rh/tests/Makefile.am @@ -18,10 +18,10 @@ test_ifcfg_rh_CPPFLAGS = \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" test_ifcfg_rh_LDADD = \ - $(DBUS_LIBS) \ $(top_builddir)/libnm-glib/libnm_glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la + $(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la \ + $(DBUS_LIBS) if WITH_TESTS diff --git a/system-settings/plugins/ifcfg-suse/Makefile.am b/system-settings/plugins/ifcfg-suse/Makefile.am index b83a35abc..2db852b09 100644 --- a/system-settings/plugins/ifcfg-suse/Makefile.am +++ b/system-settings/plugins/ifcfg-suse/Makefile.am @@ -26,12 +26,12 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \ libnm_settings_plugin_ifcfg_suse_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_ifcfg_suse_la_LIBADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ + $(top_builddir)/libnm-glib/libnm_glib.la \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ $(POLKIT_LIBS) \ - $(GUDEV_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm_glib.la + $(GUDEV_LIBS) if NO_GIO libnm_settings_plugin_ifcfg_suse_la_LIBADD += \ diff --git a/system-settings/plugins/ifupdown/Makefile.am b/system-settings/plugins/ifupdown/Makefile.am index eca264be5..ec5031155 100644 --- a/system-settings/plugins/ifupdown/Makefile.am +++ b/system-settings/plugins/ifupdown/Makefile.am @@ -27,8 +27,8 @@ libnm_settings_plugin_ifupdown_la_CPPFLAGS = \ libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_ifupdown_la_LIBADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ - $(GUDEV_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la + $(GUDEV_LIBS) diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am index dccc9d617..5e902b313 100644 --- a/system-settings/plugins/keyfile/Makefile.am +++ b/system-settings/plugins/keyfile/Makefile.am @@ -27,12 +27,12 @@ libnm_settings_plugin_keyfile_la_CPPFLAGS = \ libnm_settings_plugin_keyfile_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_keyfile_la_LIBADD = \ - $(GLIB_LIBS) \ - $(GMODULE_LIBS) \ - $(DBUS_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/libnm-glib/libnm_glib.la \ - $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la + $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ + $(GLIB_LIBS) \ + $(GMODULE_LIBS) \ + $(DBUS_LIBS) if NO_GIO libnm_settings_plugin_keyfile_la_LIBADD += \ diff --git a/system-settings/plugins/keyfile/tests/Makefile.am b/system-settings/plugins/keyfile/tests/Makefile.am index b744f46b5..abebbe3f3 100644 --- a/system-settings/plugins/keyfile/tests/Makefile.am +++ b/system-settings/plugins/keyfile/tests/Makefile.am @@ -18,10 +18,10 @@ test_keyfile_CPPFLAGS = \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" test_keyfile_LDADD = \ - $(DBUS_LIBS) \ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ $(top_builddir)/libnm-glib/libnm_glib.la \ - $(top_builddir)/libnm-util/libnm-util.la + $(top_builddir)/libnm-util/libnm-util.la \ + $(DBUS_LIBS) if WITH_TESTS diff --git a/test/Makefile.am b/test/Makefile.am index 47bf2a56a..e5f0c4784 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,11 +4,10 @@ INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/gnome/libnm_glib \ -I${top_srcdir}/include -AM_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(HAL_CFLAGS) \ - -DBINDIR=\"$(bindir)\" \ +AM_CPPFLAGS = \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DBINDIR=\"$(bindir)\" \ -DNM_RUN_DIR=\"$(rundir)\" \ -DDATADIR=\"$(datadir)\" @@ -18,23 +17,21 @@ noinst_PROGRAMS = nm-online libnm_glib_test nm_tool_SOURCES = nm-tool.c nm_tool_LDADD = \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(HAL_LIBS) \ $(top_builddir)/libnm-glib/libnm_glib.la \ - $(top_builddir)/libnm-util/libnm-util.la + $(top_builddir)/libnm-util/libnm-util.la \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) nm_online_SOURCES = nm-online.c nm_online_LDADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(HAL_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la + $(GLIB_LIBS) libnm_glib_test_SOURCES = libnm_glib_test.c libnm_glib_test_LDADD = \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ $(top_builddir)/libnm-glib/libnm_glib.la \ - $(top_builddir)/libnm-util/libnm-util.la + $(top_builddir)/libnm-util/libnm-util.la \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) From 718e3bf89c648752f03553450a2cb36152cfdf59 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 20 Aug 2009 12:38:59 -0500 Subject: [PATCH 17/22] build: remove unused references to HAL --- src/Makefile.am | 1 - src/backends/Makefile.am | 14 +++++++------- src/dhcp-manager/Makefile.am | 1 - src/ppp-manager/Makefile.am | 1 - src/supplicant-manager/Makefile.am | 1 - 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7c198f46d..8d936e625 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -192,7 +192,6 @@ NetworkManager_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ - $(HAL_LIBS) \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ $(GMODULE_LIBS) diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am index d32f635da..65c96b591 100644 --- a/src/backends/Makefile.am +++ b/src/backends/Makefile.am @@ -50,11 +50,11 @@ libnmbackend_la_SOURCES += NetworkManagerMandriva.c endif libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS) -libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(HAL_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" +libnmbackend_la_CPPFLAGS = \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_DISABLE_DEPRECATED \ + -DBINDIR=\"$(bindir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 518bc4109..b7b0c6581 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -16,7 +16,6 @@ libdhcp_manager_la_SOURCES = \ libdhcp_manager_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - $(HAL_CFLAGS) \ -DG_DISABLE_DEPRECATED \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index ed8c3e929..41cb537c2 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -21,7 +21,6 @@ $(libppp_manager_la_OBJECTS): $(built_sources) libppp_manager_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ - $(HAL_CFLAGS) \ -DG_DISABLE_DEPRECATED \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am index f15ffa9dc..c6b623933 100644 --- a/src/supplicant-manager/Makefile.am +++ b/src/supplicant-manager/Makefile.am @@ -25,7 +25,6 @@ libsupplicant_manager_la_SOURCES = \ libsupplicant_manager_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - $(HAL_CFLAGS) \ -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ -DNM_LOCALSTATEDIR=\"$(localstatedir)\" From 9c0e92955286bfdbbd633adec1c946cb757df9b9 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 20 Aug 2009 13:00:37 -0500 Subject: [PATCH 18/22] core: require gio Which isn't a problem, since we already require glib-2.16 which includes gio. Thus, we can remove all the gfilemonitor compat stuff. --- Makefile.am | 4 - configure.ac | 18 +- gfilemonitor/COPYING | 482 ------------ gfilemonitor/Makefile.am | 29 - gfilemonitor/README | 4 - gfilemonitor/gfile.c | 126 ---- gfilemonitor/gfile.h | 72 -- gfilemonitor/gfilemonitor.c | 696 ------------------ gfilemonitor/gfilemonitor.h | 117 --- gfilemonitor/glocaldirectorymonitor.c | 258 ------- gfilemonitor/glocaldirectorymonitor.h | 71 -- gfilemonitor/glocalfilemonitor.c | 163 ---- gfilemonitor/glocalfilemonitor.h | 63 -- gfilemonitor/inotify-diag.c | 74 -- gfilemonitor/inotify-diag.h | 29 - gfilemonitor/inotify-helper.c | 234 ------ gfilemonitor/inotify-helper.h | 33 - gfilemonitor/inotify-kernel.c | 673 ----------------- gfilemonitor/inotify-kernel.h | 55 -- gfilemonitor/inotify-missing.c | 171 ----- gfilemonitor/inotify-missing.h | 35 - gfilemonitor/inotify-path.c | 422 ----------- gfilemonitor/inotify-path.h | 33 - gfilemonitor/inotify-sub.c | 70 -- gfilemonitor/inotify-sub.h | 38 - system-settings/plugins/ifcfg-rh/Makefile.am | 9 +- system-settings/plugins/ifcfg-rh/plugin.c | 14 +- .../plugins/ifcfg-suse/Makefile.am | 9 +- system-settings/plugins/ifcfg-suse/plugin.c | 10 +- system-settings/plugins/keyfile/Makefile.am | 9 +- system-settings/plugins/keyfile/plugin.c | 9 +- 31 files changed, 19 insertions(+), 4011 deletions(-) delete mode 100644 gfilemonitor/COPYING delete mode 100644 gfilemonitor/Makefile.am delete mode 100644 gfilemonitor/README delete mode 100644 gfilemonitor/gfile.c delete mode 100644 gfilemonitor/gfile.h delete mode 100644 gfilemonitor/gfilemonitor.c delete mode 100644 gfilemonitor/gfilemonitor.h delete mode 100644 gfilemonitor/glocaldirectorymonitor.c delete mode 100644 gfilemonitor/glocaldirectorymonitor.h delete mode 100644 gfilemonitor/glocalfilemonitor.c delete mode 100644 gfilemonitor/glocalfilemonitor.h delete mode 100644 gfilemonitor/inotify-diag.c delete mode 100644 gfilemonitor/inotify-diag.h delete mode 100644 gfilemonitor/inotify-helper.c delete mode 100644 gfilemonitor/inotify-helper.h delete mode 100644 gfilemonitor/inotify-kernel.c delete mode 100644 gfilemonitor/inotify-kernel.h delete mode 100644 gfilemonitor/inotify-missing.c delete mode 100644 gfilemonitor/inotify-missing.h delete mode 100644 gfilemonitor/inotify-path.c delete mode 100644 gfilemonitor/inotify-path.h delete mode 100644 gfilemonitor/inotify-sub.c delete mode 100644 gfilemonitor/inotify-sub.h diff --git a/Makefile.am b/Makefile.am index 3e2fec99f..cda6437cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,5 @@ SUBDIRS = marshallers -if NO_GIO -SUBDIRS += gfilemonitor -endif - SUBDIRS += \ libnm-util \ libnm-glib \ diff --git a/configure.ac b/configure.ac index 320f51a6a..5cfec2eba 100644 --- a/configure.ac +++ b/configure.ac @@ -181,7 +181,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.75) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -PKG_CHECK_MODULES(GLIB, gthread-2.0 glib-2.0 >= 2.10 gobject-2.0) +PKG_CHECK_MODULES(GLIB, gthread-2.0 glib-2.0 >= 2.16 gobject-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -193,6 +193,10 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0) AC_SUBST(GUDEV_CFLAGS) AC_SUBST(GUDEV_LIBS) +PKG_CHECK_MODULES(GIO, gio-2.0) +AC_SUBST(GIO_CFLAGS) +AC_SUBST(GIO_LIBS) + AC_ARG_WITH(udev-dir, AS_HELP_STRING([--with-udev-dir=DIR], [where the udev base directory is])) if test -n "$with_udev_dir" ; then UDEV_BASE_DIR="$with_udev_dir" @@ -201,17 +205,6 @@ else fi AC_SUBST(UDEV_BASE_DIR) -PKG_CHECK_EXISTS(gio-2.0,[have_gio=yes],[have_gio=no]) -if test x"$have_gio" = "xno"; then - AC_DEFINE([NO_GIO],[1],[Define if you don't have GIO]) - echo "GIO not found; using private GFileMonitor library" -else - PKG_CHECK_MODULES(GIO, gio-2.0) - AC_SUBST(GIO_CFLAGS) - AC_SUBST(GIO_LIBS) -fi -AM_CONDITIONAL(NO_GIO, test x"$have_gio" == "xno") - PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.0-pre8) AC_SUBST(LIBNL_CFLAGS) AC_SUBST(LIBNL_LIBS) @@ -460,7 +453,6 @@ libnm-util/tests/certs/Makefile libnm-glib/libnm_glib.pc libnm-glib/libnm_glib_vpn.pc libnm-glib/Makefile -gfilemonitor/Makefile callouts/Makefile tools/Makefile system-settings/Makefile diff --git a/gfilemonitor/COPYING b/gfilemonitor/COPYING deleted file mode 100644 index b8bfd6da7..000000000 --- a/gfilemonitor/COPYING +++ /dev/null @@ -1,482 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307 USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/gfilemonitor/Makefile.am b/gfilemonitor/Makefile.am deleted file mode 100644 index 7635ad087..000000000 --- a/gfilemonitor/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -INCLUDES = -I${top_srcdir}/include -I${top_builddir}/marshallers - -noinst_LTLIBRARIES = libgfilemonitor.la - -libgfilemonitor_la_SOURCES = \ - gfile.c \ - gfile.h \ - gfilemonitor.c \ - gfilemonitor.h \ - glocalfilemonitor.c \ - glocalfilemonitor.h \ - glocaldirectorymonitor.c \ - glocaldirectorymonitor.h \ - inotify-diag.c \ - inotify-diag.h \ - inotify-helper.c \ - inotify-helper.h \ - inotify-kernel.c \ - inotify-kernel.h \ - inotify-missing.c \ - inotify-missing.h \ - inotify-path.c \ - inotify-path.h \ - inotify-sub.c \ - inotify-sub.h - -libgfilemonitor_la_CPPFLAGS = $(GLIB_CFLAGS) - -libgfilemonitor_la_LIBADD = $(GLIB_LIBS) diff --git a/gfilemonitor/README b/gfilemonitor/README deleted file mode 100644 index 84662816a..000000000 --- a/gfilemonitor/README +++ /dev/null @@ -1,4 +0,0 @@ -A local copy of the Linux glib-2.14 GFileMonitor functionality, with a -re-implementation of GFile that doesn't depend on GIO. Allows NM source code to -use the same GFileMonitor APIs regardless of glib version. - diff --git a/gfilemonitor/gfile.c b/gfilemonitor/gfile.c deleted file mode 100644 index 15102f6e6..000000000 --- a/gfilemonitor/gfile.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2008 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Dan Williams - */ - -#include -#include - -#include "gfile.h" -#include "glocalfilemonitor.h" -#include "glocaldirectorymonitor.h" - -typedef struct { - char *path; -} GFilePrivate; - -#define G_FILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), G_TYPE_FILE, GFilePrivate)) - -G_DEFINE_TYPE (GFile, g_file, G_TYPE_OBJECT) - -char * -g_file_get_basename (GFile *file) -{ - g_return_val_if_fail (G_IS_FILE (file), NULL); - - return g_path_get_basename (G_FILE_GET_PRIVATE (file)->path); -} - -char * -g_file_get_path (GFile *file) -{ - g_return_val_if_fail (G_IS_FILE (file), NULL); - - return g_strdup (G_FILE_GET_PRIVATE (file)->path); -} - -const char * -g_file_get_const_path (GFile *file) -{ - g_return_val_if_fail (G_IS_FILE (file), NULL); - - return G_FILE_GET_PRIVATE (file)->path; -} - -GFileMonitor * -g_file_monitor_directory (GFile *file, - GFileMonitorFlags flags, - void *unused, - GError **error) -{ - g_return_val_if_fail (G_IS_FILE (file), NULL); - - return _g_local_directory_monitor_new (G_FILE_GET_PRIVATE (file)->path, flags, error); -} - -GFileMonitor * -g_file_monitor_file (GFile *file, - GFileMonitorFlags flags, - void *unused, - GError **error) -{ - g_return_val_if_fail (G_IS_FILE (file), NULL); - - return _g_local_file_monitor_new (G_FILE_GET_PRIVATE (file)->path, flags, error); -} - -GFile * -g_file_new_for_path (const char *path) -{ - GFile *file; - GFilePrivate *priv; - - file = (GFile *) g_object_new (G_TYPE_FILE, NULL); - if (!file) - return NULL; - - priv = G_FILE_GET_PRIVATE (file); - priv->path = g_strdup (path); - - return file; -} - -static void -g_file_init (GFile *file) -{ -} - -static void -finalize (GObject *object) -{ - GFile *file = G_FILE (object); - GFilePrivate *priv = G_FILE_GET_PRIVATE (file); - - g_free (priv->path); - priv->path = NULL; - - G_OBJECT_CLASS (g_file_parent_class)->finalize (object); -} - -static void -g_file_class_init (GFileClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (GFilePrivate)); - - /* virtual methods */ - object_class->finalize = finalize; -} - diff --git a/gfilemonitor/gfile.h b/gfilemonitor/gfile.h deleted file mode 100644 index f9be44a81..000000000 --- a/gfilemonitor/gfile.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2008 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Dan Williams - */ - -#ifndef __G_FILE_H__ -#define __G_FILE_H__ - -#include - -G_BEGIN_DECLS - -#define G_TYPE_FILE (g_file_get_type ()) -#define G_FILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_FILE, GFile)) -#define G_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_FILE, GFileClass)) -#define G_IS_FILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE)) -#define G_IS_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), G_TYPE_FILE)) -#define G_FILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_FILE, GFileClass)) - -typedef enum { - G_FILE_MONITOR_NONE = 0, -} GFileMonitorFlags; - -typedef struct _GFileMonitor GFileMonitor; - -typedef struct { - GObject parent; -} GFile; - -typedef struct { - GObjectClass parent; -} GFileClass; - -GType g_file_get_type (void) G_GNUC_CONST; - -GFile * g_file_new_for_path (const char *path); - -char * g_file_get_basename (GFile *file); - -char * g_file_get_path (GFile *file); - -const char * g_file_get_const_path (GFile *file); - -GFileMonitor * g_file_monitor_directory (GFile *file, - GFileMonitorFlags flags, - void *unused, - GError **error); - -GFileMonitor * g_file_monitor_file (GFile *file, - GFileMonitorFlags flags, - void *unused, - GError **error); - -G_END_DECLS - -#endif /* __G_FILE_H__ */ diff --git a/gfilemonitor/gfilemonitor.c b/gfilemonitor/gfilemonitor.c deleted file mode 100644 index 25d405f71..000000000 --- a/gfilemonitor/gfilemonitor.c +++ /dev/null @@ -1,696 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Alexander Larsson - */ - -#include -#include - -#include "gfilemonitor.h" -#include "nm-marshal.h" - -/** - * SECTION:gfilemonitor - * @short_description: File Monitor - * @include: gio/gio.h - * - * Monitors a file or directory for changes. - * - * To obtain a #GFileMonitor for a file or directory, use - * g_file_monitor_file() or g_file_monitor_directory(). - * - * To get informed about changes to the file or directory you - * are monitoring, connect to the #GFileMonitor::changed signal. - **/ - -G_LOCK_DEFINE_STATIC(cancelled); - -enum { - CHANGED, - LAST_SIGNAL -}; - -G_DEFINE_ABSTRACT_TYPE (GFileMonitor, g_file_monitor, G_TYPE_OBJECT); - -typedef struct { - GFile *file; - guint32 last_sent_change_time; /* 0 == not sent */ - guint32 send_delayed_change_at; /* 0 == never */ - guint32 send_virtual_changes_done_at; /* 0 == never */ -} RateLimiter; - -struct _GFileMonitorPrivate { - gboolean cancelled; - int rate_limit_msec; - - /* Rate limiting change events */ - GHashTable *rate_limiter; - - GSource *timeout; - guint32 timeout_fires_at; -}; - -enum { - PROP_0, - PROP_RATE_LIMIT, - PROP_CANCELLED -}; - -static void -g_file_monitor_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GFileMonitor *monitor; - - monitor = G_FILE_MONITOR (object); - - switch (prop_id) - { - case PROP_RATE_LIMIT: - g_file_monitor_set_rate_limit (monitor, g_value_get_int (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -g_file_monitor_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GFileMonitor *monitor; - GFileMonitorPrivate *priv; - - monitor = G_FILE_MONITOR (object); - priv = monitor->priv; - - switch (prop_id) - { - case PROP_RATE_LIMIT: - g_value_set_int (value, priv->rate_limit_msec); - break; - - case PROP_CANCELLED: - G_LOCK (cancelled); - g_value_set_boolean (value, priv->cancelled); - G_UNLOCK (cancelled); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -#define DEFAULT_RATE_LIMIT_MSECS 800 -#define DEFAULT_VIRTUAL_CHANGES_DONE_DELAY_SECS 2 - -static guint signals[LAST_SIGNAL] = { 0 }; - -static void -rate_limiter_free (RateLimiter *limiter) -{ - g_object_unref (limiter->file); - g_slice_free (RateLimiter, limiter); -} - -static void -g_file_monitor_finalize (GObject *object) -{ - GFileMonitor *monitor; - - monitor = G_FILE_MONITOR (object); - - if (monitor->priv->timeout) - { - g_source_destroy (monitor->priv->timeout); - g_source_unref (monitor->priv->timeout); - } - - g_hash_table_destroy (monitor->priv->rate_limiter); - - if (G_OBJECT_CLASS (g_file_monitor_parent_class)->finalize) - (*G_OBJECT_CLASS (g_file_monitor_parent_class)->finalize) (object); -} - -static void -g_file_monitor_dispose (GObject *object) -{ - GFileMonitor *monitor; - - monitor = G_FILE_MONITOR (object); - - /* Make sure we cancel on last unref */ - g_file_monitor_cancel (monitor); - - if (G_OBJECT_CLASS (g_file_monitor_parent_class)->dispose) - (*G_OBJECT_CLASS (g_file_monitor_parent_class)->dispose) (object); -} - -static void -g_file_monitor_class_init (GFileMonitorClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (GFileMonitorPrivate)); - - object_class = G_OBJECT_CLASS (klass); - object_class->finalize = g_file_monitor_finalize; - object_class->dispose = g_file_monitor_dispose; - object_class->get_property = g_file_monitor_get_property; - object_class->set_property = g_file_monitor_set_property; - - /** - * GFileMonitor::changed: - * @monitor: a #GFileMonitor. - * @file: a #GFile. - * @other_file: a #GFile. - * @event_type: a #GFileMonitorEvent. - * - * Emitted when a file has been changed. - **/ - signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FILE_MONITOR, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GFileMonitorClass, changed), - NULL, NULL, - _nm_marshal_VOID__OBJECT_OBJECT_ENUM, - G_TYPE_NONE, 3, - G_TYPE_FILE, G_TYPE_FILE, G_TYPE_FILE_MONITOR_EVENT); - - g_object_class_install_property (object_class, - PROP_RATE_LIMIT, - g_param_spec_int ("rate-limit", - "Rate limit", - "The limit of the monitor to watch for changes, in milliseconds", - 0, G_MAXINT, - DEFAULT_RATE_LIMIT_MSECS, - G_PARAM_READWRITE| - G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_CANCELLED, - g_param_spec_boolean ("cancelled", - "Cancelled", - "Whether the monitor has been cancelled", - FALSE, - G_PARAM_READABLE| - G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); -} - -static guint -g_file_hash (GFile *file) -{ - return g_str_hash (g_file_get_const_path (file)); -} - -static gboolean -g_file_equal (GFile *file1, GFile *file2) -{ - return g_str_equal (g_file_get_const_path (file1), g_file_get_const_path (file2)); -} - -static void -g_file_monitor_init (GFileMonitor *monitor) -{ - monitor->priv = G_TYPE_INSTANCE_GET_PRIVATE (monitor, - G_TYPE_FILE_MONITOR, - GFileMonitorPrivate); - monitor->priv->rate_limit_msec = DEFAULT_RATE_LIMIT_MSECS; - monitor->priv->rate_limiter = g_hash_table_new_full ((GHashFunc) g_file_hash, (GEqualFunc) g_file_equal, - NULL, (GDestroyNotify) rate_limiter_free); -} - -/** - * g_file_monitor_is_cancelled: - * @monitor: a #GFileMonitor - * - * Returns whether the monitor is canceled. - * - * Returns: %TRUE if monitor is canceled. %FALSE otherwise. - **/ -gboolean -g_file_monitor_is_cancelled (GFileMonitor *monitor) -{ - gboolean res; - - g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE); - - G_LOCK (cancelled); - res = monitor->priv->cancelled; - G_UNLOCK (cancelled); - - return res; -} - -/** - * g_file_monitor_cancel: - * @monitor: a #GFileMonitor. - * - * Cancels a file monitor. - * - * Returns: %TRUE if monitor was cancelled. - **/ -gboolean -g_file_monitor_cancel (GFileMonitor* monitor) -{ - GFileMonitorClass *klass; - - g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE); - - G_LOCK (cancelled); - if (monitor->priv->cancelled) - { - G_UNLOCK (cancelled); - return TRUE; - } - - monitor->priv->cancelled = TRUE; - G_UNLOCK (cancelled); - - g_object_notify (G_OBJECT (monitor), "cancelled"); - - klass = G_FILE_MONITOR_GET_CLASS (monitor); - return (* klass->cancel) (monitor); -} - -/** - * g_file_monitor_set_rate_limit: - * @monitor: a #GFileMonitor. - * @limit_msecs: a integer with the limit in milliseconds to - * poll for changes. - * - * Sets the rate limit to which the @monitor will report - * consecutive change events to the same file. - * - **/ -void -g_file_monitor_set_rate_limit (GFileMonitor *monitor, - int limit_msecs) -{ - GFileMonitorPrivate *priv; - - g_return_if_fail (G_IS_FILE_MONITOR (monitor)); - - priv = monitor->priv; - if (priv->rate_limit_msec != limit_msecs) - { - monitor->priv->rate_limit_msec = limit_msecs; - g_object_notify (G_OBJECT (monitor), "rate-limit"); - } -} - -typedef struct { - GFileMonitor *monitor; - GFile *child; - GFile *other_file; - GFileMonitorEvent event_type; -} FileChange; - -static gboolean -emit_cb (gpointer data) -{ - FileChange *change = data; - g_signal_emit (change->monitor, signals[CHANGED], 0, - change->child, change->other_file, change->event_type); - return FALSE; -} - -static void -file_change_free (FileChange *change) -{ - g_object_unref (change->monitor); - g_object_unref (change->child); - if (change->other_file) - g_object_unref (change->other_file); - - g_slice_free (FileChange, change); -} - -static void -emit_in_idle (GFileMonitor *monitor, - GFile *child, - GFile *other_file, - GFileMonitorEvent event_type) -{ - GSource *source; - FileChange *change; - - change = g_slice_new (FileChange); - - change->monitor = g_object_ref (monitor); - change->child = g_object_ref (child); - if (other_file) - change->other_file = g_object_ref (other_file); - else - change->other_file = NULL; - change->event_type = event_type; - - source = g_idle_source_new (); - g_source_set_priority (source, 0); - - g_source_set_callback (source, emit_cb, change, (GDestroyNotify)file_change_free); - g_source_attach (source, NULL); - g_source_unref (source); -} - -static guint32 -get_time_msecs (void) -{ - return g_thread_gettime() / (1000 * 1000); -} - -static guint32 -time_difference (guint32 from, guint32 to) -{ - if (from > to) - return 0; - return to - from; -} - -/* Change event rate limiting support: */ - -static RateLimiter * -new_limiter (GFileMonitor *monitor, - GFile *file) -{ - RateLimiter *limiter; - - limiter = g_slice_new0 (RateLimiter); - limiter->file = g_object_ref (file); - g_hash_table_insert (monitor->priv->rate_limiter, file, limiter); - - return limiter; -} - -static void -rate_limiter_send_virtual_changes_done_now (GFileMonitor *monitor, - RateLimiter *limiter) -{ - if (limiter->send_virtual_changes_done_at != 0) - { - emit_in_idle (monitor, limiter->file, NULL, - G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT); - limiter->send_virtual_changes_done_at = 0; - } -} - -static void -rate_limiter_send_delayed_change_now (GFileMonitor *monitor, - RateLimiter *limiter, - guint32 time_now) -{ - if (limiter->send_delayed_change_at != 0) - { - emit_in_idle (monitor, - limiter->file, NULL, - G_FILE_MONITOR_EVENT_CHANGED); - limiter->send_delayed_change_at = 0; - limiter->last_sent_change_time = time_now; - } -} - -typedef struct { - guint32 min_time; - guint32 time_now; - GFileMonitor *monitor; -} ForEachData; - -static gboolean -calc_min_time (GFileMonitor *monitor, - RateLimiter *limiter, - guint32 time_now, - guint32 *min_time) -{ - gboolean delete_me; - guint32 expire_at; - - delete_me = TRUE; - - if (limiter->last_sent_change_time != 0) - { - /* Set a timeout at 2*rate limit so that we can clear out the change from the hash eventualy */ - expire_at = limiter->last_sent_change_time + 2 * monitor->priv->rate_limit_msec; - - if (time_difference (time_now, expire_at) > 0) - { - delete_me = FALSE; - *min_time = MIN (*min_time, - time_difference (time_now, expire_at)); - } - } - - if (limiter->send_delayed_change_at != 0) - { - delete_me = FALSE; - *min_time = MIN (*min_time, - time_difference (time_now, limiter->send_delayed_change_at)); - } - - if (limiter->send_virtual_changes_done_at != 0) - { - delete_me = FALSE; - *min_time = MIN (*min_time, - time_difference (time_now, limiter->send_virtual_changes_done_at)); - } - - return delete_me; -} - -static gboolean -foreach_rate_limiter_fire (gpointer key, - gpointer value, - gpointer user_data) -{ - RateLimiter *limiter = value; - ForEachData *data = user_data; - - if (limiter->send_delayed_change_at != 0 && - time_difference (data->time_now, limiter->send_delayed_change_at) == 0) - rate_limiter_send_delayed_change_now (data->monitor, limiter, data->time_now); - - if (limiter->send_virtual_changes_done_at != 0 && - time_difference (data->time_now, limiter->send_virtual_changes_done_at) == 0) - rate_limiter_send_virtual_changes_done_now (data->monitor, limiter); - - return calc_min_time (data->monitor, limiter, data->time_now, &data->min_time); -} - -static gboolean -rate_limiter_timeout (gpointer timeout_data) -{ - GFileMonitor *monitor = timeout_data; - ForEachData data; - GSource *source; - - data.min_time = G_MAXUINT32; - data.monitor = monitor; - data.time_now = get_time_msecs (); - g_hash_table_foreach_remove (monitor->priv->rate_limiter, - foreach_rate_limiter_fire, - &data); - - /* Remove old timeout */ - if (monitor->priv->timeout) - { - g_source_destroy (monitor->priv->timeout); - g_source_unref (monitor->priv->timeout); - monitor->priv->timeout = NULL; - monitor->priv->timeout_fires_at = 0; - } - - /* Set up new timeout */ - if (data.min_time != G_MAXUINT32) - { - source = g_timeout_source_new (data.min_time + 1); /* + 1 to make sure we've really passed the time */ - g_source_set_callback (source, rate_limiter_timeout, monitor, NULL); - g_source_attach (source, NULL); - - monitor->priv->timeout = source; - monitor->priv->timeout_fires_at = data.time_now + data.min_time; - } - - return FALSE; -} - -static gboolean -foreach_rate_limiter_update (gpointer key, - gpointer value, - gpointer user_data) -{ - RateLimiter *limiter = value; - ForEachData *data = user_data; - - return calc_min_time (data->monitor, limiter, data->time_now, &data->min_time); -} - -static void -update_rate_limiter_timeout (GFileMonitor *monitor, - guint new_time) -{ - ForEachData data; - GSource *source; - - if (monitor->priv->timeout_fires_at != 0 && new_time != 0 && - time_difference (new_time, monitor->priv->timeout_fires_at) == 0) - return; /* Nothing to do, we already fire earlier than that */ - - data.min_time = G_MAXUINT32; - data.monitor = monitor; - data.time_now = get_time_msecs (); - g_hash_table_foreach_remove (monitor->priv->rate_limiter, - foreach_rate_limiter_update, - &data); - - /* Remove old timeout */ - if (monitor->priv->timeout) - { - g_source_destroy (monitor->priv->timeout); - g_source_unref (monitor->priv->timeout); - monitor->priv->timeout_fires_at = 0; - monitor->priv->timeout = NULL; - } - - /* Set up new timeout */ - if (data.min_time != G_MAXUINT32) - { - source = g_timeout_source_new (data.min_time + 1); /* + 1 to make sure we've really passed the time */ - g_source_set_callback (source, rate_limiter_timeout, monitor, NULL); - g_source_attach (source, NULL); - - monitor->priv->timeout = source; - monitor->priv->timeout_fires_at = data.time_now + data.min_time; - } -} - -/** - * g_file_monitor_emit_event: - * @monitor: a #GFileMonitor. - * @child: a #GFile. - * @other_file: a #GFile. - * @event_type: a set of #GFileMonitorEvent flags. - * - * Emits the #GFileMonitor::changed signal if a change - * has taken place. Should be called from file monitor - * implementations only. - * - * The signal will be emitted from an idle handler. - **/ -void -g_file_monitor_emit_event (GFileMonitor *monitor, - GFile *child, - GFile *other_file, - GFileMonitorEvent event_type) -{ - guint32 time_now, since_last; - gboolean emit_now; - RateLimiter *limiter; - - g_return_if_fail (G_IS_FILE_MONITOR (monitor)); - g_return_if_fail (G_IS_FILE (child)); - - limiter = g_hash_table_lookup (monitor->priv->rate_limiter, child); - - if (event_type != G_FILE_MONITOR_EVENT_CHANGED) - { - if (limiter) - { - rate_limiter_send_delayed_change_now (monitor, limiter, get_time_msecs ()); - if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT) - limiter->send_virtual_changes_done_at = 0; - else - rate_limiter_send_virtual_changes_done_now (monitor, limiter); - update_rate_limiter_timeout (monitor, 0); - } - emit_in_idle (monitor, child, other_file, event_type); - } - else - { - /* Changed event, rate limit */ - time_now = get_time_msecs (); - emit_now = TRUE; - - if (limiter) - { - since_last = time_difference (limiter->last_sent_change_time, time_now); - if (since_last < monitor->priv->rate_limit_msec) - { - /* We ignore this change, but arm a timer so that we can fire it later if we - don't get any other events (that kill this timeout) */ - emit_now = FALSE; - if (limiter->send_delayed_change_at == 0) - { - limiter->send_delayed_change_at = time_now + monitor->priv->rate_limit_msec; - update_rate_limiter_timeout (monitor, limiter->send_delayed_change_at); - } - } - } - - if (limiter == NULL) - limiter = new_limiter (monitor, child); - - if (emit_now) - { - emit_in_idle (monitor, child, other_file, event_type); - - limiter->last_sent_change_time = time_now; - limiter->send_delayed_change_at = 0; - /* Set a timeout of 2*rate limit so that we can clear out the change from the hash eventualy */ - update_rate_limiter_timeout (monitor, time_now + 2 * monitor->priv->rate_limit_msec); - } - - /* Schedule a virtual change done. This is removed if we get a real one, and - postponed if we get more change events. */ - - limiter->send_virtual_changes_done_at = time_now + DEFAULT_VIRTUAL_CHANGES_DONE_DELAY_SECS * 1000; - update_rate_limiter_timeout (monitor, limiter->send_virtual_changes_done_at); - } -} - - -GType -g_file_monitor_event_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - { G_FILE_MONITOR_EVENT_CHANGED, "G_FILE_MONITOR_EVENT_CHANGED", "changed" }, - { G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, "G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT", "changes-done-hint" }, - { G_FILE_MONITOR_EVENT_DELETED, "G_FILE_MONITOR_EVENT_DELETED", "deleted" }, - { G_FILE_MONITOR_EVENT_CREATED, "G_FILE_MONITOR_EVENT_CREATED", "created" }, - { G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED, "G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED", "attribute-changed" }, - { G_FILE_MONITOR_EVENT_PRE_UNMOUNT, "G_FILE_MONITOR_EVENT_PRE_UNMOUNT", "pre-unmount" }, - { G_FILE_MONITOR_EVENT_UNMOUNTED, "G_FILE_MONITOR_EVENT_UNMOUNTED", "unmounted" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("GFileMonitorEvent", values); - } - - return etype; -} - diff --git a/gfilemonitor/gfilemonitor.h b/gfilemonitor/gfilemonitor.h deleted file mode 100644 index 68832b7dc..000000000 --- a/gfilemonitor/gfilemonitor.h +++ /dev/null @@ -1,117 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Alexander Larsson - */ - -#ifndef __G_FILE_MONITOR_H__ -#define __G_FILE_MONITOR_H__ - -#include -#include "gfile.h" - -G_BEGIN_DECLS - -#define G_TYPE_FILE_MONITOR (g_file_monitor_get_type ()) -#define G_FILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_MONITOR, GFileMonitor)) -#define G_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_MONITOR, GFileMonitorClass)) -#define G_IS_FILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_MONITOR)) -#define G_IS_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_MONITOR)) -#define G_FILE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_MONITOR, GFileMonitorClass)) - -/** - * GFileMonitorEvent: - * @G_FILE_MONITOR_EVENT_CHANGED: a file changed. - * @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: a hint that this was probably the last change in a set of changes. - * @G_FILE_MONITOR_EVENT_DELETED: a file was deleted. - * @G_FILE_MONITOR_EVENT_CREATED: a file was created. - * @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: a file attribute was changed. - * @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: the file location will soon be unmounted. - * @G_FILE_MONITOR_EVENT_UNMOUNTED: the file location was unmounted. - * - * Specifies what type of event a monitor event is. - **/ -typedef enum { - G_FILE_MONITOR_EVENT_CHANGED, - G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT, - G_FILE_MONITOR_EVENT_DELETED, - G_FILE_MONITOR_EVENT_CREATED, - G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED, - G_FILE_MONITOR_EVENT_PRE_UNMOUNT, - G_FILE_MONITOR_EVENT_UNMOUNTED -} GFileMonitorEvent; - -GType g_file_monitor_event_get_type (void) G_GNUC_CONST; -#define G_TYPE_FILE_MONITOR_EVENT (g_file_monitor_event_get_type ()) - -typedef struct _GFileMonitorClass GFileMonitorClass; -typedef struct _GFileMonitorPrivate GFileMonitorPrivate; - -/** - * GFileMonitor: - * - * Watches for changes to a file. - **/ -struct _GFileMonitor -{ - GObject parent_instance; - - /*< private >*/ - GFileMonitorPrivate *priv; -}; - -struct _GFileMonitorClass -{ - GObjectClass parent_class; - - /* Signals */ - void (* changed) (GFileMonitor* monitor, - GFile* file, - GFile* other_file, - GFileMonitorEvent event_type); - - /* Virtual Table */ - gboolean (*cancel)(GFileMonitor* monitor); - - /*< private >*/ - /* Padding for future expansion */ - void (*_g_reserved1) (void); - void (*_g_reserved2) (void); - void (*_g_reserved3) (void); - void (*_g_reserved4) (void); - void (*_g_reserved5) (void); -}; - -GType g_file_monitor_get_type (void) G_GNUC_CONST; - -gboolean g_file_monitor_cancel (GFileMonitor *monitor); -gboolean g_file_monitor_is_cancelled (GFileMonitor *monitor); -void g_file_monitor_set_rate_limit (GFileMonitor *monitor, - int limit_msecs); - - -/* For implementations */ -void g_file_monitor_emit_event (GFileMonitor *monitor, - GFile *child, - GFile *other_file, - GFileMonitorEvent event_type); - -G_END_DECLS - -#endif /* __G_FILE_MONITOR_H__ */ diff --git a/gfilemonitor/glocaldirectorymonitor.c b/gfilemonitor/glocaldirectorymonitor.c deleted file mode 100644 index 160109379..000000000 --- a/gfilemonitor/glocaldirectorymonitor.c +++ /dev/null @@ -1,258 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Alexander Larsson - */ - -#include -#include -#include - -#include "inotify-helper.h" -#include "glocaldirectorymonitor.h" - -enum -{ - PROP_0, - PROP_DIRNAME -}; - -#if 0 -static gboolean g_local_directory_monitor_cancel (GFileMonitor *monitor); -static void mounts_changed (GUnixMountMonitor *mount_monitor, - gpointer user_data); -#endif - -G_DEFINE_TYPE (GLocalDirectoryMonitor, g_local_directory_monitor, G_TYPE_FILE_MONITOR) - -static void -g_local_directory_monitor_finalize (GObject *object) -{ - GLocalDirectoryMonitor *local_monitor; - local_monitor = G_LOCAL_DIRECTORY_MONITOR (object); - - g_free (local_monitor->dirname); - - _ih_sub_free (local_monitor->sub); - -#if 0 - if (local_monitor->mount_monitor) - { - g_signal_handlers_disconnect_by_func (local_monitor->mount_monitor, mounts_changed, local_monitor); - g_object_unref (local_monitor->mount_monitor); - local_monitor->mount_monitor = NULL; - } -#endif - - if (G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize) - (*G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize) (object); -} - -static void -g_local_directory_monitor_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (property_id) - { - case PROP_DIRNAME: - /* Do nothing */ - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static GObject * -g_local_directory_monitor_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) -{ - GObject *obj; - GLocalDirectoryMonitorClass *klass; - GObjectClass *parent_class; - GLocalDirectoryMonitor *local_monitor; - const gchar *dirname = NULL; - gint i; - - klass = G_LOCAL_DIRECTORY_MONITOR_CLASS (g_type_class_peek (G_TYPE_LOCAL_DIRECTORY_MONITOR)); - parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); - obj = parent_class->constructor (type, - n_construct_properties, - construct_properties); - - local_monitor = G_LOCAL_DIRECTORY_MONITOR (obj); - - for (i = 0; i < n_construct_properties; i++) - { - if (strcmp ("dirname", g_param_spec_get_name (construct_properties[i].pspec)) == 0) - { - if (!G_VALUE_HOLDS_STRING (construct_properties[i].value)) - g_warning ("%s: warning: construct_properties[i].value does not hold a string!", __func__); - dirname = g_value_get_string (construct_properties[i].value); - break; - } - } - - g_assert (dirname); - local_monitor->dirname = g_strdup (dirname); - - local_monitor->sub = _ih_sub_new (local_monitor->dirname, NULL, local_monitor); - g_assert (local_monitor->sub); - g_assert (_ih_sub_add (local_monitor->sub)); - -#if 0 - if (!klass->mount_notify) - { -#ifdef G_OS_WIN32 - g_warning ("G_OS_WIN32: no mount emulation"); -#else - GUnixMountEntry *mount; - - /* Emulate unmount detection */ - - mount = g_unix_mount_at (local_monitor->dirname, NULL); - - local_monitor->was_mounted = mount != NULL; - - if (mount) - g_unix_mount_free (mount); - - local_monitor->mount_monitor = g_unix_mount_monitor_new (); - g_signal_connect_object (local_monitor->mount_monitor, "mounts_changed", - G_CALLBACK (mounts_changed), local_monitor, 0); -#endif - } -#endif - - return obj; -} - -static void -g_local_directory_monitor_class_init (GLocalDirectoryMonitorClass* klass) -{ - GObjectClass* gobject_class = G_OBJECT_CLASS (klass); -#if 0 - GFileMonitorClass *file_monitor_class = G_FILE_MONITOR_CLASS (klass); -#endif - - gobject_class->finalize = g_local_directory_monitor_finalize; - gobject_class->set_property = g_local_directory_monitor_set_property; - gobject_class->constructor = g_local_directory_monitor_constructor; - -#if 0 - file_monitor_class->cancel = g_local_directory_monitor_cancel; -#endif - - g_object_class_install_property (gobject_class, - PROP_DIRNAME, - g_param_spec_string ("dirname", - "Directory name", - "Directory to monitor", - NULL, - G_PARAM_CONSTRUCT_ONLY| - G_PARAM_WRITABLE| - G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); - -#if 0 - klass->mount_notify = FALSE; -#endif -} - -static void -g_local_directory_monitor_init (GLocalDirectoryMonitor *local_monitor) -{ -} - -#if 0 -static void -mounts_changed (GUnixMountMonitor *mount_monitor, - gpointer user_data) -{ - GLocalDirectoryMonitor *local_monitor = user_data; - GUnixMountEntry *mount; - gboolean is_mounted; - GFile *file; - - /* Emulate unmount detection */ -#ifdef G_OS_WIN32 - mount = NULL; - g_warning ("G_OS_WIN32: no mount emulation"); -#else - mount = g_unix_mount_at (local_monitor->dirname, NULL); - - is_mounted = mount != NULL; - - if (mount) - g_unix_mount_free (mount); -#endif - - if (local_monitor->was_mounted != is_mounted) - { - if (local_monitor->was_mounted && !is_mounted) - { - file = g_file_new_for_path (local_monitor->dirname); - g_file_monitor_emit_event (G_FILE_MONITOR (local_monitor), - file, NULL, - G_FILE_MONITOR_EVENT_UNMOUNTED); - g_object_unref (file); - } - local_monitor->was_mounted = is_mounted; - } -} -#endif - -/** - * _g_local_directory_monitor_new: - * @dirname: filename of the directory to monitor. - * @flags: #GFileMonitorFlags. - * - * Returns: new #GFileMonitor for the given @dirname. - **/ -GFileMonitor* -_g_local_directory_monitor_new (const char *dirname, - GFileMonitorFlags flags, - GError **error) -{ - if (!_ih_startup ()) { - g_set_error (error, 0, 0, "inotify is unsupported!!"); - return NULL; - } - return G_FILE_MONITOR (g_object_new (G_TYPE_LOCAL_DIRECTORY_MONITOR, "dirname", dirname, NULL)); -} - -#if 0 -static gboolean -g_local_directory_monitor_cancel (GFileMonitor *monitor) -{ - GLocalDirectoryMonitor *local_monitor = G_LOCAL_DIRECTORY_MONITOR (monitor); - - if (local_monitor->mount_monitor) - { - g_signal_handlers_disconnect_by_func (local_monitor->mount_monitor, mounts_changed, local_monitor); - g_object_unref (local_monitor->mount_monitor); - local_monitor->mount_monitor = NULL; - } - - return TRUE; -} -#endif - diff --git a/gfilemonitor/glocaldirectorymonitor.h b/gfilemonitor/glocaldirectorymonitor.h deleted file mode 100644 index 601fc6907..000000000 --- a/gfilemonitor/glocaldirectorymonitor.h +++ /dev/null @@ -1,71 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Alexander Larsson - */ - -#ifndef __G_LOCAL_DIRECTORY_MONITOR_H__ -#define __G_LOCAL_DIRECTORY_MONITOR_H__ - -#include -#include "gfilemonitor.h" -#include "inotify-sub.h" - -G_BEGIN_DECLS - -#define G_TYPE_LOCAL_DIRECTORY_MONITOR (g_local_directory_monitor_get_type ()) -#define G_LOCAL_DIRECTORY_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_LOCAL_DIRECTORY_MONITOR, GLocalDirectoryMonitor)) -#define G_LOCAL_DIRECTORY_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), G_TYPE_LOCAL_DIRECTORY_MONITOR, GLocalDirectoryMonitorClass)) -#define G_IS_LOCAL_DIRECTORY_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_DIRECTORY_MONITOR)) -#define G_IS_LOCAL_DIRECTORY_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_LOCAL_DIRECTORY_MONITOR)) - -#define G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME "gio-local-directory-monitor" - -typedef struct _GLocalDirectoryMonitor GLocalDirectoryMonitor; -typedef struct _GLocalDirectoryMonitorClass GLocalDirectoryMonitorClass; - -struct _GLocalDirectoryMonitor -{ - GFileMonitor parent_instance; - gchar *dirname; - inotify_sub *sub; -#if 0 - /* For mount emulation */ - GUnixMountMonitor *mount_monitor; - gboolean was_mounted; -#endif -}; - -struct _GLocalDirectoryMonitorClass { - GFileMonitorClass parent_class; -#if 0 - gboolean mount_notify; -#endif - gboolean (*is_supported) (void); -}; - -GType g_local_directory_monitor_get_type (void) G_GNUC_CONST; - -GFileMonitor* _g_local_directory_monitor_new (const char *dirname, - GFileMonitorFlags flags, - GError **error); - -G_END_DECLS - -#endif /* __G_LOCAL_DIRECTORY_MONITOR_H__ */ diff --git a/gfilemonitor/glocalfilemonitor.c b/gfilemonitor/glocalfilemonitor.c deleted file mode 100644 index 4b0cf52ca..000000000 --- a/gfilemonitor/glocalfilemonitor.c +++ /dev/null @@ -1,163 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Alexander Larsson - */ - -#include -#include -#include - -#include "inotify-helper.h" -#include "glocalfilemonitor.h" - -enum -{ - PROP_0, - PROP_FILENAME -}; - -G_DEFINE_TYPE (GLocalFileMonitor, g_local_file_monitor, G_TYPE_FILE_MONITOR) - -static void -g_local_file_monitor_init (GLocalFileMonitor* local_monitor) -{ -} - -static void -g_local_file_monitor_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (property_id) - { - case PROP_FILENAME: - /* Do nothing */ - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static GObject * -g_local_file_monitor_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) -{ - GObject *obj; - GLocalFileMonitorClass *klass; - GObjectClass *parent_class; - GLocalFileMonitor *local_monitor; - const gchar *filename = NULL; - gchar *dname, *fname; - gint i; - - klass = G_LOCAL_FILE_MONITOR_CLASS (g_type_class_peek (G_TYPE_LOCAL_FILE_MONITOR)); - parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); - obj = parent_class->constructor (type, - n_construct_properties, - construct_properties); - - local_monitor = G_LOCAL_FILE_MONITOR (obj); - - for (i = 0; i < n_construct_properties; i++) - { - if (strcmp ("filename", g_param_spec_get_name (construct_properties[i].pspec)) == 0) - { - if (!G_VALUE_HOLDS_STRING (construct_properties[i].value)) - g_warning ("%s: warning: construct_properties[i].value does not hold a string!", __func__); - filename = g_value_get_string (construct_properties[i].value); - break; - } - } - - if (filename == NULL) - g_warning ("%s: warning: filename was NULL", __func__); - - local_monitor->filename = g_strdup (filename); - - fname = g_path_get_basename (filename); - dname = g_path_get_dirname (filename); - - local_monitor->sub = _ih_sub_new (dname, fname, local_monitor); - g_free (fname); - g_free (dname); - - g_assert (local_monitor->sub); - g_assert (_ih_sub_add (local_monitor->sub)); - - return obj; -} - -static void -g_local_file_monitor_finalize (GObject *object) -{ - GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (object); - if (local_monitor->filename) - { - g_free (local_monitor->filename); - local_monitor->filename = NULL; - } - - _ih_sub_free (local_monitor->sub); - - if (G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize) - (*G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize) (object); -} - -static void g_local_file_monitor_class_init (GLocalFileMonitorClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->set_property = g_local_file_monitor_set_property; - gobject_class->finalize = g_local_file_monitor_finalize; - gobject_class->constructor = g_local_file_monitor_constructor; - - g_object_class_install_property (gobject_class, - PROP_FILENAME, - g_param_spec_string ("filename", - "File name", - "File name to monitor", - NULL, - G_PARAM_CONSTRUCT_ONLY| - G_PARAM_WRITABLE| - G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); -} - -/** - * g_local_file_monitor_new: - * @pathname: path name to monitor. - * @flags: #GFileMonitorFlags. - * - * Returns: a new #GFileMonitor for the given @pathname. - **/ -GFileMonitor* -_g_local_file_monitor_new (const char *pathname, - GFileMonitorFlags flags, - GError **error) -{ - if (!_ih_startup ()) { - g_set_error (error, 0, 0, "inotify is unsupported!!"); - return NULL; - } - return G_FILE_MONITOR (g_object_new (G_TYPE_LOCAL_FILE_MONITOR, "filename", pathname, NULL)); -} - diff --git a/gfilemonitor/glocalfilemonitor.h b/gfilemonitor/glocalfilemonitor.h deleted file mode 100644 index f041e9ad7..000000000 --- a/gfilemonitor/glocalfilemonitor.h +++ /dev/null @@ -1,63 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - * Author: Alexander Larsson - */ - -#ifndef __G_LOCAL_FILE_MONITOR_H__ -#define __G_LOCAL_FILE_MONITOR_H__ - -#include -#include "gfilemonitor.h" -#include "inotify-sub.h" - -G_BEGIN_DECLS - -#define G_TYPE_LOCAL_FILE_MONITOR (g_local_file_monitor_get_type ()) -#define G_LOCAL_FILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_LOCAL_FILE_MONITOR, GLocalFileMonitor)) -#define G_LOCAL_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), G_TYPE_LOCAL_FILE_MONITOR, GLocalFileMonitorClass)) -#define G_IS_LOCAL_FILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_LOCAL_FILE_MONITOR)) -#define G_IS_LOCAL_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_LOCAL_FILE_MONITOR)) - -#define G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME "gio-local-file-monitor" - -typedef struct _GLocalFileMonitor GLocalFileMonitor; -typedef struct _GLocalFileMonitorClass GLocalFileMonitorClass; - -struct _GLocalFileMonitor -{ - GFileMonitor parent_instance; - gchar *filename; - inotify_sub *sub; -}; - -struct _GLocalFileMonitorClass { - GFileMonitorClass parent_class; - gboolean (*is_supported) (void); -}; - -GType g_local_file_monitor_get_type (void) G_GNUC_CONST; - -GFileMonitor* _g_local_file_monitor_new (const char *pathname, - GFileMonitorFlags flags, - GError **error); - -G_END_DECLS - -#endif /* __G_LOCAL_FILE_MONITOR_H__ */ diff --git a/gfilemonitor/inotify-diag.c b/gfilemonitor/inotify-diag.c deleted file mode 100644 index 494eee07c..000000000 --- a/gfilemonitor/inotify-diag.c +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */ - -/* inotify-helper.c - Gnome VFS Monitor based on inotify. - - Copyright (C) 2005 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors: - John McCutchan -*/ - -#include "config.h" -#include -#include -#include -#include "inotify-missing.h" -#include "inotify-path.h" -#include "inotify-diag.h" - -#define DIAG_DUMP_TIME 20000 /* 20 seconds */ - -G_LOCK_EXTERN (inotify_lock); - -static gboolean -id_dump (gpointer userdata) -{ - GIOChannel *ioc; - pid_t pid; - char *fname; - G_LOCK (inotify_lock); - ioc = NULL; - pid = getpid (); - - fname = g_strdup_printf ("/tmp/gvfsid.%d", pid); - ioc = g_io_channel_new_file (fname, "w", NULL); - g_free (fname); - - if (!ioc) - { - G_UNLOCK (inotify_lock); - return TRUE; - } - - _im_diag_dump (ioc); - - g_io_channel_shutdown (ioc, TRUE, NULL); - g_io_channel_unref (ioc); - - G_UNLOCK (inotify_lock); - return TRUE; -} - -void -_id_startup (void) -{ - if (!g_getenv ("GVFS_INOTIFY_DIAG")) - return; - - g_timeout_add (DIAG_DUMP_TIME, id_dump, NULL); -} diff --git a/gfilemonitor/inotify-diag.h b/gfilemonitor/inotify-diag.h deleted file mode 100644 index 883790742..000000000 --- a/gfilemonitor/inotify-diag.h +++ /dev/null @@ -1,29 +0,0 @@ -/* inotify-helper.h - GNOME VFS Monitor using inotify - - Copyright (C) 2006 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Author: John McCutchan -*/ - - -#ifndef __INOTIFY_DIAG_H -#define __INOTIFY_DIAG_H - -void _id_startup (void); - -#endif /* __INOTIFY_DIAG_H */ diff --git a/gfilemonitor/inotify-helper.c b/gfilemonitor/inotify-helper.c deleted file mode 100644 index 29a7e5130..000000000 --- a/gfilemonitor/inotify-helper.c +++ /dev/null @@ -1,234 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */ - -/* inotify-helper.c - GVFS Monitor based on inotify. - - Copyright (C) 2007 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors: - John McCutchan -*/ - -#include "config.h" -#include -#include -#include -#include -/* Just include the local header to stop all the pain */ -#include -#include "gfilemonitor.h" -#include "inotify-helper.h" -#include "inotify-missing.h" -#include "inotify-path.h" -#include "inotify-diag.h" - - -static gboolean ih_debug_enabled = FALSE; -#define IH_W if (ih_debug_enabled) g_warning - -static void ih_event_callback (ik_event_t *event, inotify_sub *sub); -static void ih_not_missing_callback (inotify_sub *sub); - -/* We share this lock with inotify-kernel.c and inotify-missing.c - * - * inotify-kernel.c takes the lock when it reads events from - * the kernel and when it processes those events - * - * inotify-missing.c takes the lock when it is scanning the missing - * list. - * - * We take the lock in all public functions - */ -G_GNUC_INTERNAL G_LOCK_DEFINE (inotify_lock); - -static GFileMonitorEvent ih_mask_to_EventFlags (guint32 mask); - -/** - * _ih_startup: - * - * Initializes the inotify backend. This must be called before - * any other functions in this module. - * - * Return value: #TRUE if initialization succeeded, #FALSE otherwise - */ -gboolean -_ih_startup (void) -{ - static gboolean initialized = FALSE; - static gboolean result = FALSE; - - G_LOCK (inotify_lock); - - if (initialized == TRUE) - { - G_UNLOCK (inotify_lock); - return result; - } - - result = _ip_startup (ih_event_callback); - if (!result) - { - g_warning ("Could not initialize inotify\n"); - G_UNLOCK (inotify_lock); - return FALSE; - } - _im_startup (ih_not_missing_callback); - _id_startup (); - - IH_W ("started gvfs inotify backend\n"); - - initialized = TRUE; - - G_UNLOCK (inotify_lock); - - return TRUE; -} - -/** - * Adds a subscription to be monitored. - */ -gboolean -_ih_sub_add (inotify_sub *sub) -{ - G_LOCK (inotify_lock); - - if (!_ip_start_watching (sub)) - _im_add (sub); - - G_UNLOCK (inotify_lock); - return TRUE; -} - -/** - * Cancels a subscription which was being monitored. - */ -gboolean -_ih_sub_cancel (inotify_sub *sub) -{ - G_LOCK (inotify_lock); - - if (!sub->cancelled) - { - IH_W ("cancelling %s\n", sub->dirname); - sub->cancelled = TRUE; - _im_rm (sub); - _ip_stop_watching (sub); - } - - G_UNLOCK (inotify_lock); - - return TRUE; -} - - -static void -ih_event_callback (ik_event_t *event, - inotify_sub *sub) -{ - gchar *fullpath; - GFileMonitorEvent eflags; - GFile* parent; - GFile* child; - - eflags = ih_mask_to_EventFlags (event->mask); - parent = g_file_new_for_path (sub->dirname); - if (event->name) - fullpath = g_strdup_printf ("%s/%s", sub->dirname, event->name); - else - fullpath = g_strdup_printf ("%s/", sub->dirname); - - child = g_file_new_for_path (fullpath); - g_free (fullpath); - - g_file_monitor_emit_event (G_FILE_MONITOR (sub->user_data), - child, NULL, eflags); - - g_object_unref (child); - g_object_unref (parent); -} - -static void -ih_not_missing_callback (inotify_sub *sub) -{ - gchar *fullpath; - GFileMonitorEvent eflags; - guint32 mask; - GFile* parent; - GFile* child; - - parent = g_file_new_for_path (sub->dirname); - - if (sub->filename) - { - fullpath = g_strdup_printf ("%s/%s", sub->dirname, sub->filename); - g_warning ("Missing callback called fullpath = %s\n", fullpath); - if (!g_file_test (fullpath, G_FILE_TEST_EXISTS)) - { - g_free (fullpath); - return; - } - mask = IN_CREATE; - } - else - { - fullpath = g_strdup_printf ("%s", sub->dirname); - mask = IN_CREATE|IN_ISDIR; - } - - eflags = ih_mask_to_EventFlags (mask); - child = g_file_new_for_path (fullpath); - g_free (fullpath); - - g_file_monitor_emit_event (G_FILE_MONITOR (sub->user_data), - child, NULL, eflags); - - g_object_unref (child); - g_object_unref (parent); -} - -/* Transforms a inotify event to a GVFS event. */ -static GFileMonitorEvent -ih_mask_to_EventFlags (guint32 mask) -{ - mask &= ~IN_ISDIR; - switch (mask) - { - case IN_MODIFY: - return G_FILE_MONITOR_EVENT_CHANGED; - case IN_CLOSE_WRITE: - return G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT; - case IN_ATTRIB: - return G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED; - case IN_MOVE_SELF: - case IN_MOVED_FROM: - case IN_DELETE: - case IN_DELETE_SELF: - return G_FILE_MONITOR_EVENT_DELETED; - case IN_CREATE: - case IN_MOVED_TO: - return G_FILE_MONITOR_EVENT_CREATED; - case IN_UNMOUNT: - return G_FILE_MONITOR_EVENT_UNMOUNTED; - case IN_Q_OVERFLOW: - case IN_OPEN: - case IN_CLOSE_NOWRITE: - case IN_ACCESS: - case IN_IGNORED: - default: - return -1; - } -} diff --git a/gfilemonitor/inotify-helper.h b/gfilemonitor/inotify-helper.h deleted file mode 100644 index 8ccf097b6..000000000 --- a/gfilemonitor/inotify-helper.h +++ /dev/null @@ -1,33 +0,0 @@ -/* inotify-helper.h - GVFS Directory Monitor using inotify - - Copyright (C) 2007 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Author: John McCutchan -*/ - - -#ifndef __INOTIFY_HELPER_H -#define __INOTIFY_HELPER_H - -#include "inotify-sub.h" - -gboolean _ih_startup (void); -gboolean _ih_sub_add (inotify_sub *sub); -gboolean _ih_sub_cancel (inotify_sub *sub); - -#endif /* __INOTIFY_HELPER_H */ diff --git a/gfilemonitor/inotify-kernel.c b/gfilemonitor/inotify-kernel.c deleted file mode 100644 index fbf9a0076..000000000 --- a/gfilemonitor/inotify-kernel.c +++ /dev/null @@ -1,673 +0,0 @@ -/* - Copyright (C) 2005 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors:. - John McCutchan -*/ - -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include "inotify-kernel.h" -#include - -/* Timings for pairing MOVED_TO / MOVED_FROM events */ -#define PROCESS_EVENTS_TIME 1000 /* milliseconds (1 hz) */ -#define DEFAULT_HOLD_UNTIL_TIME 0 /* 0 millisecond */ -#define MOVE_HOLD_UNTIL_TIME 0 /* 0 milliseconds */ - -static int inotify_instance_fd = -1; -static GQueue *events_to_process = NULL; -static GQueue *event_queue = NULL; -static GHashTable * cookie_hash = NULL; -static GIOChannel *inotify_read_ioc; -static GPollFD ik_poll_fd; -static gboolean ik_poll_fd_enabled = TRUE; -static void (*user_cb)(ik_event_t *event); - -static gboolean ik_read_callback (gpointer user_data); -static gboolean ik_process_eq_callback (gpointer user_data); - -static guint32 ik_move_matches = 0; -static guint32 ik_move_misses = 0; - -static gboolean process_eq_running = FALSE; - -/* We use the lock from inotify-helper.c - * - * There are two places that we take this lock - * - * 1) In ik_read_callback - * - * 2) ik_process_eq_callback. - * - * - * The rest of locking is taken care of in inotify-helper.c - */ -G_LOCK_EXTERN (inotify_lock); - -typedef struct ik_event_internal { - ik_event_t *event; - gboolean seen; - gboolean sent; - GTimeVal hold_until; - struct ik_event_internal *pair; -} ik_event_internal_t; - -/* In order to perform non-sleeping inotify event chunking we need - * a custom GSource - */ -static gboolean -ik_source_prepare (GSource *source, - gint *timeout) -{ - return FALSE; -} - -static gboolean -ik_source_timeout (gpointer data) -{ - GSource *source = (GSource *)data; - - /* Re-active the PollFD */ - g_source_add_poll (source, &ik_poll_fd); - g_source_unref (source); - ik_poll_fd_enabled = TRUE; - - return FALSE; -} - -#define MAX_PENDING_COUNT 2 -#define PENDING_THRESHOLD(qsize) ((qsize) >> 1) -#define PENDING_MARGINAL_COST(p) ((unsigned int)(1 << (p))) -#define MAX_QUEUED_EVENTS 2048 -#define AVERAGE_EVENT_SIZE sizeof (struct inotify_event) + 16 -#define TIMEOUT_MILLISECONDS 10 - -static gboolean -ik_source_check (GSource *source) -{ - static int prev_pending = 0, pending_count = 0; - - /* We already disabled the PollFD or - * nothing to be read from inotify */ - if (!ik_poll_fd_enabled || !(ik_poll_fd.revents & G_IO_IN)) - return FALSE; - - if (pending_count < MAX_PENDING_COUNT) - { - unsigned int pending; - - if (ioctl (inotify_instance_fd, FIONREAD, &pending) == -1) - goto do_read; - - pending /= AVERAGE_EVENT_SIZE; - - /* Don't wait if the number of pending events is too close - * to the maximum queue size. - */ - if (pending > PENDING_THRESHOLD (MAX_QUEUED_EVENTS)) - goto do_read; - - /* With each successive iteration, the minimum rate for - * further sleep doubles. - */ - if (pending-prev_pending < PENDING_MARGINAL_COST (pending_count)) - goto do_read; - - prev_pending = pending; - pending_count++; - - /* We are going to wait to read the events: */ - - /* Remove the PollFD from the source */ - g_source_remove_poll (source, &ik_poll_fd); - /* To avoid threading issues we need to flag that we've done that */ - ik_poll_fd_enabled = FALSE; - /* Set a timeout to re-add the PollFD to the source */ - g_source_ref (source); - g_timeout_add (TIMEOUT_MILLISECONDS, ik_source_timeout, source); - - return FALSE; - } - -do_read: - /* We are ready to read events from inotify */ - - prev_pending = 0; - pending_count = 0; - - return TRUE; -} - -static gboolean -ik_source_dispatch (GSource *source, - GSourceFunc callback, - gpointer user_data) -{ - if (callback) - return callback (user_data); - return TRUE; -} - -static GSourceFuncs ik_source_funcs = -{ - ik_source_prepare, - ik_source_check, - ik_source_dispatch, - NULL -}; - -gboolean _ik_startup (void (*cb)(ik_event_t *event)) -{ - static gboolean initialized = FALSE; - GSource *source; - - user_cb = cb; - /* Ignore multi-calls */ - if (initialized) - return inotify_instance_fd >= 0; - - initialized = TRUE; - inotify_instance_fd = inotify_init (); - - if (inotify_instance_fd < 0) - return FALSE; - - inotify_read_ioc = g_io_channel_unix_new (inotify_instance_fd); - ik_poll_fd.fd = inotify_instance_fd; - ik_poll_fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR; - g_io_channel_set_encoding (inotify_read_ioc, NULL, NULL); - g_io_channel_set_flags (inotify_read_ioc, G_IO_FLAG_NONBLOCK, NULL); - - source = g_source_new (&ik_source_funcs, sizeof (GSource)); - g_source_add_poll (source, &ik_poll_fd); - g_source_set_callback (source, ik_read_callback, NULL, NULL); - g_source_attach (source, NULL); - g_source_unref (source); - - cookie_hash = g_hash_table_new (g_direct_hash, g_direct_equal); - event_queue = g_queue_new (); - events_to_process = g_queue_new (); - - return TRUE; -} - -static ik_event_internal_t * -ik_event_internal_new (ik_event_t *event) -{ - ik_event_internal_t *internal_event = g_new0 (ik_event_internal_t, 1); - GTimeVal tv; - - g_assert (event); - - g_get_current_time (&tv); - g_time_val_add (&tv, DEFAULT_HOLD_UNTIL_TIME); - internal_event->event = event; - internal_event->hold_until = tv; - - return internal_event; -} - -static ik_event_t * -ik_event_new (char *buffer) -{ - struct inotify_event *kevent = (struct inotify_event *)buffer; - ik_event_t *event = g_new0 (ik_event_t, 1); - - g_assert (buffer); - - event->wd = kevent->wd; - event->mask = kevent->mask; - event->cookie = kevent->cookie; - event->len = kevent->len; - if (event->len) - event->name = g_strdup (kevent->name); - else - event->name = g_strdup (""); - - return event; -} - -ik_event_t * -_ik_event_new_dummy (const char *name, - gint32 wd, - guint32 mask) -{ - ik_event_t *event = g_new0 (ik_event_t, 1); - event->wd = wd; - event->mask = mask; - event->cookie = 0; - if (name) - event->name = g_strdup (name); - else - event->name = g_strdup(""); - - event->len = strlen (event->name); - - return event; -} - -void -_ik_event_free (ik_event_t *event) -{ - if (event->pair) - _ik_event_free (event->pair); - g_free (event->name); - g_free (event); -} - -gint32 -_ik_watch (const char *path, - guint32 mask, - int *err) -{ - gint32 wd = -1; - - g_assert (path != NULL); - g_assert (inotify_instance_fd >= 0); - - wd = inotify_add_watch (inotify_instance_fd, path, mask); - - if (wd < 0) - { - int e = errno; - /* FIXME: debug msg failed to add watch */ - if (err) - *err = e; - return wd; - } - - g_assert (wd >= 0); - return wd; -} - -int -_ik_ignore (const char *path, - gint32 wd) -{ - g_assert (wd >= 0); - g_assert (inotify_instance_fd >= 0); - - if (inotify_rm_watch (inotify_instance_fd, wd) < 0) - { - /* int e = errno; */ - /* failed to rm watch */ - return -1; - } - - return 0; -} - -void -_ik_move_stats (guint32 *matches, - guint32 *misses) -{ - if (matches) - *matches = ik_move_matches; - - if (misses) - *misses = ik_move_misses; -} - -const char * -_ik_mask_to_string (guint32 mask) -{ - gboolean is_dir = mask & IN_ISDIR; - mask &= ~IN_ISDIR; - - if (is_dir) - { - switch (mask) - { - case IN_ACCESS: - return "ACCESS (dir)"; - case IN_MODIFY: - return "MODIFY (dir)"; - case IN_ATTRIB: - return "ATTRIB (dir)"; - case IN_CLOSE_WRITE: - return "CLOSE_WRITE (dir)"; - case IN_CLOSE_NOWRITE: - return "CLOSE_NOWRITE (dir)"; - case IN_OPEN: - return "OPEN (dir)"; - case IN_MOVED_FROM: - return "MOVED_FROM (dir)"; - case IN_MOVED_TO: - return "MOVED_TO (dir)"; - case IN_DELETE: - return "DELETE (dir)"; - case IN_CREATE: - return "CREATE (dir)"; - case IN_DELETE_SELF: - return "DELETE_SELF (dir)"; - case IN_UNMOUNT: - return "UNMOUNT (dir)"; - case IN_Q_OVERFLOW: - return "Q_OVERFLOW (dir)"; - case IN_IGNORED: - return "IGNORED (dir)"; - default: - return "UNKNOWN_EVENT (dir)"; - } - } - else - { - switch (mask) - { - case IN_ACCESS: - return "ACCESS"; - case IN_MODIFY: - return "MODIFY"; - case IN_ATTRIB: - return "ATTRIB"; - case IN_CLOSE_WRITE: - return "CLOSE_WRITE"; - case IN_CLOSE_NOWRITE: - return "CLOSE_NOWRITE"; - case IN_OPEN: - return "OPEN"; - case IN_MOVED_FROM: - return "MOVED_FROM"; - case IN_MOVED_TO: - return "MOVED_TO"; - case IN_DELETE: - return "DELETE"; - case IN_CREATE: - return "CREATE"; - case IN_DELETE_SELF: - return "DELETE_SELF"; - case IN_UNMOUNT: - return "UNMOUNT"; - case IN_Q_OVERFLOW: - return "Q_OVERFLOW"; - case IN_IGNORED: - return "IGNORED"; - default: - return "UNKNOWN_EVENT"; - } - } -} - - -static void -ik_read_events (gsize *buffer_size_out, - gchar **buffer_out) -{ - static gchar *buffer = NULL; - static gsize buffer_size; - - /* Initialize the buffer on our first call */ - if (buffer == NULL) - { - buffer_size = AVERAGE_EVENT_SIZE; - buffer_size *= MAX_QUEUED_EVENTS; - buffer = g_malloc (buffer_size); - } - - *buffer_size_out = 0; - *buffer_out = NULL; - - memset (buffer, 0, buffer_size); - - if (g_io_channel_read_chars (inotify_read_ioc, (char *)buffer, buffer_size, buffer_size_out, NULL) != G_IO_STATUS_NORMAL) { - /* error reading */ - } - *buffer_out = buffer; -} - -static gboolean -ik_read_callback (gpointer user_data) -{ - gchar *buffer; - gsize buffer_size, buffer_i, events; - - G_LOCK (inotify_lock); - ik_read_events (&buffer_size, &buffer); - - buffer_i = 0; - events = 0; - while (buffer_i < buffer_size) - { - struct inotify_event *event; - gsize event_size; - event = (struct inotify_event *)&buffer[buffer_i]; - event_size = sizeof(struct inotify_event) + event->len; - g_queue_push_tail (events_to_process, ik_event_internal_new (ik_event_new (&buffer[buffer_i]))); - buffer_i += event_size; - events++; - } - - /* If the event process callback is off, turn it back on */ - if (!process_eq_running && events) - { - process_eq_running = TRUE; - g_timeout_add (PROCESS_EVENTS_TIME, ik_process_eq_callback, NULL); - } - - G_UNLOCK (inotify_lock); - - return TRUE; -} - -static gboolean -g_timeval_lt (GTimeVal *val1, - GTimeVal *val2) -{ - if (val1->tv_sec < val2->tv_sec) - return TRUE; - - if (val1->tv_sec > val2->tv_sec) - return FALSE; - - /* val1->tv_sec == val2->tv_sec */ - if (val1->tv_usec < val2->tv_usec) - return TRUE; - - return FALSE; -} - -static gboolean -g_timeval_eq (GTimeVal *val1, - GTimeVal *val2) -{ - return (val1->tv_sec == val2->tv_sec) && (val1->tv_usec == val2->tv_usec); -} - -static void -ik_pair_events (ik_event_internal_t *event1, - ik_event_internal_t *event2) -{ - g_assert (event1 && event2); - /* We should only be pairing events that have the same cookie */ - g_assert (event1->event->cookie == event2->event->cookie); - /* We shouldn't pair an event that already is paired */ - g_assert (event1->pair == NULL && event2->pair == NULL); - - /* Pair the internal structures and the ik_event_t structures */ - event1->pair = event2; - event1->event->pair = event2->event; - - if (g_timeval_lt (&event1->hold_until, &event2->hold_until)) - event1->hold_until = event2->hold_until; - - event2->hold_until = event1->hold_until; -} - -static void -ik_event_add_microseconds (ik_event_internal_t *event, - glong ms) -{ - g_assert (event); - g_time_val_add (&event->hold_until, ms); -} - -static gboolean -ik_event_ready (ik_event_internal_t *event) -{ - GTimeVal tv; - g_assert (event); - - g_get_current_time (&tv); - - /* An event is ready if, - * - * it has no cookie -- there is nothing to be gained by holding it - * or, it is already paired -- we don't need to hold it anymore - * or, we have held it long enough - */ - return - event->event->cookie == 0 || - event->pair != NULL || - g_timeval_lt (&event->hold_until, &tv) || - g_timeval_eq (&event->hold_until, &tv); -} - -static void -ik_pair_moves (gpointer data, - gpointer user_data) -{ - ik_event_internal_t *event = (ik_event_internal_t *)data; - - if (event->seen == TRUE || event->sent == TRUE) - return; - - if (event->event->cookie != 0) - { - /* When we get a MOVED_FROM event we delay sending the event by - * MOVE_HOLD_UNTIL_TIME microseconds. We need to do this because a - * MOVED_TO pair _might_ be coming in the near future */ - if (event->event->mask & IN_MOVED_FROM) - { - g_hash_table_insert (cookie_hash, GINT_TO_POINTER (event->event->cookie), event); - /* because we don't deliver move events there is no point in waiting for the match right now. */ - ik_event_add_microseconds (event, MOVE_HOLD_UNTIL_TIME); - } - else if (event->event->mask & IN_MOVED_TO) - { - /* We need to check if we are waiting for this MOVED_TO events cookie to pair it with - * a MOVED_FROM */ - ik_event_internal_t *match = NULL; - match = g_hash_table_lookup (cookie_hash, GINT_TO_POINTER (event->event->cookie)); - if (match) - { - g_hash_table_remove (cookie_hash, GINT_TO_POINTER (event->event->cookie)); - ik_pair_events (match, event); - } - } - } - event->seen = TRUE; -} - -static void -ik_process_events (void) -{ - g_queue_foreach (events_to_process, ik_pair_moves, NULL); - - while (!g_queue_is_empty (events_to_process)) - { - ik_event_internal_t *event = g_queue_peek_head (events_to_process); - - /* This must have been sent as part of a MOVED_TO/MOVED_FROM */ - if (event->sent) - { - /* Pop event */ - g_queue_pop_head (events_to_process); - /* Free the internal event structure */ - g_free (event); - continue; - } - - /* The event isn't ready yet */ - if (!ik_event_ready (event)) - break; - - /* Pop it */ - event = g_queue_pop_head (events_to_process); - - /* Check if this is a MOVED_FROM that is also sitting in the cookie_hash */ - if (event->event->cookie && event->pair == NULL && - g_hash_table_lookup (cookie_hash, GINT_TO_POINTER (event->event->cookie))) - g_hash_table_remove (cookie_hash, GINT_TO_POINTER (event->event->cookie)); - - if (event->pair) - { - /* We send out paired MOVED_FROM/MOVED_TO events in the same event buffer */ - /* g_assert (event->event->mask == IN_MOVED_FROM && event->pair->event->mask == IN_MOVED_TO); */ - /* Copy the paired data */ - event->pair->sent = TRUE; - event->sent = TRUE; - ik_move_matches++; - } - else if (event->event->cookie) - { - /* If we couldn't pair a MOVED_FROM and MOVED_TO together, we change - * the event masks */ - /* Changeing MOVED_FROM to DELETE and MOVED_TO to create lets us make - * the gaurantee that you will never see a non-matched MOVE event */ - - if (event->event->mask & IN_MOVED_FROM) - { - event->event->mask = IN_DELETE|(event->event->mask & IN_ISDIR); - ik_move_misses++; /* not super accurate, if we aren't watching the destination it still counts as a miss */ - } - if (event->event->mask & IN_MOVED_TO) - event->event->mask = IN_CREATE|(event->event->mask & IN_ISDIR); - } - - /* Push the ik_event_t onto the event queue */ - g_queue_push_tail (event_queue, event->event); - /* Free the internal event structure */ - g_free (event); - } -} - -static gboolean -ik_process_eq_callback (gpointer user_data) -{ - gboolean res; - - /* Try and move as many events to the event queue */ - G_LOCK (inotify_lock); - ik_process_events (); - - while (!g_queue_is_empty (event_queue)) - { - ik_event_t *event = g_queue_pop_head (event_queue); - - user_cb (event); - } - - res = TRUE; - - if (g_queue_get_length (events_to_process) == 0) - { - process_eq_running = FALSE; - res = FALSE; - } - - G_UNLOCK (inotify_lock); - - return res; -} diff --git a/gfilemonitor/inotify-kernel.h b/gfilemonitor/inotify-kernel.h deleted file mode 100644 index 8baca3f73..000000000 --- a/gfilemonitor/inotify-kernel.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - Copyright (C) 2005 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors:. - John McCutchan -*/ - -#ifndef __INOTIFY_KERNEL_H -#define __INOTIFY_KERNEL_H - -typedef struct ik_event_s { - gint32 wd; - guint32 mask; - guint32 cookie; - guint32 len; - char * name; - struct ik_event_s *pair; -} ik_event_t; - -gboolean _ik_startup (void (*cb) (ik_event_t *event)); - -ik_event_t *_ik_event_new_dummy (const char *name, - gint32 wd, - guint32 mask); -void _ik_event_free (ik_event_t *event); - -gint32 _ik_watch (const char *path, - guint32 mask, - int *err); -int _ik_ignore (const char *path, - gint32 wd); - - -/* The miss count will probably be enflated */ -void _ik_move_stats (guint32 *matches, - guint32 *misses); -const char *_ik_mask_to_string (guint32 mask); - - -#endif diff --git a/gfilemonitor/inotify-missing.c b/gfilemonitor/inotify-missing.c deleted file mode 100644 index 13b3d5020..000000000 --- a/gfilemonitor/inotify-missing.c +++ /dev/null @@ -1,171 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */ - -/* inotify-helper.c - Gnome VFS Monitor based on inotify. - - Copyright (C) 2005 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors: - John McCutchan -*/ - -#include "config.h" -#include -#include "inotify-missing.h" -#include "inotify-path.h" - -#define SCAN_MISSING_TIME 4 /* 1/4 Hz */ - -static gboolean im_debug_enabled = FALSE; -#define IM_W if (im_debug_enabled) g_warning - -/* We put inotify_sub's that are missing on this list */ -static GList *missing_sub_list = NULL; -static gboolean im_scan_missing (gpointer user_data); -static gboolean scan_missing_running = FALSE; -static void (*missing_cb)(inotify_sub *sub) = NULL; - -G_LOCK_EXTERN (inotify_lock); - -/* inotify_lock must be held before calling */ -void -_im_startup (void (*callback)(inotify_sub *sub)) -{ - static gboolean initialized = FALSE; - - if (!initialized) - { - missing_cb = callback; - initialized = TRUE; - } -} - -/* inotify_lock must be held before calling */ -void -_im_add (inotify_sub *sub) -{ - if (g_list_find (missing_sub_list, sub)) - { - IM_W ("asked to add %s to missing list but it's already on the list!\n", sub->dirname); - return; - } - - IM_W ("adding %s to missing list\n", sub->dirname); - missing_sub_list = g_list_prepend (missing_sub_list, sub); - - /* If the timeout is turned off, we turn it back on */ - if (!scan_missing_running) - { - scan_missing_running = TRUE; -#if !GLIB_CHECK_VERSION(2,14,0) - g_timeout_add (SCAN_MISSING_TIME * G_USEC_PER_SEC, im_scan_missing, NULL); -#else - g_timeout_add_seconds (SCAN_MISSING_TIME, im_scan_missing, NULL); -#endif - } -} - -/* inotify_lock must be held before calling */ -void -_im_rm (inotify_sub *sub) -{ - GList *link; - - link = g_list_find (missing_sub_list, sub); - - if (!link) - { - IM_W ("asked to remove %s from missing list but it isn't on the list!\n", sub->dirname); - return; - } - - IM_W ("removing %s from missing list\n", sub->dirname); - - missing_sub_list = g_list_remove_link (missing_sub_list, link); - g_list_free_1 (link); -} - -/* Scans the list of missing subscriptions checking if they - * are available yet. - */ -static gboolean -im_scan_missing (gpointer user_data) -{ - GList *nolonger_missing = NULL; - GList *l; - - G_LOCK (inotify_lock); - - IM_W ("scanning missing list with %d items\n", g_list_length (missing_sub_list)); - for (l = missing_sub_list; l; l = l->next) - { - inotify_sub *sub = l->data; - gboolean not_m = FALSE; - - IM_W ("checking %p\n", sub); - g_assert (sub); - g_assert (sub->dirname); - not_m = _ip_start_watching (sub); - - if (not_m) - { - missing_cb (sub); - IM_W ("removed %s from missing list\n", sub->dirname); - /* We have to build a list of list nodes to remove from the - * missing_sub_list. We do the removal outside of this loop. - */ - nolonger_missing = g_list_prepend (nolonger_missing, l); - } - } - - for (l = nolonger_missing; l ; l = l->next) - { - GList *llink = l->data; - missing_sub_list = g_list_remove_link (missing_sub_list, llink); - g_list_free_1 (llink); - } - - g_list_free (nolonger_missing); - - /* If the missing list is now empty, we disable the timeout */ - if (missing_sub_list == NULL) - { - scan_missing_running = FALSE; - G_UNLOCK (inotify_lock); - return FALSE; - } - else - { - G_UNLOCK (inotify_lock); - return TRUE; - } -} - - -/* inotify_lock must be held */ -void -_im_diag_dump (GIOChannel *ioc) -{ - GList *l; - g_io_channel_write_chars (ioc, "missing list:\n", -1, NULL, NULL); - for (l = missing_sub_list; l; l = l->next) - { - inotify_sub *sub = l->data; - g_io_channel_write_chars (ioc, sub->dirname, -1, NULL, NULL); - g_io_channel_write_chars (ioc, "\n", -1, NULL, NULL); - } -} diff --git a/gfilemonitor/inotify-missing.h b/gfilemonitor/inotify-missing.h deleted file mode 100644 index 598db2f31..000000000 --- a/gfilemonitor/inotify-missing.h +++ /dev/null @@ -1,35 +0,0 @@ -/* inotify-helper.h - GNOME VFS Monitor using inotify - - Copyright (C) 2006 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Author: John McCutchan -*/ - - -#ifndef __INOTIFY_MISSING_H -#define __INOTIFY_MISSING_H - -#include "inotify-sub.h" - -void _im_startup (void (*missing_cb)(inotify_sub *sub)); -void _im_add (inotify_sub *sub); -void _im_rm (inotify_sub *sub); -void _im_diag_dump (GIOChannel *ioc); - - -#endif /* __INOTIFY_MISSING_H */ diff --git a/gfilemonitor/inotify-path.c b/gfilemonitor/inotify-path.c deleted file mode 100644 index 8d98a925d..000000000 --- a/gfilemonitor/inotify-path.c +++ /dev/null @@ -1,422 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */ - -/* inotify-path.c - GVFS Directory Monitor based on inotify. - - Copyright (C) 2006 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors: - John McCutchan -*/ - -#include "config.h" - -/* Don't put conflicting kernel types in the global namespace: */ -#define __KERNEL_STRICT_NAMES - -#include -#include -#include -#include "inotify-kernel.h" -#include "inotify-path.h" -#include "inotify-missing.h" - -#define IP_INOTIFY_MASK (IN_MODIFY|IN_ATTRIB|IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE|IN_CREATE|IN_DELETE_SELF|IN_UNMOUNT|IN_MOVE_SELF|IN_CLOSE_WRITE) - -/* Older libcs don't have this */ -#ifndef IN_ONLYDIR -#define IN_ONLYDIR 0 -#endif - -typedef struct ip_watched_dir_s { - char *path; - /* TODO: We need to maintain a tree of watched directories - * so that we can deliver move/delete events to sub folders. - * Or the application could do it... - */ - struct ip_watched_dir_s* parent; - GList* children; - - /* Inotify state */ - gint32 wd; - - /* List of inotify subscriptions */ - GList *subs; -} ip_watched_dir_t; - -static gboolean ip_debug_enabled = FALSE; -#define IP_W if (ip_debug_enabled) g_warning - -/* path -> ip_watched_dir */ -static GHashTable * path_dir_hash = NULL; -/* inotify_sub * -> ip_watched_dir * - * - * Each subscription is attached to a watched directory or it is on - * the missing list - */ -static GHashTable * sub_dir_hash = NULL; -/* This hash holds GLists of ip_watched_dir_t *'s - * We need to hold a list because symbolic links can share - * the same wd - */ -static GHashTable * wd_dir_hash = NULL; - -static ip_watched_dir_t *ip_watched_dir_new (const char *path, - int wd); -static void ip_watched_dir_free (ip_watched_dir_t *dir); -static void ip_event_callback (ik_event_t *event); - - -static void (*event_callback)(ik_event_t *event, inotify_sub *sub); - -gboolean -_ip_startup (void (*cb)(ik_event_t *event, inotify_sub *sub)) -{ - static gboolean initialized = FALSE; - static gboolean result = FALSE; - - if (initialized == TRUE) - return result; - - event_callback = cb; - result = _ik_startup (ip_event_callback); - - if (!result) - return FALSE; - - path_dir_hash = g_hash_table_new (g_str_hash, g_str_equal); - sub_dir_hash = g_hash_table_new (g_direct_hash, g_direct_equal); - wd_dir_hash = g_hash_table_new (g_direct_hash, g_direct_equal); - - initialized = TRUE; - return TRUE; -} - -static void -ip_map_path_dir (const char *path, - ip_watched_dir_t *dir) -{ - g_assert (path && dir); - g_hash_table_insert (path_dir_hash, dir->path, dir); -} - -static void -ip_map_sub_dir (inotify_sub *sub, - ip_watched_dir_t *dir) -{ - /* Associate subscription and directory */ - g_assert (dir && sub); - g_hash_table_insert (sub_dir_hash, sub, dir); - dir->subs = g_list_prepend (dir->subs, sub); -} - -static void -ip_map_wd_dir (gint32 wd, - ip_watched_dir_t *dir) -{ - GList *dir_list; - - g_assert (wd >= 0 && dir); - dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER (wd)); - dir_list = g_list_prepend (dir_list, dir); - g_hash_table_replace (wd_dir_hash, GINT_TO_POINTER (dir->wd), dir_list); -} - -gboolean -_ip_start_watching (inotify_sub *sub) -{ - gint32 wd; - int err; - ip_watched_dir_t *dir; - - g_assert (sub); - g_assert (!sub->cancelled); - g_assert (sub->dirname); - - IP_W ("Starting to watch %s\n", sub->dirname); - dir = g_hash_table_lookup (path_dir_hash, sub->dirname); - if (dir) - { - IP_W ("Already watching\n"); - goto out; - } - - IP_W ("Trying to add inotify watch "); - wd = _ik_watch (sub->dirname, IP_INOTIFY_MASK|IN_ONLYDIR, &err); - if (wd < 0) - { - IP_W ("Failed\n"); - return FALSE; - } - else - { - /* Create new watched directory and associate it with the - * wd hash and path hash - */ - IP_W ("Success\n"); - dir = ip_watched_dir_new (sub->dirname, wd); - ip_map_wd_dir (wd, dir); - ip_map_path_dir (sub->dirname, dir); - } - - out: - ip_map_sub_dir (sub, dir); - - return TRUE; -} - -static void -ip_unmap_path_dir (const char *path, - ip_watched_dir_t *dir) -{ - g_assert (path && dir); - g_hash_table_remove (path_dir_hash, dir->path); -} - -static void -ip_unmap_wd_dir (gint32 wd, - ip_watched_dir_t *dir) -{ - GList *dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER (wd)); - - if (!dir_list) - return; - - g_assert (wd >= 0 && dir); - dir_list = g_list_remove (dir_list, dir); - if (dir_list == NULL) - g_hash_table_remove (wd_dir_hash, GINT_TO_POINTER (dir->wd)); - else - g_hash_table_replace (wd_dir_hash, GINT_TO_POINTER (dir->wd), dir_list); -} - -static void -ip_unmap_wd (gint32 wd) -{ - GList *dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER (wd)); - if (!dir_list) - return; - g_assert (wd >= 0); - g_hash_table_remove (wd_dir_hash, GINT_TO_POINTER (wd)); - g_list_free (dir_list); -} - -static void -ip_unmap_sub_dir (inotify_sub *sub, - ip_watched_dir_t *dir) -{ - g_assert (sub && dir); - g_hash_table_remove (sub_dir_hash, sub); - dir->subs = g_list_remove (dir->subs, sub); -} - -static void -ip_unmap_all_subs (ip_watched_dir_t *dir) -{ - GList *l = NULL; - - for (l = dir->subs; l; l = l->next) - { - inotify_sub *sub = l->data; - g_hash_table_remove (sub_dir_hash, sub); - } - g_list_free (dir->subs); - dir->subs = NULL; -} - -gboolean -_ip_stop_watching (inotify_sub *sub) -{ - ip_watched_dir_t *dir = NULL; - - dir = g_hash_table_lookup (sub_dir_hash, sub); - if (!dir) - return TRUE; - - ip_unmap_sub_dir (sub, dir); - - /* No one is subscribing to this directory any more */ - if (dir->subs == NULL) - { - _ik_ignore (dir->path, dir->wd); - ip_unmap_wd_dir (dir->wd, dir); - ip_unmap_path_dir (dir->path, dir); - ip_watched_dir_free (dir); - } - - return TRUE; -} - - -static ip_watched_dir_t * -ip_watched_dir_new (const char *path, - gint32 wd) -{ - ip_watched_dir_t *dir = g_new0 (ip_watched_dir_t, 1); - - dir->path = g_strdup (path); - dir->wd = wd; - - return dir; -} - -static void -ip_watched_dir_free (ip_watched_dir_t *dir) -{ - g_assert (dir->subs == NULL); - g_free (dir->path); - g_free (dir); -} - -static void -ip_wd_delete (gpointer data, - gpointer user_data) -{ - ip_watched_dir_t *dir = data; - GList *l = NULL; - - for (l = dir->subs; l; l = l->next) - { - inotify_sub *sub = l->data; - /* Add subscription to missing list */ - _im_add (sub); - } - ip_unmap_all_subs (dir); - /* Unassociate the path and the directory */ - ip_unmap_path_dir (dir->path, dir); - ip_watched_dir_free (dir); -} - -static void -ip_event_dispatch (GList *dir_list, - GList *pair_dir_list, - ik_event_t *event) -{ - GList *dirl; - - if (!event) - return; - - for (dirl = dir_list; dirl; dirl = dirl->next) - { - GList *subl; - ip_watched_dir_t *dir = dirl->data; - - for (subl = dir->subs; subl; subl = subl->next) - { - inotify_sub *sub = subl->data; - - /* If the subscription and the event - * contain a filename and they don't - * match, we don't deliver this event. - */ - if (sub->filename && - event->name && - strcmp (sub->filename, event->name)) - continue; - - /* If the subscription has a filename - * but this event doesn't, we don't - * deliever this event. - */ - if (sub->filename && !event->name) - continue; - - /* FIXME: We might need to synthesize - * DELETE/UNMOUNT events when - * the filename doesn't match - */ - - event_callback (event, sub); - } - } - - if (!event->pair) - return; - - for (dirl = pair_dir_list; dirl; dirl = dirl->next) - { - GList *subl; - ip_watched_dir_t *dir = dirl->data; - - for (subl = dir->subs; subl; subl = subl->next) - { - inotify_sub *sub = subl->data; - - /* If the subscription and the event - * contain a filename and they don't - * match, we don't deliver this event. - */ - if (sub->filename && - event->pair->name && - strcmp (sub->filename, event->pair->name)) - continue; - - /* If the subscription has a filename - * but this event doesn't, we don't - * deliever this event. - */ - if (sub->filename && !event->pair->name) - continue; - - /* FIXME: We might need to synthesize - * DELETE/UNMOUNT events when - * the filename doesn't match - */ - - event_callback (event->pair, sub); - } - } -} - -static void -ip_event_callback (ik_event_t *event) -{ - GList* dir_list = NULL; - GList* pair_dir_list = NULL; - - dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER (event->wd)); - - /* We can ignore the IGNORED events */ - if (event->mask & IN_IGNORED) - { - _ik_event_free (event); - return; - } - - if (event->pair) - pair_dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER (event->pair->wd)); - - if (event->mask & IP_INOTIFY_MASK) - ip_event_dispatch (dir_list, pair_dir_list, event); - - /* We have to manage the missing list - * when we get an event that means the - * file has been deleted/moved/unmounted. - */ - if (event->mask & IN_DELETE_SELF || - event->mask & IN_MOVE_SELF || - event->mask & IN_UNMOUNT) - { - /* Add all subscriptions to missing list */ - g_list_foreach (dir_list, ip_wd_delete, NULL); - /* Unmap all directories attached to this wd */ - ip_unmap_wd (event->wd); - } - - _ik_event_free (event); -} diff --git a/gfilemonitor/inotify-path.h b/gfilemonitor/inotify-path.h deleted file mode 100644 index 72c7f2873..000000000 --- a/gfilemonitor/inotify-path.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - Copyright (C) 2005 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors:. - John McCutchan -*/ - -#ifndef __INOTIFY_PATH_H -#define __INOTIFY_PATH_H - -#include "inotify-kernel.h" -#include "inotify-sub.h" - -gboolean _ip_startup (void (*event_cb)(ik_event_t *event, inotify_sub *sub)); -gboolean _ip_start_watching (inotify_sub *sub); -gboolean _ip_stop_watching (inotify_sub *sub); - -#endif diff --git a/gfilemonitor/inotify-sub.c b/gfilemonitor/inotify-sub.c deleted file mode 100644 index 1b4d18466..000000000 --- a/gfilemonitor/inotify-sub.c +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */ - -/* inotify-sub.c - GMonitor based on inotify. - - Copyright (C) 2006 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors: - John McCutchan -*/ - -#include "config.h" -#include -#include - -#include "inotify-sub.h" - -static gboolean is_debug_enabled = FALSE; -#define IS_W if (is_debug_enabled) g_warning - -static gchar* -dup_dirname (const gchar *dirname) -{ - gchar *d_dirname = g_strdup (dirname); - size_t len = strlen (d_dirname); - - if (d_dirname[len - 1] == '/') - d_dirname[len - 1] = '\0'; - - return d_dirname; -} - -inotify_sub* -_ih_sub_new (const gchar *dirname, - const gchar *filename, - gpointer user_data) -{ - inotify_sub *sub = NULL; - - sub = g_new0 (inotify_sub, 1); - sub->dirname = dup_dirname (dirname); - sub->filename = g_strdup (filename); - sub->user_data = user_data; - - IS_W ("new subscription for %s being setup\n", sub->dirname); - - return sub; -} - -void -_ih_sub_free (inotify_sub *sub) -{ - g_free (sub->dirname); - g_free (sub->filename); - g_free (sub); -} diff --git a/gfilemonitor/inotify-sub.h b/gfilemonitor/inotify-sub.h deleted file mode 100644 index 01533bdb3..000000000 --- a/gfilemonitor/inotify-sub.h +++ /dev/null @@ -1,38 +0,0 @@ -/* inotify-sub.h - GVFS Directory Monitor using inotify - - Copyright (C) 2006 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Author: John McCutchan -*/ - - -#ifndef __INOTIFY_SUB_H -#define __INOTIFY_SUB_H - -typedef struct -{ - gchar* dirname; - gchar* filename; - gboolean cancelled; - gpointer user_data; -} inotify_sub; - -inotify_sub* _ih_sub_new (const gchar* dirname, const gchar* filename, gpointer user_data); -void _ih_sub_free (inotify_sub* sub); - -#endif /* __INOTIFY_SUB_H */ diff --git a/system-settings/plugins/ifcfg-rh/Makefile.am b/system-settings/plugins/ifcfg-rh/Makefile.am index 7486b5d05..9896bfe9b 100644 --- a/system-settings/plugins/ifcfg-rh/Makefile.am +++ b/system-settings/plugins/ifcfg-rh/Makefile.am @@ -57,13 +57,6 @@ libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ $(top_builddir)/marshallers/libmarshallers.la \ libifcfg-rh-io.la \ $(GLIB_LIBS) \ - $(GMODULE_LIBS) - -if NO_GIO -libnm_settings_plugin_ifcfg_rh_la_LIBADD += \ - $(top_builddir)/gfilemonitor/libgfilemonitor.la -else -libnm_settings_plugin_ifcfg_rh_la_LIBADD += \ + $(GMODULE_LIBS) \ $(GIO_LIBS) -endif diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c index 361a85800..f8ca29017 100644 --- a/system-settings/plugins/ifcfg-rh/plugin.c +++ b/system-settings/plugins/ifcfg-rh/plugin.c @@ -22,25 +22,21 @@ */ #include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include + #include #include -#ifndef NO_GIO -#include -#else -#include -#endif - #include "common.h" #include "nm-dbus-glib-types.h" #include "plugin.h" diff --git a/system-settings/plugins/ifcfg-suse/Makefile.am b/system-settings/plugins/ifcfg-suse/Makefile.am index 2db852b09..67d5ad9a6 100644 --- a/system-settings/plugins/ifcfg-suse/Makefile.am +++ b/system-settings/plugins/ifcfg-suse/Makefile.am @@ -31,13 +31,6 @@ libnm_settings_plugin_ifcfg_suse_la_LIBADD = \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ $(POLKIT_LIBS) \ - $(GUDEV_LIBS) - -if NO_GIO -libnm_settings_plugin_ifcfg_suse_la_LIBADD += \ - $(top_builddir)/gfilemonitor/libgfilemonitor.la -else -libnm_settings_plugin_ifcfg_suse_la_LIBADD += \ + $(GUDEV_LIBS) \ $(GIO_LIBS) -endif diff --git a/system-settings/plugins/ifcfg-suse/plugin.c b/system-settings/plugins/ifcfg-suse/plugin.c index c07ff2df6..1831b504f 100644 --- a/system-settings/plugins/ifcfg-suse/plugin.c +++ b/system-settings/plugins/ifcfg-suse/plugin.c @@ -23,9 +23,6 @@ */ #include -#include -#include -#include #include #include #include @@ -33,11 +30,10 @@ #include #include -#ifndef NO_GIO +#include +#include +#include #include -#else -#include -#endif #include #include diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am index 5e902b313..dbf5a2541 100644 --- a/system-settings/plugins/keyfile/Makefile.am +++ b/system-settings/plugins/keyfile/Makefile.am @@ -32,15 +32,8 @@ libnm_settings_plugin_keyfile_la_LIBADD = \ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ - $(DBUS_LIBS) - -if NO_GIO -libnm_settings_plugin_keyfile_la_LIBADD += \ - $(top_builddir)/gfilemonitor/libgfilemonitor.la -else -libnm_settings_plugin_keyfile_la_LIBADD += \ + $(DBUS_LIBS) \ $(GIO_LIBS) -endif install-data-hook: $(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir) diff --git a/system-settings/plugins/keyfile/plugin.c b/system-settings/plugins/keyfile/plugin.c index f981f34e3..e6a890885 100644 --- a/system-settings/plugins/keyfile/plugin.c +++ b/system-settings/plugins/keyfile/plugin.c @@ -24,19 +24,16 @@ #include #include #include + #include #include #include +#include + #include #include #include -#ifndef NO_GIO -#include -#else -#include -#endif - #include "plugin.h" #include "nm-system-config-interface.h" #include "nm-keyfile-connection.h" From cb6039033ab2b31dbb98edd02711298a0df1c0cb Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Thu, 20 Aug 2009 13:21:17 -0500 Subject: [PATCH 19/22] supplicant: add ca_path2 to verification table (bgo #592467) --- src/supplicant-manager/nm-supplicant-settings-verify.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c index 5e3079547..283346559 100644 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c @@ -109,6 +109,7 @@ static const struct Opt opt_table[] = { { "phase1", TYPE_KEYWORD, 0, 0, TRUE, phase1_allowed }, { "phase2", TYPE_KEYWORD, 0, 0, TRUE, phase2_allowed }, { "anonymous_identity", TYPE_BYTES, 0, 0, FALSE, NULL }, + { "ca_path2", TYPE_BYTES, 0, 0, FALSE, NULL }, { "ca_cert2", TYPE_BYTES, 0, 65536, FALSE, NULL }, { "client_cert2", TYPE_BYTES, 0, 65536, FALSE, NULL }, { "private_key2", TYPE_BYTES, 0, 65536, FALSE, NULL }, From b6637b20538fa52ff325db770ffea910012d6902 Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Thu, 20 Aug 2009 20:58:18 +0200 Subject: [PATCH 20/22] core: make sure device interfaces are up before ip4 configuration --- src/nm-device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/nm-device.c b/src/nm-device.c index 209ce4760..7d0d90569 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -996,6 +996,10 @@ real_act_stage3_ip4_config_start (NMDevice *self, NMDeviceStateReason *reason) /* Use the IP interface (not the control interface) for IP stuff */ ip_iface = nm_device_get_ip_iface (self); + /* Make sure the interface is up before trying to do anything with it */ + if (!nm_system_device_is_up_with_iface (ip_iface)) + nm_system_device_set_up_down_with_iface (ip_iface, TRUE, NULL); + req = nm_device_get_act_request (self); connection = nm_act_request_get_connection (req); s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); From 20a0d197f7b02d912cd7e85918de70441393553f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 21 Aug 2009 12:12:50 -0500 Subject: [PATCH 21/22] core: fix log message --- src/nm-call-store.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nm-call-store.c b/src/nm-call-store.c index 57145fa27..837edf023 100644 --- a/src/nm-call-store.c +++ b/src/nm-call-store.c @@ -68,12 +68,12 @@ nm_call_store_remove (NMCallStore *store, call_ids_hash = g_hash_table_lookup (store, object); if (!call_ids_hash) { - nm_warning ("Trying to move a non-existant call id."); + nm_warning ("Trying to remove a non-existant call id."); return; } if (!g_hash_table_remove (call_ids_hash, call_id)) - nm_warning ("Trying to move a non-existant call id."); + nm_warning ("Trying to remove a non-existant call id."); if (g_hash_table_size (call_ids_hash) == 0) { g_hash_table_remove (store, object); From 09459788cdf5543dcdb296652475ef4afd59ad1e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 21 Aug 2009 12:16:17 -0500 Subject: [PATCH 22/22] core: don't use backtrace_symbols() from a signal handler It uses malloc(), which you can't do from a signal handler. --- src/nm-logging.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/nm-logging.c b/src/nm-logging.c index a38062039..2fbef7626 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -19,6 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ +#define _GNU_SOURCE +#include #include #include #include @@ -27,6 +29,7 @@ #include #include #include +#include #include "nm-logging.h" #include "nm-utils.h" @@ -34,25 +37,33 @@ static void fallback_get_backtrace (void) { - void * frames[64]; - size_t size; - char ** strings; - size_t i; + void *frames[64]; + Dl_info info; + size_t size; + guint32 i; + const char *name; size = backtrace (frames, G_N_ELEMENTS (frames)); - if ((strings = backtrace_symbols (frames, size))) - { - syslog (LOG_CRIT, "******************* START **********************************"); - for (i = 0; i < size; i++) - syslog (LOG_CRIT, "Frame %zd: %s", i, strings[i]); - free (strings); - syslog (LOG_CRIT, "******************* END **********************************"); - } - else - { - nm_warning ("NetworkManager crashed, but symbols " - "couldn't be retrieved."); + + syslog (LOG_CRIT, "******************* START **********************************"); + for (i = 0; i < size; i++) { + dladdr (frames[i], &info); + name = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)"; + if (info.dli_saddr) { + syslog (LOG_CRIT, "Frame %d: %s (%s+0x%lx) [%p]", + i, name, + info.dli_sname, + frames[i] - info.dli_saddr, + frames[i]); + } else { + syslog (LOG_CRIT, "Frame %d: %s (%p+0x%lx) [%p]", + i, name, + info.dli_fbase, + frames[i] - info.dli_saddr, + frames[i]); + } } + syslog (LOG_CRIT, "******************* END **********************************"); }