X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce52ac88bc9e689db478bbe86c3559ad1edc5959..0bafad0cf468cdd3b035ec8eb33e30a4e93eee42:/src/unix/dialup.cpp

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 7b4387defb..5bbfd306d0 100644
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -258,7 +258,12 @@ private:
 
 wxDialUpManagerImpl::wxDialUpManagerImpl()
 {
-   m_IsOnline = -2; // -1 or -2, unknown
+   /* The isOnline flag can have the following values internally:
+      0  : not connected
+      1  : connected
+      -1 : unknown/undefined status
+   */
+   m_IsOnline = -1; 
    m_DialProcess = NULL;
    m_timer = NULL;
    m_CanUseIfconfig = -1; // unknown
@@ -298,7 +303,6 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
 {
    if(m_IsOnline == 1)
       return FALSE;
-   m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;
    if(m_ConnectCommand.Find(wxT("%s")))
@@ -309,7 +313,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;
@@ -333,7 +337,6 @@ wxDialUpManagerImpl::HangUp(void)
       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);
@@ -380,6 +383,13 @@ wxDialUpManagerImpl::DisableAutoCheckOnlineStatus()
 void
 wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
 {
+   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())
@@ -405,7 +415,12 @@ wxDialUpManagerImpl::CheckStatus(bool fromAsync) const
    ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal();
 
    // now send the events as appropriate:
-   if(m_IsOnline != oldIsOnline && m_IsOnline != -1 && oldIsOnline != -2) // -2: first time!
+   if(m_IsOnline != oldIsOnline // it changed
+      && ( m_IsOnline == 1      // and it is a defined status
+           || m_IsOnline == 0)
+      // only send events for well defined transitions
+      && ( oldIsOnline == 1 || oldIsOnline == 0) 
+      )
    {
       wxDialUpEvent event(m_IsOnline, ! fromAsync);
       (void)wxTheApp->ProcessEvent(event);
@@ -518,6 +533,9 @@ wxDialUpManagerImpl::CheckIfconfig(void)
       cmd << " -a";
 #elif defined(__LINUX__) || defined (__FREEBSD__) || defined(__SGI__)
       // nothing to be added to ifconfig
+#elif defined(__HPUX__)
+      // VZ: a wild guess (but without it, ifconfig fails completely)
+      cmd << _T(" ppp0");
 #else
 #     pragma warning "No ifconfig information for this OS."
       m_CanUseIfconfig = 0;
@@ -548,7 +566,10 @@ wxDialUpManagerImpl::CheckIfconfig(void)
                     || strstr(output,"sl")  // slip
                     || strstr(output,"pl"); // plip
 #elif defined(__SGI__)  // IRIX
-               rc = strstr(output, "ppp"); // PPP
+               rc = (int) strstr(output, "ppp"); // PPP
+#elif defined(__HPUX__)
+               // if could run ifconfig on interface, then it exists
+               rc = TRUE;
 #endif
             }
             file.Close();
@@ -560,7 +581,8 @@ wxDialUpManagerImpl::CheckIfconfig(void)
          m_CanUseIfconfig = 0; // don´t try again
       (void) wxRemoveFile(tmpfile);
    }
-      return rc;
+
+   return rc;
 }
 
 int
@@ -592,6 +614,8 @@ wxDialUpManagerImpl::CheckPing(void)
    // nothing to add to ping command
 #elif defined(__LINUX__)
    cmd << "-c 1 "; // only ping once
+#elif defined(__HPUX__)
+   cmd << "64 1 "; // only ping once (need also specify the packet size)
 #else
 #   pragma warning "No Ping information for this OS."
    m_CanUsePing = 0;