------------------------------------------------------------ revno: 80 committer: Alexander Sack branch nick: network-manager.debian timestamp: Sat 2007-10-06 16:50:39 +0200 message: * drop gracefull supplicant shutdown feature and its followup patches, because they cause crashes and a real fix would need more intrusive code rewrites: - debian/patches/41n_graceful_supplicant_shutdown.patch, debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch, debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch, debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch: drop patches that belong to the "graveful supplicant feature". - debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: update interleaving patch - debian/patches/series: update quilt series accordingly. * document in changelog accordingly. === removed file 'debian/patches/41n_graceful_supplicant_shutdown.patch' --- debian/patches/41n_graceful_supplicant_shutdown.patch 2007-09-02 19:43:35 +0000 +++ debian/patches/41n_graceful_supplicant_shutdown.patch 1970-01-01 00:00:00 +0000 @@ -1,47 +0,0 @@ ---- - src/nm-device-802-11-wireless.c | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: network-manager.debian/src/nm-device-802-11-wireless.c -=================================================================== ---- network-manager.debian.orig/src/nm-device-802-11-wireless.c -+++ network-manager.debian/src/nm-device-802-11-wireless.c -@@ -2427,16 +2427,20 @@ - supplicant_cleanup (NMDevice80211Wireless *self) - { - char * sock_path; - - g_return_if_fail (self != NULL); - - if (self->priv->supplicant.pid > 0) - { -+ if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -+ "DISABLE_NETWORK 0")) -+ nm_warning("couldn't disable network in supplicant_cleanup"); -+ - kill (self->priv->supplicant.pid, SIGTERM); - self->priv->supplicant.pid = -1; - } - if (self->priv->supplicant.watch) - { - g_source_destroy (self->priv->supplicant.watch); - self->priv->supplicant.watch = NULL; - } -@@ -3044,16 +3048,17 @@ - - iface = nm_device_get_iface (dev); - if (!supplicant_exec (self)) - { - nm_warning ("Activation (%s/wireless): couldn't start the supplicant.", - iface); - goto out; - } -+ - if (!supplicant_interface_init (self)) - { - nm_warning ("Activation (%s/wireless): couldn't connect to the supplicant.", - iface); - goto out; - } - if (!supplicant_monitor_start (self)) - { === removed file 'debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch' --- debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch 2007-09-03 08:34:40 +0000 +++ debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch 1970-01-01 00:00:00 +0000 @@ -1,39 +0,0 @@ ---- - src/nm-device-802-11-wireless.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -Index: network-manager.debian/src/nm-device-802-11-wireless.c -=================================================================== ---- network-manager.debian.orig/src/nm-device-802-11-wireless.c 2007-09-02 23:44:09.000000000 +0200 -+++ network-manager.debian/src/nm-device-802-11-wireless.c 2007-09-02 23:57:02.000000000 +0200 -@@ -2429,17 +2429,29 @@ - char * sock_path; - - g_return_if_fail (self != NULL); - - if (self->priv->supplicant.pid > 0) - { - if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - "DISABLE_NETWORK 0")) -- nm_warning("couldn't disable network in supplicant_cleanup"); -+ nm_warning("supplicant_cleanup - couldn't disable network in supplicant_cleanup"); -+ -+ if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -+ "AP_SCAN 0")) -+ nm_warning("supplicant_cleanup - couldn't set AP_SCAN 0"); -+ -+ // if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -+ // "interface_remove %s", iface)) -+ // nm_warning("supplicant_cleanup - couldn't remove device interface %s", iface); -+ -+ if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -+ "TERMINATE")) -+ nm_warning("supplicant_cleanup - couldn't terminate wpasupplicant cleanly."); - - kill (self->priv->supplicant.pid, SIGTERM); - self->priv->supplicant.pid = -1; - } - if (self->priv->supplicant.watch) - { - g_source_destroy (self->priv->supplicant.watch); - self->priv->supplicant.watch = NULL; === removed file 'debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch' --- debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch 2007-09-21 08:44:20 +0000 +++ debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch 1970-01-01 00:00:00 +0000 @@ -1,58 +0,0 @@ ---- - src/nm-device-802-11-wireless.c | 26 ++++++++++++++------------ - 1 file changed, 14 insertions(+), 12 deletions(-) - -Index: network-manager.debian/src/nm-device-802-11-wireless.c -=================================================================== ---- network-manager.debian.orig/src/nm-device-802-11-wireless.c -+++ network-manager.debian/src/nm-device-802-11-wireless.c -@@ -2437,35 +2437,37 @@ - supplicant_cleanup (NMDevice80211Wireless *self) - { - char * sock_path; - - g_return_if_fail (self != NULL); - - if (self->priv->supplicant.pid > 0) - { -- wpa_ctrl_set_custom_timeout(self->priv->supplicant.ctrl, 12); -- if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -+ if(self->priv->supplicant.ctrl) { -+ wpa_ctrl_set_custom_timeout(self->priv->supplicant.ctrl, 12); -+ if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - "DISABLE_NETWORK 0")) -- nm_warning("supplicant_cleanup - couldn't disable network in supplicant_cleanup"); -+ nm_warning("supplicant_cleanup - couldn't disable network in supplicant_cleanup"); - -- if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -- "AP_SCAN 0")) -- nm_warning("supplicant_cleanup - couldn't set AP_SCAN 0"); -+ if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -+ "AP_SCAN 0")) -+ nm_warning("supplicant_cleanup - couldn't set AP_SCAN 0"); - - // if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - // "interface_remove %s", iface)) - // nm_warning("supplicant_cleanup - couldn't remove device interface %s", iface); - -- if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -- "TERMINATE")) -- nm_warning("supplicant_cleanup - couldn't terminate wpasupplicant cleanly."); -- -- wpa_ctrl_unset_custom_timeout(self->priv->supplicant.ctrl); -- -+ if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, -+ "TERMINATE")) -+ nm_warning("supplicant_cleanup - couldn't terminate wpasupplicant cleanly."); -+ wpa_ctrl_unset_custom_timeout(self->priv->supplicant.ctrl); -+ } else { -+ nm_warning("supplicant_cleanup - no ctrl socket established ... trying signat shutdown only."); -+ } - kill (self->priv->supplicant.pid, SIGTERM); - self->priv->supplicant.pid = -1; - } - if (self->priv->supplicant.watch) - { - g_source_destroy (self->priv->supplicant.watch); - self->priv->supplicant.watch = NULL; - } === removed file 'debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch' --- debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch 2007-10-02 11:34:09 +0000 +++ debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ ---- - src/nm-device-802-11-wireless.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: network-manager.debian/src/nm-device-802-11-wireless.c -=================================================================== ---- network-manager.debian.orig/src/nm-device-802-11-wireless.c -+++ network-manager.debian/src/nm-device-802-11-wireless.c -@@ -2435,16 +2435,18 @@ - - static void - supplicant_cleanup (NMDevice80211Wireless *self) - { - char * sock_path; - - g_return_if_fail (self != NULL); - -+ cancel_pending_scan (self); -+ - if (self->priv->supplicant.pid > 0) - { - if(self->priv->supplicant.ctrl) { - wpa_ctrl_set_custom_timeout(self->priv->supplicant.ctrl, 12); - if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - "DISABLE_NETWORK 0")) - nm_warning("supplicant_cleanup - couldn't disable network in supplicant_cleanup"); - === modified file 'debian/changelog' --- debian/changelog 2007-10-06 14:49:10 +0000 +++ debian/changelog 2007-10-06 14:50:39 +0000 @@ -1,11 +1,22 @@ network-manager (0.6.5-0ubuntu16) UNRELEASED; urgency=low - * + * drop gracefull supplicant shutdown feature and its followup patches, + because + they cause crashes and a real fix would need more intrusive code + rewrites: + - debian/patches/41n_graceful_supplicant_shutdown.patch, + debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch, + debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch, + debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch: drop + patches that belong to the "graveful supplicant feature". + - debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: update + interleaving patch + - debian/patches/series: update quilt series accordingly. -- Alexander Sack Sat, 06 Oct 2007 16:48:45 +0200 network-manager (0.6.5-0ubuntu15) gutsy; urgency=low * debian/patches/41z_lp138217_use_timeout_to_schedule_activation.patch,series: don't use idle_source to schedule activation, but rest a bit by using a timeout_source with 250ms delay (LP: #138217). === modified file 'debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch' --- debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch 2007-09-21 08:40:50 +0000 +++ debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch 2007-10-06 14:50:39 +0000 @@ -1,53 +1,17 @@ --- - src/nm-device-802-11-wireless.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) + src/nm-device-802-11-wireless.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) Index: network-manager.debian/src/nm-device-802-11-wireless.c =================================================================== --- network-manager.debian.orig/src/nm-device-802-11-wireless.c +++ network-manager.debian/src/nm-device-802-11-wireless.c -@@ -2437,32 +2437,35 @@ - supplicant_cleanup (NMDevice80211Wireless *self) - { - char * sock_path; - - g_return_if_fail (self != NULL); - - if (self->priv->supplicant.pid > 0) - { -+ wpa_ctrl_set_custom_timeout(self->priv->supplicant.ctrl, 12); - if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - "DISABLE_NETWORK 0")) - nm_warning("supplicant_cleanup - couldn't disable network in supplicant_cleanup"); - - if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - "AP_SCAN 0")) - nm_warning("supplicant_cleanup - couldn't set AP_SCAN 0"); - - // if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - // "interface_remove %s", iface)) - // nm_warning("supplicant_cleanup - couldn't remove device interface %s", iface); - - if (!nm_utils_supplicant_request_with_check (self->priv->supplicant.ctrl, "OK", __func__, NULL, - "TERMINATE")) - nm_warning("supplicant_cleanup - couldn't terminate wpasupplicant cleanly."); - -+ wpa_ctrl_unset_custom_timeout(self->priv->supplicant.ctrl); -+ - kill (self->priv->supplicant.pid, SIGTERM); - self->priv->supplicant.pid = -1; - } - if (self->priv->supplicant.watch) - { - g_source_destroy (self->priv->supplicant.watch); - self->priv->supplicant.watch = NULL; - } -@@ -2795,17 +2798,17 @@ +@@ -2779,17 +2779,17 @@ gboolean success = FALSE; int global_connect_attempts = 0; int connect_attempts = 0; const char * wpa_driver; const char * kernel_driver; /* Try to open wpa_supplicant's global control socket */ @@ -56,17 +20,17 @@ Index: network-manager.debian/src/nm-dev { ctrl = wpa_ctrl_open (supplicant_get_global_device_socket_path(self), NM_RUN_DIR); nm_info ("supplicant_interface_init() - connect to global ctrl socket (%d/10).", global_connect_attempts); g_usleep (WPA_SUPPLICANT_RETRY_TIME_US); } if (!ctrl) { -@@ -2823,22 +2826,24 @@ +@@ -2807,22 +2807,24 @@ if (!strcmp (kernel_driver, "ath_pci")) wpa_driver = "madwifi"; else if (!strcmp (kernel_driver, "hostap_pci") || !strcmp (kernel_driver, "hostap_cs") || !strcmp (kernel_driver, "hostap_plx")) wpa_driver = "hostap"; else wpa_driver = "wext"; /* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */ === modified file 'debian/patches/series' --- debian/patches/series 2007-10-04 09:50:58 +0000 +++ debian/patches/series 2007-10-06 14:50:39 +0000 @@ -18,22 +18,18 @@ 24pp_svn2604_Add-HAL-based-rfkill-support.patch 24pp_svn2605-gnome354565-dont-up-notwired-interfaces.patch 24pp_svn2618_set-hardware-RF-to-enabled-if-no-killswitches.patch 24pp_svn2754-lp101857-endianess.patch 41c_ubuntu-fixup--get_mode_always_fails_typo_fix.patch 41e_fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch 41k_20_sec_wireless_link_timeout.patch 41m_unref_dbus_connection_on_shutdown.patch -41n_graceful_supplicant_shutdown.patch #41o_completely_deactivate_stage1.patch -41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch 41r_wpa_control_custom_timeout.patch 41r_wpa_control_explicit_TIMEOUT_reply_fixup.patch 41s_wpa_ctrl_socket_non_block.patch 41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch 41u_custom_timeout_for_some_wpa_ctrl_operations.patch -41v_lp141233-fix-supplicant-cleanup-crashes.patch -41w_lp145683_cancel_scan_in_supplicant_cleanup.patch 41wa_lp145683_wpa_ctrl_check_select_result_for_error.patch 41x_lp145653_reraise_fatal_signals.patch 41y_queue_if_dbus_name_is_taken_on_startup.patch 41z_lp138217_use_timeout_to_schedule_activation.patch