some != NULL checks

[wxWidgets.git] / src / unix / dialup.cpp

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 34a7906ac8d23389b2dbdb3995848e2c425889f8..6641d377b46a2f16c1fc5edf10dc099621562f63 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -104,11 +104,8 @@ public:
    // the "well-known host" (as specified by SetWellKnownHost) is reachable
    virtual bool IsOnline() const
       {
    // 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 > 0;

       }
 
    /// do we have a constant net connection? -- GUESS!
       }
 
    /// do we have a constant net connection? -- GUESS!


@@ -127,7 +124,7 @@ public:
 
    size_t GetISPNames(class wxArrayString &) const
       { return 0; }
 
    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
    // 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


@@ -175,7 +172,7 @@ private:
    int m_CanUsePing;
    /// The path to ping program
    wxString m_PingPath;
    int m_CanUsePing;
    /// The path to ping program
    wxString m_PingPath;

-   
+

    /// beacon host:
    wxString m_BeaconHost;
    /// beacon host portnumber for connect:
    /// beacon host:
    wxString m_BeaconHost;
    /// beacon host portnumber for connect:


@@ -203,13 +200,15 @@ private:
    /// real status check
    void CheckStatusInternal(void);
 
    /// real status check
    void CheckStatusInternal(void);
 

+   /// Check /proc/net (Linux only)
+   int CheckProcNet(void);

    /// 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
    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);

-   
+

 };
 
 
 };
 
 


@@ -258,19 +257,31 @@ private:
 
 wxDialUpManagerImpl::wxDialUpManagerImpl()
 {
 
 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
    m_CanUsePing = -1; // unknown
    m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
    m_BeaconPort = 80;
    m_DialProcess = NULL;
    m_timer = NULL;
    m_CanUseIfconfig = -1; // unknown
    m_CanUsePing = -1; // unknown
    m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
    m_BeaconPort = 80;

-   SetConnectCommand("pon", "poff"); // default values for Debian/GNU linux
+
+#ifdef __SGI__
+   m_ConnectCommand = _T("/usr/etc/ppp");
+#elif defined(__LINUX__)
+   // default values for Debian/GNU linux
+   m_ConnectCommand = _T("pon");
+   m_HangUpCommand = _T("poff");
+#endif
+

    wxChar * dial = wxGetenv(_T("WXDIALUP_DIALCMD"));
    wxChar * hup = wxGetenv(_T("WXDIALUP_HUPCMD"));
    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); 
+   SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand,
+                     hup ? wxString(hup) : m_HangUpCommand);

 }
 
 wxDialUpManagerImpl::~wxDialUpManagerImpl()
 }
 
 wxDialUpManagerImpl::~wxDialUpManagerImpl()


@@ -291,7 +302,6 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
 {
    if(m_IsOnline == 1)
       return FALSE;
 {
    if(m_IsOnline == 1)
       return FALSE;

-   m_IsOnline = -1;

    m_ISPname = isp;
    wxString cmd;
    if(m_ConnectCommand.Find(wxT("%s")))
    m_ISPname = isp;
    wxString cmd;
    if(m_ConnectCommand.Find(wxT("%s")))


@@ -302,7 +312,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
    if ( async )
    {
       m_DialProcess = new wxDialProcess(this);
    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;
       if(m_DialPId == 0)
       {
          delete m_DialProcess;


@@ -326,7 +336,6 @@ wxDialUpManagerImpl::HangUp(void)
       wxLogError(_("Already dialling ISP."));
       return FALSE;
    }
       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);
    wxString cmd;
    if(m_HangUpCommand.Find(wxT("%s")))
       cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);


@@ -373,6 +382,13 @@ wxDialUpManagerImpl::DisableAutoCheckOnlineStatus()
 void
 wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
 {
 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())
    /// does hostname contain a port number?
    wxString port = hostname.After(wxT(':'));
    if(port.Length())


@@ -398,7 +414,12 @@ wxDialUpManagerImpl::CheckStatus(bool fromAsync) const
    ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal();
 
    // now send the events as appropriate:
    ( /* 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);
    {
       wxDialUpEvent event(m_IsOnline, ! fromAsync);
       (void)wxTheApp->ProcessEvent(event);


@@ -425,12 +446,14 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
 
    int testResult;
 
 
    int testResult;
 

-   testResult = CheckConnect();
+   testResult = CheckProcNet();

    if(testResult == -1)
       testResult = CheckIfconfig();
    if(testResult == -1)
       testResult = CheckIfconfig();

+   if(testResult == -1)
+      testResult = CheckConnect();

    if(testResult == -1)
       testResult = CheckPing();
    if(testResult == -1)
       testResult = CheckPing();

-      m_IsOnline = testResult;
+   m_IsOnline = testResult;

 }
 
 int
 }
 
 int


@@ -443,17 +466,17 @@ wxDialUpManagerImpl::CheckConnect(void)
 
    if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL)
       return 0; // no DNS no net
 
    if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL)
       return 0; // no DNS no net

-   
-   serv_addr.sin_family                = hp->h_addrtype;
+
+   serv_addr.sin_family = hp->h_addrtype;

    memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);
    memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);

-   serv_addr.sin_port          = htons(m_BeaconPort);
+   serv_addr.sin_port = htons(m_BeaconPort);

 
 

-   int sockfd;
-   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) 
-   {   
+   int sockfd;
+   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
+   {

       return -1;  // no info
    }
       return -1;  // no info
    }

-   
+

    if( connect(sockfd, (struct sockaddr *) &serv_addr,
                sizeof(serv_addr)) >= 0)
    {
    if( connect(sockfd, (struct sockaddr *) &serv_addr,
                sizeof(serv_addr)) >= 0)
    {


@@ -468,18 +491,66 @@ wxDialUpManagerImpl::CheckConnect(void)
    return -1;
 }
 
    return -1;
 }
 

+
+int 
+wxDialUpManagerImpl::CheckProcNet(void)
+{
+   int rc = -1;
+
+#ifdef __LINUX__
+   if (wxFileExists(_T("/proc/net/route")))
+   {
+       // NOTE: cannot use wxFile::Length because file doesn't support
+       // seeking
+       FILE *f = fopen("/proc/net/route", "rt");
+       if (f != NULL)
+       {
+           char output[256];
+          
+          while (fgets(output, 256, f) != NULL)
+          {
+                   if (strstr(output,"ppp")    // ppp
+                       || strstr(output,"sl")  // slip
+                       || strstr(output,"pl")) // plip
+                      rc = 1;
+          }
+          if (rc == -1) rc = 0;
+           fclose(f);
+       }
+   }
+#endif
+   
+   return rc;
+}
+
+

 int
 wxDialUpManagerImpl::CheckIfconfig(void)
 {
    int rc = -1;
 int
 wxDialUpManagerImpl::CheckIfconfig(void)
 {
    int rc = -1;

-   // First time check for ifconfig location. We only use the variant
-   // which does not take arguments, a la GNU.
-   if(m_CanUseIfconfig == -1) // unknown
+
+   // First time check for ifconfig location. We only use the variant which
+   // does not take arguments, a la GNU.
+   if ( m_CanUseIfconfig == -1 ) // unknown

    {
    {

-      if(wxFileExists("/sbin/ifconfig"))
-         m_IfconfigPath = "/sbin/ifconfig";
-      else if(wxFileExists("/usr/sbin/ifconfig"))
-         m_IfconfigPath = "/usr/sbin/ifconfig";
+       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;
+           }
+       }

    }
 
    wxLogNull ln; // suppress all error messages
    }
 
    wxLogNull ln; // suppress all error messages


@@ -494,10 +565,16 @@ wxDialUpManagerImpl::CheckIfconfig(void)
 #if defined(__SOLARIS__) || defined (__SUNOS__)
       // need to add -a flag
       cmd << " -a";
 #if defined(__SOLARIS__) || defined (__SUNOS__)
       // need to add -a flag
       cmd << " -a";

-#elif defined(__LINUX__) || defined (__FREEBSD__)
+#elif defined(__LINUX__) || defined(__SGI__)

       // nothing to be added to ifconfig
       // nothing to be added to ifconfig

+#elif defined(__FREEBSD__)
+      // add -l flag
+      cmd << " -l";
+#elif defined(__HPUX__)
+      // VZ: a wild guess (but without it, ifconfig fails completely)
+      cmd << _T(" ppp0");

 #else
 #else

-#   pragma warning "No ifconfig information for this OS."
+#     pragma warning "No ifconfig information for this OS."

       m_CanUseIfconfig = 0;
       return -1;
 #endif
       m_CanUseIfconfig = 0;
       return -1;
 #endif


@@ -516,20 +593,21 @@ wxDialUpManagerImpl::CheckIfconfig(void)
             output[file.Length()] = '\0';
             if(file.Read(output,file.Length()) == file.Length())
             {
             output[file.Length()] = '\0';
             if(file.Read(output,file.Length()) == file.Length())
             {

-               if(
+               // FIXME shouldn't we grep for "^ppp"? (VZ)
+

 #if defined(__SOLARIS__) || defined (__SUNOS__)
 #if defined(__SOLARIS__) || defined (__SUNOS__)

-                  strstr(output,"ipdptp")   // dialup device
+               // dialup device under SunOS/Solaris
+               rc = strstr(output,"ipdptp") != (char *)NULL;

 #elif defined(__LINUX__) || defined (__FREEBSD__)
 #elif defined(__LINUX__) || defined (__FREEBSD__)

-                  strstr(output,"ppp")   // ppp
-                  || strstr(output,"sl") // slip
-                  || strstr(output,"pl") // plip
-#else
-                  wxASSERT(0); // unreachable code
+               rc = strstr(output,"ppp")    // ppp
+                    || strstr(output,"sl")  // slip
+                    || strstr(output,"pl"); // plip
+#elif defined(__SGI__)  // IRIX
+               rc = (int) strstr(output, "ppp"); // PPP
+#elif defined(__HPUX__)
+               // if could run ifconfig on interface, then it exists
+               rc = TRUE;

 #endif
 #endif

-                  )
-                  rc = 1;
-               else
-                  rc = 0;

             }
             file.Close();
             delete [] output;
             }
             file.Close();
             delete [] output;


@@ -540,7 +618,8 @@ wxDialUpManagerImpl::CheckIfconfig(void)
          m_CanUseIfconfig = 0; // don´t try again
       (void) wxRemoveFile(tmpfile);
    }
          m_CanUseIfconfig = 0; // don´t try again
       (void) wxRemoveFile(tmpfile);
    }

-      return rc;
+
+   return rc;

 }
 
 int
 }
 
 int


@@ -548,7 +627,7 @@ wxDialUpManagerImpl::CheckPing(void)
 {
    if(! m_CanUsePing)
       return -1;
 {
    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
    // First time check for ping location. We only use the variant
    // which does not take arguments, a la GNU.
    if(m_CanUsePing == -1) // unknown


@@ -570,8 +649,10 @@ wxDialUpManagerImpl::CheckPing(void)
    cmd << m_PingPath << ' ';
 #if defined(__SOLARIS__) || defined (__SUNOS__)
    // nothing to add to ping command
    cmd << m_PingPath << ' ';
 #if defined(__SOLARIS__) || defined (__SUNOS__)
    // nothing to add to ping command

-#elif defined(__LINUX__)
+#elif defined(__LINUX__) || defined ( __FREEBSD__)

    cmd << "-c 1 "; // only ping once
    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;
 #else
 #   pragma warning "No Ping information for this OS."
    m_CanUsePing = 0;