X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c41c4404c0d4ec0a0095bc31ab6cc732f2126c1..6474416b2ec2a63ebc28548733d93bbe5aded70d:/src/unix/dialup.cpp

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 2dac8544b8..fb16e317bb 100644
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -104,7 +104,7 @@ 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;
@@ -124,7 +124,7 @@ public:
    // NB: this won't result in DISCONNECTED event being sent
    virtual bool CancelDialing();
 
-   unsigned int GetISPNames(class wxArrayString &) const
+   size_t GetISPNames(class wxArrayString &) const
       { return 0; }
    
    // sometimes the built-in logic for determining the online status may fail,
@@ -212,7 +212,7 @@ public:
       { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
 
    virtual void Notify()
-      { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
+      { wxLogTrace(wxT("Checking dial up network status.")); m_dupman->CheckStatus(); }
 
    virtual void Stop()
       { if ( m_started ) wxTimer::Stop(); }
@@ -228,10 +228,14 @@ public:
       {
          m_DupMan = dupman;
       }
+   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;
@@ -240,24 +244,30 @@ 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
+#if 0
    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); 
+#endif
 }
 
 wxDialUpManagerImpl::~wxDialUpManagerImpl()
 {
    if(m_timer) delete m_timer;
-   if(m_DialProcess) m_DialProcess->Detach();
+   if(m_DialProcess)
+   {
+      m_DialProcess->Disconnect();
+      m_DialProcess->Detach();
+   }
 }
 
 bool
@@ -271,7 +281,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
    m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;
-   if(m_ConnectCommand.Find("%s"))
+   if(m_ConnectCommand.Find(wxT("%s")))
       cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
    else
       cmd = m_ConnectCommand;
@@ -305,7 +315,7 @@ wxDialUpManagerImpl::HangUp(void)
    }
    m_IsOnline = -1;
    wxString cmd;
-   if(m_HangUpCommand.Find("%s"))
+   if(m_HangUpCommand.Find(wxT("%s")))
       cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);
    else
       cmd = m_HangUpCommand;
@@ -324,7 +334,7 @@ wxDialUpManagerImpl::CancelDialing()
 bool
 wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds)
 {
-   wxASSERT(m_timer == NULL);
+   DisableAutoCheckOnlineStatus();
    m_timer = new AutoCheckTimer(this);
    bool rc = m_timer->Start(nSeconds*1000);
    if(! rc)
@@ -338,10 +348,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;
+   }
 }
 
 
@@ -349,11 +361,11 @@ void
 wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
 {
    /// does hostname contain a port number?
-   wxString port = hostname.After(':');
+   wxString port = hostname.After(wxT(':'));
    if(port.Length())
    {
-      m_BeaconHost = hostname.Before(':');
-      m_BeaconPort = atoi(port);
+      m_BeaconHost = hostname.Before(wxT(':'));
+      m_BeaconPort = wxAtoi(port);
    }
    else
    {
@@ -373,7 +385,7 @@ wxDialUpManagerImpl::CheckStatus(bool fromAsync) const
    ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal();
 
    // now send the events as appropriate:
-   if(m_IsOnline != oldIsOnline && oldIsOnline != -1)
+   if(m_IsOnline != oldIsOnline && m_IsOnline != -1 && oldIsOnline != -2) // -2: first time!
    {
       wxDialUpEvent event(m_IsOnline, ! fromAsync);
       (void)wxTheApp->ProcessEvent(event);
@@ -421,30 +433,6 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
          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 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;
@@ -475,13 +463,14 @@ 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;
 
    m_IsOnline = 0; // assume false
-   if((hp = gethostbyname(m_BeaconHost)) == NULL)
+   if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL)
       return; // no DNS no net
    
    serv_addr.sin_family		= hp->h_addrtype;
@@ -497,6 +486,8 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
       return;
    }
    
+#if 0
+   // this "ping" method does not work.
    if(sendto(sockfd, "hello",
              strlen("hello"), /* flags */ 0,
              (struct  sockaddr *) &serv_addr,
@@ -505,15 +496,15 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
       close(sockfd);
       return;
    }
-
-#if 0
+#endif
+   
    if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
    {
       //sys_error("cannot connect to server");
+      close(sockfd);
       return;
    }
    //connected!
-#endif
    close(sockfd);
    m_IsOnline = TRUE;
 }