X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/275abf24e140159f2ac19b64b76737a6903b1319..16a12a3d27d3d3e2557bcde15365245ef2675bb4:/src/unix/dialup.cpp diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 4985bd9ef7..cec1aa24d1 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -11,6 +11,10 @@ #include "wx/setup.h" +#ifdef __GNUG__ +# pragma implementation "dialup.h" +#endif + #if wxUSE_DIALUP_MANAGER #ifndef WX_PRECOMP @@ -28,6 +32,7 @@ #include "wx/process.h" #include "wx/intl.h" #include "wx/app.h" +#include "wx/wxchar.h" #include @@ -68,7 +73,7 @@ class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager public: wxDialUpManagerImpl(); ~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 to call this function and check its result before calling any other @@ -99,20 +104,29 @@ public: virtual bool IsOnline() const { if( (! m_timer) // we are not polling, so test now: - || m_IsOnline == -1 + || m_IsOnline < 0 ) CheckStatus(); return m_IsOnline != 0; } + /// 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 IsDialling() const + inline virtual bool IsDialing() const { return m_DialProcess != NULL; } // cancel dialing the number initiated with Dial(async = TRUE) // NB: this won't result in DISCONNECTED event being sent virtual bool CancelDialing(); + size_t GetISPNames(class wxArrayString &) const + { return 0; } + // sometimes the built-in logic for determining the online status may fail, // so, in general, the user should be allowed to override it. This function // allows to forcefully set the online status - whatever our internal @@ -176,7 +190,7 @@ private: /// pid of dial process int m_DialPId; friend class wxDialProcess; - + /// determine status void CheckStatus(bool fromAsync = FALSE) const; @@ -214,10 +228,14 @@ public: { m_DupMan = dupman; } - void OnTerminate(int pid, int status) const + void Disconnect(void) { m_DupMan = NULL; } + void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) const { - m_DupMan->m_DialProcess = NULL; - m_DupMan->CheckStatus(TRUE); + if(m_DupMan) + { + m_DupMan->m_DialProcess = NULL; + m_DupMan->CheckStatus(TRUE); + } } private: wxDialUpManagerImpl *m_DupMan; @@ -226,18 +244,28 @@ private: wxDialUpManagerImpl::wxDialUpManagerImpl() { - m_IsOnline = -1; // unknown + m_IsOnline = -2; // -1 or -2, unknown m_DialProcess = NULL; m_timer = NULL; m_CanUseIfconfig = -1; // unknown m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST; m_BeaconPort = 80; + SetConnectCommand("pon", "poff"); // default values for Debian/GNU linux + wxChar * dial = wxGetenv(_T("WXDIALUP_DIALCMD")); + wxChar * hup = wxGetenv(_T("WXDIALUP_HUPCMD")); + if(dial || hup) + SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand, + hup ? wxString(hup) : m_HangUpCommand); } wxDialUpManagerImpl::~wxDialUpManagerImpl() { if(m_timer) delete m_timer; - if(m_DialProcess) m_DialProcess->Detach(); + if(m_DialProcess) + { + m_DialProcess->Disconnect(); + m_DialProcess->Detach(); + } } bool @@ -278,7 +306,7 @@ wxDialUpManagerImpl::HangUp(void) { if(m_IsOnline == 0) return FALSE; - if(IsDialling()) + if(IsDialing()) { wxLogError(_("Already dialling ISP.")); return FALSE; @@ -296,7 +324,7 @@ wxDialUpManagerImpl::HangUp(void) bool wxDialUpManagerImpl::CancelDialing() { - if(! IsDialling()) + if(! IsDialing()) return FALSE; return kill(m_DialPId, SIGTERM) > 0; } @@ -318,10 +346,12 @@ wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds) void wxDialUpManagerImpl::DisableAutoCheckOnlineStatus() { - wxASSERT(m_timer != NULL); - m_timer->Stop(); - delete m_timer; - m_timer = NULL; + if(m_timer != NULL) + { + m_timer->Stop(); + delete m_timer; + m_timer = NULL; + } } @@ -353,7 +383,7 @@ wxDialUpManagerImpl::CheckStatus(bool fromAsync) const ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal(); // now send the events as appropriate: - if(m_IsOnline != oldIsOnline) + if(m_IsOnline != oldIsOnline && m_IsOnline != -1 && oldIsOnline != -2) // -2: first time! { wxDialUpEvent event(m_IsOnline, ! fromAsync); (void)wxTheApp->ProcessEvent(event); @@ -393,38 +423,14 @@ wxDialUpManagerImpl::CheckStatusInternal(void) if(m_CanUseIfconfig != 0) // unknown or yes { wxASSERT(m_IfconfigPath.length()); - + wxString tmpfile = wxGetTempFileName("_wxdialuptest"); wxString cmd = "/bin/sh -c \'"; cmd << m_IfconfigPath << " >" << 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 + this does not work. That should be faster, as it doesn´t call the shell first. I have no idea why. :-( (KB) */ -#if 0 - // temporarily redirect stdout/stderr: - int - new_stdout = dup(STDOUT_FILENO), - new_stderr = dup(STDERR_FILENO); - close(STDOUT_FILENO); - close(STDERR_FILENO); - - int - // new stdout: - output_fd = open(tmpfile, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR), - // new stderr: - null_fd = open("/dev/null", O_CREAT, S_IRUSR|S_IWUSR); - // verify well behaved unix behaviour: - wxASSERT(output_fd == STDOUT_FILENO); - wxASSERT(null_fd == STDERR_FILENO); - int rc = wxExecute(m_IfconfigPath,TRUE /* sync */,NULL ,wxEXECUTE_DONT_CLOSE_FDS); - close(null_fd); close(output_fd); - // restore old stdout, stderr: - int test; - test = dup(new_stdout); close(new_stdout); wxASSERT(test == STDOUT_FILENO); - test = dup(new_stderr); close(new_stderr); wxASSERT(test == STDERR_FILENO); - if(rc == 0) -#endif if(wxExecute(cmd,TRUE /* sync */) == 0) { m_CanUseIfconfig = 1; @@ -455,11 +461,11 @@ wxDialUpManagerImpl::CheckStatusInternal(void) return; } - // second method: try to connect to well known host: + // this was supposed to work like ping(8), but doesn´t. + // second method: try to connect to a well known host: // This can be used under Win 9x, too! struct hostent *hp; struct sockaddr_in serv_addr; - int sockfd; m_IsOnline = 0; // assume false if((hp = gethostbyname(m_BeaconHost)) == NULL) @@ -468,24 +474,43 @@ wxDialUpManagerImpl::CheckStatusInternal(void) serv_addr.sin_family = hp->h_addrtype; memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length); serv_addr.sin_port = htons(m_BeaconPort); + + // PING method: + + int sockfd; if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) { // sys_error("cannot create socket for gw"); return; } + +#if 0 + // this "ping" method does not work. + if(sendto(sockfd, "hello", + strlen("hello"), /* flags */ 0, + (struct sockaddr *) &serv_addr, + sizeof(serv_addr)) == -1) + { + close(sockfd); + return; + } +#endif + if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) - { + { //sys_error("cannot connect to server"); + close(sockfd); return; } //connected! close(sockfd); + m_IsOnline = TRUE; } /* static */ wxDialUpManager * -wxDialUpManager::wxDialUpManager::Create(void) +wxDialUpManager::Create(void) { return new wxDialUpManagerImpl; }