X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/unix/dialup.cpp diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index e90fc222ec..094b0ba406 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -1,11 +1,11 @@ // -*- c++ -*- //////////////////////////////////////////////////////////////// // Name: src/unix/dialup.cpp // Purpose: Network related wxWidgets classes and functions -// Author: Karsten Ballüder +// Author: Karsten Ballüder // Modified by: // Created: 03.10.99 // RCS-ID: $Id$ -// Copyright: (c) Karsten Ballüder +// Copyright: (c) Karsten Ballüder // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -22,14 +22,14 @@ #include "wx/log.h" #include "wx/event.h" #include "wx/app.h" + #include "wx/utils.h" + #include "wx/timer.h" #endif // !PCH -#include "wx/timer.h" -#include "wx/filefn.h" -#include "wx/utils.h" +#include "wx/filename.h" #include "wx/ffile.h" #include "wx/process.h" -#include "wx/wxchar.h" +#include "wx/crt.h" #include @@ -43,8 +43,8 @@ #include #include -DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED) -DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED) +wxDEFINE_EVENT( wxEVT_DIALUP_CONNECTED, wxDialUpEvent ); +wxDEFINE_EVENT( wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent ); // ---------------------------------------------------------------------------- // A class which groups functions dealing with connecting to the network from a @@ -73,7 +73,7 @@ class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager { public: wxDialUpManagerImpl(); - ~wxDialUpManagerImpl(); + virtual ~wxDialUpManagerImpl(); /** Could the dialup manager be initialized correctly? If this function returns false, no other functions will work neither, so it's a good idea @@ -250,7 +250,7 @@ public: virtual void Notify() { - wxLogTrace(_T("dialup"), wxT("Checking dial up network status.")); + wxLogTrace(wxT("dialup"), wxT("Checking dial up network status.")); m_dupman->CheckStatus(); } @@ -292,15 +292,15 @@ wxDialUpManagerImpl::wxDialUpManagerImpl() m_BeaconPort = 80; #ifdef __SGI__ - m_ConnectCommand = _T("/usr/etc/ppp"); + m_ConnectCommand = wxT("/usr/etc/ppp"); #elif defined(__LINUX__) // default values for Debian/GNU linux - m_ConnectCommand = _T("pon"); - m_HangUpCommand = _T("poff"); + m_ConnectCommand = wxT("pon"); + m_HangUpCommand = wxT("poff"); #endif - wxChar * dial = wxGetenv(_T("WXDIALUP_DIALCMD")); - wxChar * hup = wxGetenv(_T("WXDIALUP_HUPCMD")); + wxChar * dial = wxGetenv(wxT("WXDIALUP_DIALCMD")); + wxChar * hup = wxGetenv(wxT("WXDIALUP_HUPCMD")); SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand, hup ? wxString(hup) : m_HangUpCommand); } @@ -336,8 +336,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp, m_DialPId = (int)wxExecute(cmd, false, m_DialProcess); if(m_DialPId == 0) { - delete m_DialProcess; - m_DialProcess = NULL; + wxDELETE(m_DialProcess); return false; } else @@ -379,8 +378,7 @@ bool wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds) bool rc = m_timer->Start(nSeconds*1000); if(! rc) { - delete m_timer; - m_timer = NULL; + wxDELETE(m_timer); } return rc; } @@ -390,15 +388,14 @@ void wxDialUpManagerImpl::DisableAutoCheckOnlineStatus() if(m_timer != NULL) { m_timer->Stop(); - delete m_timer; - m_timer = NULL; + wxDELETE(m_timer); } } void wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) { - if(hostname.length() == 0) + if( hostname.empty() ) { m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST; m_BeaconPort = 80; @@ -407,7 +404,7 @@ void wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) // does hostname contain a port number? wxString port = hostname.After(wxT(':')); - if(port.length()) + if( !port.empty() ) { m_BeaconHost = hostname.Before(wxT(':')); m_BeaconPort = wxAtoi(port); @@ -509,7 +506,7 @@ void wxDialUpManagerImpl::CheckStatusInternal() break; default: - wxFAIL_MSG(_T("Unexpected netDeviceType")); + wxFAIL_MSG(wxT("Unexpected netDeviceType")); } } @@ -580,9 +577,11 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckConnect() } else // failed to connect { +#ifdef ENETUNREACH if(errno == ENETUNREACH) return Net_No; // network is unreachable else +#endif return Net_Unknown; // connect failed, but don't know why } } @@ -595,7 +594,7 @@ wxDialUpManagerImpl::CheckProcNet() int netDevice = NetDevice_Unknown; #ifdef __LINUX__ - if (wxFileExists(_T("/proc/net/route"))) + if (wxFileExists(wxT("/proc/net/route"))) { // cannot use wxFile::Length because file doesn't support seeking, so // use stdio directly @@ -609,7 +608,10 @@ wxDialUpManagerImpl::CheckProcNet() while (fgets(output, 256, f) != NULL) { - if ( strstr(output, "eth") ) // network card + // Test for the known network interface names + if ( strstr(output, "eth") + || strstr(output, "wlan") + || strstr(output, "ath") ) { netDevice |= NetDevice_LAN; } @@ -643,18 +645,18 @@ wxDialUpManagerImpl::CheckIfconfig() // first time check for ifconfig location if ( m_CanUseIfconfig == -1 ) // unknown { - static const wxChar *ifconfigLocations[] = + static const wxChar *const ifconfigLocations[] = { - _T("/sbin"), // Linux, FreeBSD, Darwin - _T("/usr/sbin"), // SunOS, Solaris, AIX, HP-UX - _T("/usr/etc"), // IRIX - _T("/etc"), // AIX 5 + wxT("/sbin"), // Linux, FreeBSD, Darwin + wxT("/usr/sbin"), // SunOS, Solaris, AIX, HP-UX + wxT("/usr/etc"), // IRIX + wxT("/etc"), // AIX 5 }; for ( size_t n = 0; n < WXSIZEOF(ifconfigLocations); n++ ) { wxString path(ifconfigLocations[n]); - path << _T("/ifconfig"); + path << wxT("/ifconfig"); if ( wxFileExists(path) ) { @@ -668,20 +670,21 @@ wxDialUpManagerImpl::CheckIfconfig() { wxLogNull ln; // suppress all error messages - wxASSERT_MSG( m_IfconfigPath.length(), - _T("can't use ifconfig if it wasn't found") ); + wxASSERT_MSG( !m_IfconfigPath.empty(), + wxT("can't use ifconfig if it wasn't found") ); - wxString tmpfile = wxGetTempFileName( wxT("_wxdialuptest") ); + wxString tmpfile = wxFileName::CreateTempFileName( wxT("_wxdialuptest") ); wxString cmd = wxT("/bin/sh -c \'"); cmd << m_IfconfigPath; #if defined(__AIX__) || \ + defined(__NETBSD__) || \ defined(__OSF__) || \ defined(__SOLARIS__) || defined (__SUNOS__) // need to add -a flag cmd << wxT(" -a"); -#elif defined(__LINUX__) || defined(__SGI__) +#elif defined(__LINUX__) || defined(__SGI__) || defined(__OPENBSD__) // nothing to be added to ifconfig -#elif defined(__FREEBSD__) || defined(__DARWIN__) +#elif defined(__FREEBSD__) || defined(__DARWIN__) || defined(__QNX__) // add -l flag cmd << wxT(" -l"); #elif defined(__HPUX__) @@ -700,7 +703,7 @@ wxDialUpManagerImpl::CheckIfconfig() cmd << wxT(" >") << tmpfile << wxT('\''); /* I tried to add an option to wxExecute() to not close stdout, so we could let ifconfig write directly to the tmpfile, but - this does not work. That should be faster, as it doesn´t call + this does not work. That should be faster, as it doesn't call the shell first. I have no idea why. :-( (KB) */ if ( wxExecute(cmd,true /* sync */) == 0 ) { @@ -718,9 +721,10 @@ wxDialUpManagerImpl::CheckIfconfig() #if defined(__SOLARIS__) || defined (__SUNOS__) // dialup device under SunOS/Solaris - hasModem = strstr(output.fn_str(),"ipdptp") != (char *)NULL; - hasLAN = strstr(output.fn_str(), "hme") != (char *)NULL; -#elif defined(__LINUX__) || defined (__FREEBSD__) + hasModem = strstr(output.fn_str(),"ipdptp") != NULL; + hasLAN = strstr(output.fn_str(), "hme") != NULL; +#elif defined(__LINUX__) || defined (__FREEBSD__) || defined (__QNX__) || \ + defined(__OPENBSD__) hasModem = strstr(output.fn_str(),"ppp") // ppp || strstr(output.fn_str(),"sl") // slip || strstr(output.fn_str(),"pl"); // plip @@ -744,7 +748,7 @@ wxDialUpManagerImpl::CheckIfconfig() } else // could not run ifconfig correctly { - m_CanUseIfconfig = 0; // don´t try again + m_CanUseIfconfig = 0; // don't try again } (void) wxRemoveFile(tmpfile); @@ -764,9 +768,9 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing() if (wxFileExists( wxT("SYS$SYSTEM:TCPIP$PING.EXE") )) m_PingPath = wxT("$SYS$SYSTEM:TCPIP$PING"); #elif defined(__AIX__) - m_PingPath = _T("/etc/ping"); + m_PingPath = wxT("/etc/ping"); #elif defined(__SGI__) - m_PingPath = _T("/usr/etc/ping"); + m_PingPath = wxT("/usr/etc/ping"); #else if (wxFileExists( wxT("/bin/ping") )) m_PingPath = wxT("/bin/ping"); @@ -796,7 +800,8 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing() defined(__LINUX__) || \ defined(__OSF__) || \ defined(__SGI__) || \ - defined(__VMS) + defined(__VMS) || \ + defined(__QNX__) cmd << wxT("-c 1 "); // only ping once #elif defined(__HPUX__) cmd << wxT("64 1 "); // only ping once (need also specify the packet size)