X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce52ac88bc9e689db478bbe86c3559ad1edc5959..dde4740fe1dddbb2738a0afd054f493cb0dd67d1:/src/unix/dialup.cpp diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 7b4387defb..8526915b7b 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -1,20 +1,23 @@ -// -*- c++ -*- /////////////////////////////////////////////////////////////// +// -*- c++ -*- //////////////////////////////////////////////////////////////// // Name: unix/dialup.cpp -// Purpose: Network related wxWindows classes and functions +// Purpose: Network related wxWidgets classes and functions // Author: Karsten Ballüder // Modified by: // Created: 03.10.99 // RCS-ID: $Id$ // Copyright: (c) Karsten Ballüder // Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" - -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) # pragma implementation "dialup.h" #endif +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/setup.h" + #if wxUSE_DIALUP_MANAGER #ifndef WX_PRECOMP @@ -28,7 +31,7 @@ #include "wx/filefn.h" #include "wx/utils.h" #include "wx/log.h" -#include "wx/file.h" +#include "wx/ffile.h" #include "wx/process.h" #include "wx/intl.h" #include "wx/app.h" @@ -46,6 +49,9 @@ #include #include +DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED) +DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED) + // ---------------------------------------------------------------------------- // A class which groups functions dealing with connecting to the network from a // workstation using dial-up access to the net. There is at most one instance @@ -96,7 +102,7 @@ public: const wxString& WXUNUSED(password), bool async); - /// Hang up the currently active dial up connection. + // Hang up the currently active dial up connection. virtual bool HangUp(); // returns TRUE if the computer is connected to the network: under Windows, @@ -104,21 +110,15 @@ public: // the "well-known host" (as specified by SetWellKnownHost) is reachable virtual bool IsOnline() const { - if( (! m_timer) // we are not polling, so test now: - || m_IsOnline < 0 - ) - CheckStatus(); - return m_IsOnline != 0; + CheckStatus(); + return m_IsOnline == Net_Connected; } - /// do we have a constant net connection? -- GUESS! - bool IsAlwaysOnline() const - { - ((wxDialUpManagerImpl *) this)->HangUp(); // brutal but necessary - return IsOnline(); - } - /// returns TRUE if (async) dialing is in progress - inline virtual bool IsDialing() const + // do we have a constant net connection? + virtual bool IsAlwaysOnline() const; + + // returns TRUE if (async) dialing is in progress + virtual bool IsDialing() const { return m_DialProcess != NULL; } // cancel dialing the number initiated with Dial(async = TRUE) @@ -133,7 +133,7 @@ public: // allows to forcefully set the online status - whatever our internal // algorithm may think about it. virtual void SetOnlineStatus(bool isOnline = TRUE) - { m_IsOnline = isOnline; } + { m_IsOnline = isOnline ? Net_Connected : Net_No; } // set misc wxDialUpManager options // -------------------------------- @@ -162,54 +162,87 @@ public: virtual void SetConnectCommand(const wxString &command, const wxString &hupcmd) { m_ConnectCommand = command; m_HangUpCommand = hupcmd; } +//private: -- Sun CC 4.2 objects to using NetConnection enum as the return +// type if it is declared private + + // the possible results of testing for Online() status + enum NetConnection + { + Net_Unknown = -1, // we couldn't learn anything + Net_No, // no network connection [currently] + Net_Connected // currently connected + }; + + // the possible net connection types + enum NetDeviceType + { + NetDevice_None = 0x0000, // no network devices (authoritative) + NetDevice_Unknown = 0x0001, // test doesn't work on this OS + NetDevice_Modem = 0x0002, // we have a modem + NetDevice_LAN = 0x0004 // a network card + }; + private: - /// -1: don´t know, 0 = no, 1 = yes - int m_IsOnline; + // the current status + NetConnection m_IsOnline; - /// Can we use ifconfig to list active devices? + // the connection we have with the network card + NetConnection m_connCard; + + // Can we use ifconfig to list active devices? int m_CanUseIfconfig; - /// The path to ifconfig + + // The path to ifconfig wxString m_IfconfigPath; - /// Can we use ping to find hosts? + // Can we use ping to find hosts? int m_CanUsePing; - /// The path to ping program + // The path to ping program wxString m_PingPath; - /// beacon host: + // beacon host: wxString m_BeaconHost; - /// beacon host portnumber for connect: + // beacon host portnumber for connect: int m_BeaconPort; - /// command to connect to network + // command to connect to network wxString m_ConnectCommand; - /// command to hang up + // command to hang up wxString m_HangUpCommand; - /// name of ISP + // name of ISP wxString m_ISPname; - /// a timer for regular testing + // a timer for regular testing class AutoCheckTimer *m_timer; friend class AutoCheckTimer; - /// a wxProcess for dialling in background + // a wxProcess for dialling in background class wxDialProcess *m_DialProcess; - /// pid of dial process + // pid of dial process int m_DialPId; friend class wxDialProcess; - /// determine status + // determine status void CheckStatus(bool fromAsync = FALSE) const; - /// real status check - void CheckStatusInternal(void); + // real status check + void CheckStatusInternal(); + + // check /proc/net (Linux only) for ppp/eth interfaces, returns the bit + // mask of NetDeviceType constants + int CheckProcNet(); - /// Check output of ifconfig command for PPP/SLIP/PLIP devices - int CheckIfconfig(void); - /// Ping a host: 1 on success, -1 if it cannot be used, 0 if unreachable - int CheckPing(void); - /// Check by connecting to host on given port. - int CheckConnect(void); + // check output of ifconfig command for PPP/SLIP/PLIP devices, returns the + // bit mask of NetDeviceType constants + int CheckIfconfig(); + // combines the 2 possible checks for determining the connection status + NetConnection CheckConnectAndPing(); + + // pings a host + NetConnection CheckPing(); + + // check by connecting to host on given port. + NetConnection CheckConnect(); }; @@ -217,21 +250,18 @@ class AutoCheckTimer : public wxTimer { public: AutoCheckTimer(wxDialUpManagerImpl *dupman) - { - m_dupman = dupman; - m_started = FALSE; - } - - virtual bool Start( int millisecs = -1, bool WXUNUSED(one_shot) = FALSE ) - { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); } + { + m_dupman = dupman; + } virtual void Notify() - { wxLogTrace(wxT("Checking dial up network status.")); m_dupman->CheckStatus(); } + { + wxLogTrace(_T("dialup"), wxT("Checking dial up network status.")); + + m_dupman->CheckStatus(); + } - virtual void Stop() - { if ( m_started ) wxTimer::Stop(); } public: - bool m_started; wxDialUpManagerImpl *m_dupman; }; @@ -242,7 +272,7 @@ public: { m_DupMan = dupman; } - void Disconnect(void) { m_DupMan = NULL; } + void Disconnect() { m_DupMan = NULL; } virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) { if(m_DupMan) @@ -258,7 +288,8 @@ private: wxDialUpManagerImpl::wxDialUpManagerImpl() { - m_IsOnline = -2; // -1 or -2, unknown + m_IsOnline = + m_connCard = Net_Unknown; m_DialProcess = NULL; m_timer = NULL; m_CanUseIfconfig = -1; // unknown @@ -296,9 +327,8 @@ wxDialUpManagerImpl::Dial(const wxString &isp, const wxString & WXUNUSED(password), bool async) { - if(m_IsOnline == 1) + if(m_IsOnline == Net_Connected) return FALSE; - m_IsOnline = -1; m_ISPname = isp; wxString cmd; if(m_ConnectCommand.Find(wxT("%s"))) @@ -309,7 +339,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp, if ( async ) { m_DialProcess = new wxDialProcess(this); - m_DialPId = wxExecute(cmd, FALSE, m_DialProcess); + m_DialPId = (int)wxExecute(cmd, FALSE, m_DialProcess); if(m_DialPId == 0) { delete m_DialProcess; @@ -323,17 +353,15 @@ wxDialUpManagerImpl::Dial(const wxString &isp, return wxExecute(cmd, /* sync */ TRUE) == 0; } -bool -wxDialUpManagerImpl::HangUp(void) +bool wxDialUpManagerImpl::HangUp() { - if(m_IsOnline == 0) + if(m_IsOnline == Net_No) return FALSE; if(IsDialing()) { wxLogError(_("Already dialling ISP.")); return FALSE; } - m_IsOnline = -1; wxString cmd; if(m_HangUpCommand.Find(wxT("%s"))) cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess); @@ -343,16 +371,14 @@ wxDialUpManagerImpl::HangUp(void) } -bool -wxDialUpManagerImpl::CancelDialing() +bool wxDialUpManagerImpl::CancelDialing() { if(! IsDialing()) return FALSE; return kill(m_DialPId, SIGTERM) > 0; } -bool -wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds) +bool wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds) { DisableAutoCheckOnlineStatus(); m_timer = new AutoCheckTimer(this); @@ -365,8 +391,7 @@ wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds) return rc; } -void -wxDialUpManagerImpl::DisableAutoCheckOnlineStatus() +void wxDialUpManagerImpl::DisableAutoCheckOnlineStatus() { if(m_timer != NULL) { @@ -377,10 +402,16 @@ wxDialUpManagerImpl::DisableAutoCheckOnlineStatus() } -void -wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) +void wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) { - /// does hostname contain a port number? + if(hostname.Length() == 0) + { + m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST; + m_BeaconPort = 80; + return; + } + + // does hostname contain a port number? wxString port = hostname.After(wxT(':')); if(port.Length()) { @@ -395,53 +426,139 @@ wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) } -void -wxDialUpManagerImpl::CheckStatus(bool fromAsync) const +void wxDialUpManagerImpl::CheckStatus(bool fromAsync) const { - // This function calls the CheckStatusInternal() helper function - // which is OS - specific and then sends the events. - - int oldIsOnline = m_IsOnline; - ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal(); - - // now send the events as appropriate: - if(m_IsOnline != oldIsOnline && m_IsOnline != -1 && oldIsOnline != -2) // -2: first time! - { - wxDialUpEvent event(m_IsOnline, ! fromAsync); - (void)wxTheApp->ProcessEvent(event); - } + // This function calls the CheckStatusInternal() helper function + // which is OS - specific and then sends the events. + + NetConnection oldIsOnline = m_IsOnline; + ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal(); + + // now send the events as appropriate: i.e. if the status changed and + // if we're in defined state + if(m_IsOnline != oldIsOnline + && m_IsOnline != Net_Unknown + && oldIsOnline != Net_Unknown ) + { + wxDialUpEvent event(m_IsOnline == Net_Connected, ! fromAsync); + (void)wxTheApp->ProcessEvent(event); + } } /* - We have three methods that we can use: + We first try to find out if ppp interface is active. If it is, we assume + that we're online but don't have a permanent connection (this is false if a + networked machine uses modem to connect to somewhere else, but we can't do + anything in this case anyhow). + + If no ppp interface is detected, we check for eth interface. If it is + found, we check that we can, indeed, connect to an Internet host. The logic + here is that connection check should be fast enough in this case and we + don't want to give false positives in a (common) case of a machine on a LAN + which is not connected to the outside. + + If we didn't find either ppp or eth interfaces, we stop here and decide + that we're connected. However, if couldn't check for this, we try to ping a + remote host just in case. - 1. test via /sbin/ifconfig and grep for "sl", "ppp", "pl" - --> should be fast enough for regular polling - 2. test if we can reach the well known beacon host - --> too slow for polling - 3. check /proc/net/dev on linux?? - This method should be preferred, if possible. Need to do more - testing. + NB1: Checking for the interface presence can be done in 2 ways + a) reading /proc/net/dev under Linux + b) spawning ifconfig under any OS + The first method is faster but only works under Linux. + + NB2: pinging, actually, means that we first try to connect "manually" to + a port on remove machine and if it fails, we run ping. */ -void -wxDialUpManagerImpl::CheckStatusInternal(void) +void wxDialUpManagerImpl::CheckStatusInternal() { - m_IsOnline = -1; + m_IsOnline = Net_Unknown; + + // first do quick checks to determine what kind of network devices do we + // have + int netDeviceType = CheckProcNet(); + if ( netDeviceType == NetDevice_Unknown ) + { + // nothing found, try ifconfig too + netDeviceType = CheckIfconfig(); + } + + switch ( netDeviceType ) + { + case NetDevice_None: + // no network devices, no connection + m_IsOnline = Net_No; + break; + + case NetDevice_LAN: + // we still do ping to confirm that we're connected but we only do + // it once and hope that the purpose of the network card (i.e. + // whether it used for connecting to the Internet or just to a + // LAN) won't change during the program lifetime + if ( m_connCard == Net_Unknown ) + { + m_connCard = CheckConnectAndPing(); + } + m_IsOnline = m_connCard; + break; + + case NetDevice_Unknown: + // try to ping just in case + m_IsOnline = CheckConnectAndPing(); + break; + + case NetDevice_LAN + NetDevice_Modem: + case NetDevice_Modem: + // assume we're connected + m_IsOnline = Net_Connected; + break; + + default: + wxFAIL_MSG(_T("Unexpected netDeviceType")); + } +} - int testResult; +bool wxDialUpManagerImpl::IsAlwaysOnline() const +{ + wxDialUpManagerImpl *self = wxConstCast(this, wxDialUpManagerImpl); + + int netDeviceType = self->CheckProcNet(); + if ( netDeviceType == NetDevice_Unknown ) + { + // nothing found, try ifconfig too + netDeviceType = self->CheckIfconfig(); + } + + if ( netDeviceType == NetDevice_Unknown ) + { + // this is the only thing we can do unfortunately... + self->HangUp(); + return IsOnline(); + } + else + { + // we are only permanently online if we have a network card + return (netDeviceType & NetDevice_LAN) != 0; + } +} + +wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckConnectAndPing() +{ + NetConnection conn; - testResult = CheckConnect(); - if(testResult == -1) - testResult = CheckIfconfig(); - if(testResult == -1) - testResult = CheckPing(); - m_IsOnline = testResult; + // first try connecting - faster + conn = CheckConnect(); + if ( conn == Net_Unknown ) + { + // try pinging too + conn = CheckPing(); + } + + return conn; } -int -wxDialUpManagerImpl::CheckConnect(void) +wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckConnect() { // second method: try to connect to a well known host: // This can be used under Win 9x, too! @@ -449,7 +566,7 @@ wxDialUpManagerImpl::CheckConnect(void) struct sockaddr_in serv_addr; if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL) - return 0; // no DNS no net + return Net_No; // no DNS no net serv_addr.sin_family = hp->h_addrtype; memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length); @@ -458,155 +575,234 @@ wxDialUpManagerImpl::CheckConnect(void) int sockfd; if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) { - return -1; // no info + return Net_Unknown; // no info } if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) >= 0) { close(sockfd); - return 1; // we cant connect, so we have a network! + return Net_Connected; // we can connect, so we have a network! + } + else // failed to connect + { + if(errno == ENETUNREACH) + return Net_No; // network is unreachable + else + return Net_Unknown; // connect failed, but don't know why } - //connected! - close(sockfd); - if(errno == ENETUNREACH) - return 0; // network is unreachable - // connect failed, but don't know why - return -1; } + int -wxDialUpManagerImpl::CheckIfconfig(void) +wxDialUpManagerImpl::CheckProcNet() { - int rc = -1; + // assume that the test doesn't work + int netDevice = NetDevice_Unknown; + +#ifdef __LINUX__ + if (wxFileExists(_T("/proc/net/route"))) + { + // cannot use wxFile::Length because file doesn't support seeking, so + // use stdio directly + FILE *f = fopen("/proc/net/route", "rt"); + if (f != NULL) + { + // now we know that we will find all devices we may have + netDevice = NetDevice_None; + + char output[256]; + + while (fgets(output, 256, f) != NULL) + { + if ( strstr(output, "eth") ) // network card + { + netDevice |= NetDevice_LAN; + } + else if (strstr(output,"ppp") // ppp + || strstr(output,"sl") // slip + || strstr(output,"pl")) // plip + { + netDevice |= NetDevice_Modem; + } + } - // First time check for ifconfig location. We only use the variant which - // does not take arguments, a la GNU. - if ( m_CanUseIfconfig == -1 ) // unknown - { - static const wxChar *ifconfigLocations[] = - { - _T("/sbin"), // Linux, FreeBSD - _T("/usr/sbin"), // SunOS, Solaris, AIX, HP-UX - _T("/usr/etc"), // IRIX - }; - - for ( size_t n = 0; n < WXSIZEOF(ifconfigLocations); n++ ) - { - wxString path(ifconfigLocations[n]); - path << _T("/ifconfig"); - - if ( wxFileExists(path) ) - { - m_IfconfigPath = path; - break; - } - } - } + fclose(f); + } + } +#endif // __LINUX__ - wxLogNull ln; // suppress all error messages - // Let´s try the ifconfig method first, should be fastest: - if(m_CanUseIfconfig != 0) // unknown or yes - { - wxASSERT(m_IfconfigPath.length()); + return netDevice; +} + + +int +wxDialUpManagerImpl::CheckIfconfig() +{ +#ifdef __VMS + m_CanUseIfconfig = 0; + return -1; +#else + // assume that the test doesn't work + int netDevice = NetDevice_Unknown; + + // first time check for ifconfig location + if ( m_CanUseIfconfig == -1 ) // unknown + { + static const wxChar *ifconfigLocations[] = + { + _T("/sbin"), // Linux, FreeBSD, Darwin + _T("/usr/sbin"), // SunOS, Solaris, AIX, HP-UX + _T("/usr/etc"), // IRIX + }; + + for ( size_t n = 0; n < WXSIZEOF(ifconfigLocations); n++ ) + { + wxString path(ifconfigLocations[n]); + path << _T("/ifconfig"); + + if ( wxFileExists(path) ) + { + m_IfconfigPath = path; + break; + } + } + } - wxString tmpfile = wxGetTempFileName("_wxdialuptest"); - wxString cmd = "/bin/sh -c \'"; - cmd << m_IfconfigPath; + if ( m_CanUseIfconfig != 0 ) // unknown or yes + { + wxLogNull ln; // suppress all error messages + + wxASSERT_MSG( m_IfconfigPath.length(), + _T("can't use ifconfig if it wasn't found") ); + + wxString tmpfile = wxGetTempFileName( wxT("_wxdialuptest") ); + wxString cmd = wxT("/bin/sh -c \'"); + cmd << m_IfconfigPath; #if defined(__SOLARIS__) || defined (__SUNOS__) - // need to add -a flag - cmd << " -a"; -#elif defined(__LINUX__) || defined (__FREEBSD__) || defined(__SGI__) - // nothing to be added to ifconfig + // need to add -a flag + cmd << wxT(" -a"); +#elif defined(__LINUX__) || defined(__SGI__) + // nothing to be added to ifconfig +#elif defined(__FREEBSD__) || defined(__DARWIN__) + // add -l flag + cmd << wxT(" -l"); +#elif defined(__HPUX__) + // VZ: a wild guess (but without it, ifconfig fails completely) + cmd << wxT(" ppp0"); #else -# pragma warning "No ifconfig information for this OS." - m_CanUseIfconfig = 0; - return -1; +# pragma warning "No ifconfig information for this OS." + m_CanUseIfconfig = 0; + return -1; #endif - cmd << " >" << tmpfile << '\''; - /* 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 - the shell first. I have no idea why. :-( (KB) */ - if(wxExecute(cmd,TRUE /* sync */) == 0) - { - m_CanUseIfconfig = 1; - wxFile file; - if( file.Open(tmpfile) ) - { - char *output = new char [file.Length()+1]; - output[file.Length()] = '\0'; - if(file.Read(output,file.Length()) == file.Length()) + 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 + the shell first. I have no idea why. :-( (KB) */ + if ( wxExecute(cmd,TRUE /* sync */) == 0 ) + { + m_CanUseIfconfig = 1; + wxFFile file; + if( file.Open(tmpfile) ) { - // FIXME shouldn't we grep for "^ppp"? (VZ) + wxString output; + if ( file.ReadAll(&output) ) + { + // FIXME shouldn't we grep for "^ppp"? (VZ) + + bool hasModem = FALSE, + hasLAN = FALSE; #if defined(__SOLARIS__) || defined (__SUNOS__) - // dialup device under SunOS/Solaris - rc = strstr(output,"ipdptp") != (char *)NULL; + // 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__) - rc = strstr(output,"ppp") // ppp - || strstr(output,"sl") // slip - || strstr(output,"pl"); // plip + hasModem = strstr(output.fn_str(),"ppp") // ppp + || strstr(output.fn_str(),"sl") // slip + || strstr(output.fn_str(),"pl"); // plip + hasLAN = strstr(output.fn_str(), "eth") != NULL; #elif defined(__SGI__) // IRIX - rc = strstr(output, "ppp"); // PPP + hasModem = strstr(output, "ppp") != NULL; // PPP +#elif defined(__HPUX__) + // if could run ifconfig on interface, then it exists + hasModem = TRUE; #endif + + netDevice = NetDevice_None; + if ( hasModem ) + netDevice |= NetDevice_Modem; + if ( hasLAN ) + netDevice |= NetDevice_LAN; + } + //else: error reading the file } - file.Close(); - delete [] output; - } - // else rc remains -1 as we don't know for sure - } - else // could not run ifconfig correctly - m_CanUseIfconfig = 0; // don´t try again - (void) wxRemoveFile(tmpfile); - } - return rc; + //else: error opening the file + } + else // could not run ifconfig correctly + { + m_CanUseIfconfig = 0; // don´t try again + } + + (void) wxRemoveFile(tmpfile); + } + + return netDevice; +#endif } -int -wxDialUpManagerImpl::CheckPing(void) +wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing() { - if(! m_CanUsePing) - return -1; - - // First time check for ping location. We only use the variant - // which does not take arguments, a la GNU. - if(m_CanUsePing == -1) // unknown - { - if(wxFileExists("/bin/ping")) - m_PingPath = "/bin/ping"; - else if(wxFileExists("/usr/sbin/ping")) - m_PingPath = "/usr/sbin/ping"; - if(! m_PingPath) - { - m_CanUsePing = 0; - return -1; - } - } + // First time check for ping location. We only use the variant + // which does not take arguments, a la GNU. + if(m_CanUsePing == -1) // unknown + { +#ifdef __VMS + if (wxFileExists( wxT("SYS$SYSTEM:TCPIP$PING.EXE") )) + m_PingPath = wxT("$SYS$SYSTEM:TCPIP$PING"); +#else + if (wxFileExists( wxT("/bin/ping") )) + m_PingPath = wxT("/bin/ping"); + else if (wxFileExists( wxT("/usr/sbin/ping") )) + m_PingPath = wxT("/usr/sbin/ping"); +#endif + if (!m_PingPath) + { + m_CanUsePing = 0; + } + } + + if(! m_CanUsePing) + { + // we didn't find ping + return Net_Unknown; + } wxLogNull ln; // suppress all error messages wxASSERT(m_PingPath.length()); wxString cmd; - cmd << m_PingPath << ' '; + cmd << m_PingPath << wxT(' '); #if defined(__SOLARIS__) || defined (__SUNOS__) // nothing to add to ping command -#elif defined(__LINUX__) - cmd << "-c 1 "; // only ping once +#elif defined(__LINUX__) || defined (__BSD__) || defined( __VMS ) + cmd << wxT("-c 1 "); // only ping once +#elif defined(__HPUX__) + cmd << wxT("64 1 "); // only ping once (need also specify the packet size) #else # pragma warning "No Ping information for this OS." m_CanUsePing = 0; - return -1; + return Net_Unknown; #endif cmd << m_BeaconHost; if(wxExecute(cmd, TRUE /* sync */) == 0) - return 1; + return Net_Connected; else - return 0; + return Net_No; } /* static */ -wxDialUpManager * -wxDialUpManager::Create(void) +wxDialUpManager *wxDialUpManager::Create() { return new wxDialUpManagerImpl; }