r98 - in unstable/rutilt/debian: . patches
benh at alioth.debian.org
benh at alioth.debian.org
Thu Nov 22 00:15:42 UTC 2007
Author: benh
Date: 2007-11-22 00:15:41 +0000 (Thu, 22 Nov 2007)
New Revision: 98
Modified:
unstable/rutilt/debian/changelog
unstable/rutilt/debian/patches/018_up_and_down.diff
Log:
Removed bogus changes from 018_up_and_down.diff.
Should fix Launchpad bug #164058.
Modified: unstable/rutilt/debian/changelog
===================================================================
--- unstable/rutilt/debian/changelog 2007-11-18 23:52:12 UTC (rev 97)
+++ unstable/rutilt/debian/changelog 2007-11-22 00:15:41 UTC (rev 98)
@@ -1,3 +1,11 @@
+rutilt (0.15-4) unstable; urgency=low
+
+ * Revised 018_up_and_down.diff. Removed the change to configuration
+ code that would bring the interface down before setting ESSID, as this
+ is not necessary and does not work with all drivers. (LP #164058)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Thu, 22 Nov 2007 00:01:13 +0000
+
rutilt (0.15-3) unstable; urgency=low
* Added patch 018_up_and_down.diff to improve reliability with
Modified: unstable/rutilt/debian/patches/018_up_and_down.diff
===================================================================
--- unstable/rutilt/debian/patches/018_up_and_down.diff 2007-11-18 23:52:12 UTC (rev 97)
+++ unstable/rutilt/debian/patches/018_up_and_down.diff 2007-11-22 00:15:41 UTC (rev 98)
@@ -10,166 +10,8 @@
}
if (m_SupportedFreqVec.empty())
{
---- rutilt.orig/lib/src/RTModules.cxx
-+++ rutilt/lib/src/RTModules.cxx
-@@ -25,6 +25,7 @@
- #include "RTDrivers.h"
- #include "RTDriversRoot.h"
- #include "ErrorsCode.h"
-+#include "NetTools.h"
-
-
-
-@@ -76,9 +77,15 @@
-
-
- void ApplyRT2400Profile (const nsUserData::CProfile& Profile,
-- nsWireless::CRT2400Driver& Driver)
-+ nsWireless::CRT2400Driver& Driver,
-+ nsNet::CInterface* pIface = NULL)
- throw (nsErrors::CSystemExc)
- {
-+ if (pIface)
-+ pIface->Down();
-+ Driver.SetSSID (Profile.GetSSID());
-+ if (pIface)
-+ pIface->Up();
- Driver.SetChannel (Profile.GetChannel());
- Driver.SetMode (Profile.GetMode());
- Driver.SetEncryption (Profile.GetEncryptionD());
-@@ -88,12 +95,17 @@
-
-
- void ApplyRTxxProfile (const nsUserData::CProfile& Profile,
-- nsWireless::IDriver& Driver)
-+ nsWireless::IDriver& Driver,
-+ nsNet::CInterface* pIface = NULL)
- throw (nsErrors::CSystemExc)
- {
-+ if (pIface)
-+ pIface->Down();
-+ Driver.SetSSID (Profile.GetSSID());
-+ if (pIface)
-+ pIface->Up();
- Driver.SetMode (Profile.GetMode());
- Driver.SetChannel (Profile.GetChannel());
-- Driver.SetSSID (Profile.GetSSID());
- Driver.SetEncryption (Profile.GetEncryptionD());
- Driver.SetSSID (Profile.GetSSID());
-
-@@ -218,9 +230,13 @@
- } // RecordProfiles()
-
-
--void nsCore::CRT2400Module::Connect (const nsWireless::CCell& Cell)
-+void nsCore::CRT2400Module::Connect (const nsWireless::CCell& Cell,
-+ nsNet::CInterface* pIface)
- throw (nsErrors::CSystemExc, std::bad_alloc)
- {
-+ pIface->Down();
-+ m_pDriver->SetSSID (Cell.GetSSID());
-+ pIface->Up();
- if (Cell.GetMode() == nsWireless::AdHoc);
- {
- if (Cell.GetChannel())
-@@ -236,10 +252,11 @@
- } // Connect()
-
-
--void nsCore::CRT2400Module::ApplyProfile (unsigned Pos)
-+void nsCore::CRT2400Module::ApplyProfile (unsigned Pos,
-+ nsNet::CInterface* pIface)
- throw (nsErrors::CSystemExc)
- {
-- ApplyRT2400Profile (m_ProfilesFile [Pos], *m_pDriver);
-+ ApplyRT2400Profile (m_ProfilesFile [Pos], *m_pDriver, pIface);
-
- } // ApplyProfile()
-
-@@ -364,12 +381,15 @@
- } // EditNewProfile()
-
-
--void nsCore::CRTAdvancedModule::Connect (const nsWireless::CCell& Cell)
-+void nsCore::CRTAdvancedModule::Connect (const nsWireless::CCell& Cell,
-+ nsNet::CInterface *pIface)
- throw (nsErrors::CSystemExc, std::bad_alloc)
- {
-+ pIface->Down();
-+ m_pDriver->SetSSID (Cell.GetSSID());
-+ pIface->Up();
- m_pDriver->SetMode (nsWireless::GetMatchingMode (Cell.GetMode()));
- m_pDriver->SetChannel (Cell.GetChannel());
-- m_pDriver->SetSSID (Cell.GetSSID());
- m_pDriver->SetEncryption (Cell.GetEncryptionD());
- m_pDriver->SetSSID (Cell.GetSSID());
- try
-@@ -381,10 +401,11 @@
- } // Connect()
-
-
--void nsCore::CRTAdvancedModule::ApplyProfile (unsigned Pos)
-+void nsCore::CRTAdvancedModule::ApplyProfile (unsigned Pos,
-+ nsNet::CInterface* pIface)
- throw (nsErrors::CSystemExc)
- {
-- ApplyRTxxProfile (m_ProfilesFile [Pos], *m_pDriver);
-+ ApplyRTxxProfile (m_ProfilesFile [Pos], *m_pDriver, pIface);
-
- } // ApplyProfile()
-
-@@ -517,12 +538,15 @@
- } // BecomeRoot()
-
-
--void nsCore::CRT2570Module::Connect (const nsWireless::CCell& Cell)
-+void nsCore::CRT2570Module::Connect (const nsWireless::CCell& Cell,
-+ nsNet::CInterface *pIface)
- throw (nsErrors::CSystemExc, std::bad_alloc)
- {
-+ pIface->Down();
-+ m_pDriver->SetSSID (Cell.GetSSID());
-+ pIface->Up();
- m_pDriver->SetMode (nsWireless::GetMatchingMode (Cell.GetMode()));
- m_pDriver->SetChannel (Cell.GetChannel());
-- m_pDriver->SetSSID (Cell.GetSSID());
- m_pDriver->SetEncryption (Cell.GetEncryptionD());
- m_pDriver->SetAPMacAddr (Cell.GetAPMacAddress());
- m_pDriver->SetSSID (Cell.GetSSID());
-@@ -530,10 +554,11 @@
- } // Connect()
-
-
--void nsCore::CRT2570Module::ApplyProfile (unsigned Pos)
-+void nsCore::CRT2570Module::ApplyProfile (unsigned Pos,
-+ nsNet::CInterface* pIface)
- throw (nsErrors::CSystemExc)
- {
-- ApplyRTxxProfile (m_ProfilesFile [Pos], *m_pDriver);
-+ ApplyRTxxProfile (m_ProfilesFile [Pos], *m_pDriver, pIface);
- // ? FIXME ? Does the SSID need to be set again? (WPA)
-
- } // ApplyProfile()
--- rutilt.orig/lib/src/GtkGUI.cxx
+++ rutilt/lib/src/GtkGUI.cxx
-@@ -384,7 +384,7 @@
- #ifndef NDEBUG
- std::cerr << "Applying the profile (command line)...\n";
- #endif // NDEBUG
-- m_pModule->ApplyProfile (I);
-+ m_pModule->ApplyProfile (I, m_pIface.get());
- }
- #ifndef NDEBUG
- else
-@@ -582,7 +582,7 @@
- }
- else
- */
-- m_pModule->Connect (Cell);
-+ m_pModule->Connect (Cell, m_pIface.get());
- SelectMatchingProfile (Cell);
- // TODO Use FillCell() instead of AskUser() ?
- if (AskUser ("Use dhcp with this network?", m_pWindow))
@@ -697,6 +697,7 @@
if (BecomeRoot())
{
@@ -187,130 +29,6 @@
This->ProcessError (Exc);
}
This->m_SiteSurveyTab.ScanningStopped();
-@@ -818,7 +821,8 @@
- {
- if (BecomeRoot())
- {
-- m_pModule->ApplyProfile (m_ProfileTab.GetSelectedRow());
-+ m_pModule->ApplyProfile (m_ProfileTab.GetSelectedRow(),
-+ m_pIface.get());
- SetIPFromProfile();
- ::g_timeout_add (800, reinterpret_cast< ::gboolean (*) (void*)>
- (RefreshRateDelayedCallBack), this);
---- rutilt.orig/include/CWE17Module.h
-+++ rutilt/include/CWE17Module.h
-@@ -70,12 +70,13 @@
- (::GtkWindow*, const nsWireless::CCell&) throw();
- bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
-- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
-+ void ApplyProfile (unsigned, nsNet::CInterface*)
-+ throw (nsErrors::CSystemExc);
- /** \warning No bound check! */
- nsUserData::CProfile& GetProfile (unsigned) throw();
- unsigned GetNbProfile () const throw();
- void RecordProfiles () throw (nsErrors::CException);
-- void Connect (const nsWireless::CCell&)
-+ void Connect (const nsWireless::CCell&, nsNet::CInterface*)
- throw (nsErrors::CSystemExc, std::bad_alloc);
- ::GtkWidget* GetPrivateTab () throw();
- void BecomeRoot () throw (nsErrors::CException, std::bad_alloc);
---- rutilt.orig/include/Module.h
-+++ rutilt/include/Module.h
-@@ -51,6 +51,10 @@
-
-
-
-+namespace nsNet{class CInterface;}
-+
-+
-+
- namespace nsCore
- {
- class ICLIModule
-@@ -78,11 +82,12 @@
- (::GtkWindow*, const nsWireless::CCell&) throw() = 0;
- virtual bool EditProfile (::GtkWindow*, unsigned) throw() = 0;
- virtual void DeleteProfile (unsigned) throw() = 0;
-- virtual void ApplyProfile (unsigned) throw (nsErrors::CSystemExc) = 0;
-+ virtual void ApplyProfile (unsigned, nsNet::CInterface*)
-+ throw (nsErrors::CSystemExc) = 0;
- virtual nsUserData::CProfile& GetProfile (unsigned) throw() = 0;
- virtual unsigned GetNbProfile () const throw() = 0;
- virtual void RecordProfiles () throw (nsErrors::CException) = 0;
-- virtual void Connect (const nsWireless::CCell&)
-+ virtual void Connect (const nsWireless::CCell&, nsNet::CInterface*)
- throw (nsErrors::CSystemExc, std::bad_alloc) = 0;
- /** \return A GUI component to set driver specific parameters (may
- * return 0 if none). */
---- rutilt.orig/include/RTModules.h
-+++ rutilt/include/RTModules.h
-@@ -107,11 +107,12 @@
- (::GtkWindow*, const nsWireless::CCell&) throw();
- bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
-- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
-+ void ApplyProfile (unsigned, nsNet::CInterface*)
-+ throw (nsErrors::CSystemExc);
- nsUserData::CProfile& GetProfile (unsigned) throw();
- unsigned GetNbProfile () const throw();
- void RecordProfiles () throw (nsErrors::CException);
-- void Connect (const nsWireless::CCell&)
-+ void Connect (const nsWireless::CCell&, nsNet::CInterface*)
- throw (nsErrors::CSystemExc, std::bad_alloc);
- ::GtkWidget* GetPrivateTab () throw();
-
-@@ -173,11 +174,12 @@
- (::GtkWindow*, const nsWireless::CCell&) throw();
- bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
-- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
-+ void ApplyProfile (unsigned, nsNet::CInterface*)
-+ throw (nsErrors::CSystemExc);
- nsUserData::CProfile& GetProfile (unsigned) throw();
- unsigned GetNbProfile () const throw();
- void RecordProfiles () throw (nsErrors::CException);
-- void Connect (const nsWireless::CCell&)
-+ void Connect (const nsWireless::CCell&, nsNet::CInterface*)
- throw (nsErrors::CSystemExc, std::bad_alloc);
- ::GtkWidget* GetPrivateTab () throw();
-
-@@ -339,11 +341,12 @@
- (::GtkWindow*, const nsWireless::CCell&) throw();
- bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
-- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
-+ void ApplyProfile (unsigned, nsNet::CInterface*)
-+ throw (nsErrors::CSystemExc);
- nsUserData::CProfile& GetProfile (unsigned) throw();
- unsigned GetNbProfile () const throw();
- void RecordProfiles () throw (nsErrors::CException);
-- void Connect (const nsWireless::CCell&)
-+ void Connect (const nsWireless::CCell&, nsNet::CInterface*)
- throw (nsErrors::CSystemExc, std::bad_alloc);
- ::GtkWidget* GetPrivateTab () throw();
-
---- rutilt.orig/lib/src/CWE17Module.cxx
-+++ rutilt/lib/src/CWE17Module.cxx
-@@ -127,7 +127,7 @@
- } // EditNewProfile()
-
-
--void nsCore::CWE17Module::ApplyProfile (unsigned Pos)
-+void nsCore::CWE17Module::ApplyProfile (unsigned Pos, nsNet::CInterface*)
- throw (nsErrors::CSystemExc)
- {
- ::ApplyProfile (m_ProfilesFile [Pos], *m_pDriver);
-@@ -135,7 +135,8 @@
- } // ApplyProfile()
-
-
--void nsCore::CWE17Module::Connect (const nsWireless::CCell& Cell)
-+void nsCore::CWE17Module::Connect (const nsWireless::CCell& Cell,
-+ nsNet::CInterface*)
- throw (nsErrors::CSystemExc, std::bad_alloc)
- {
- // Only the txrate is not set, but it should be enough without it.
--- rutilt.orig/lib/src/NetTools.cxx
+++ rutilt/lib/src/NetTools.cxx
@@ -190,7 +190,7 @@
More information about the Pkg-ralink-commits
mailing list