one day people will stop putting C++ comments in C files

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

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index bc398566677e3ca8b108f284aa3953858dad20e1..e0616d2305f7dc1372bfba47c154bcb9dd967391 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -127,7 +127,7 @@ public:
 
    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
@@ -175,7 +175,7 @@ private:
    int m_CanUsePing;
    /// The path to ping program
    wxString m_PingPath;
-   
+
    /// beacon host:
    wxString m_BeaconHost;
    /// beacon host portnumber for connect:
@@ -209,7 +209,7 @@ private:
    int CheckPing(void);
    /// Check by connecting to host on given port.
    int CheckConnect(void);
-   
+
 };
 
 
@@ -258,19 +258,31 @@ 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
    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"));
-   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()
@@ -291,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")))
@@ -326,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);
@@ -398,7 +408,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);
@@ -443,17 +458,17 @@ wxDialUpManagerImpl::CheckConnect(void)
 
    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);
-   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
    }
-   
+
    if( connect(sockfd, (struct sockaddr *) &serv_addr,
                sizeof(serv_addr)) >= 0)
    {
@@ -472,14 +487,29 @@ 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
@@ -522,9 +552,9 @@ wxDialUpManagerImpl::CheckIfconfig(void)
                // dialup device under SunOS/Solaris
                rc = strstr(output,"ipdptp") != (char *)NULL;
 #elif defined(__LINUX__) || defined (__FREEBSD__)
-               rc = strstr(output,"ppp")   // ppp
-                    || strstr(output,"sl") // slip
-                    || strstr(output,"pl") // plip
+               rc = strstr(output,"ppp")    // ppp
+                    || strstr(output,"sl")  // slip
+                    || strstr(output,"pl"); // plip
 #elif defined(__SGI__)  // IRIX
                rc = strstr(output, "ppp"); // PPP
 #endif
@@ -546,7 +576,7 @@ wxDialUpManagerImpl::CheckPing(void)
 {
    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