Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp

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

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 55b6355bdbff85c0e2ed0b9f97db9bda25bbc1a3..1e2154ce5eef5767ba8e2577b67cf0162adac5b7 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -11,6 +11,10 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

+#ifdef __GNUG__
+#   pragma implementation "dialup.h"
+#endif
+

 #if wxUSE_DIALUP_MANAGER
 
 #ifndef  WX_PRECOMP
 #if wxUSE_DIALUP_MANAGER
 
 #ifndef  WX_PRECOMP


@@ -19,11 +23,16 @@
 
 #include "wx/string.h"
 #include "wx/event.h"
 
 #include "wx/string.h"
 #include "wx/event.h"

-#include "wx/net.h"
+#include "wx/dialup.h"

 #include "wx/timer.h"
 #include "wx/filefn.h"
 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/timer.h"
 #include "wx/filefn.h"
 #include "wx/utils.h"
 #include "wx/log.h"

+#include "wx/file.h"
+#include "wx/process.h"
+#include "wx/intl.h"
+#include "wx/app.h"
+#include "wx/wxchar.h"

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 


@@ -35,6 +44,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

+#include <errno.h>

 
 // ----------------------------------------------------------------------------
 // A class which groups functions dealing with connecting to the network from a
 
 // ----------------------------------------------------------------------------
 // A class which groups functions dealing with connecting to the network from a


@@ -62,14 +72,8 @@
 class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
 {
 public:
 class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
 {
 public:

-   wxDialUpManagerImpl()
-      {
-         m_IsOnline = -1; // unknown
-         m_timer = NULL;
-         m_CanUseIfconfig = -1; // unknown
-         m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
-         m_BeaconPort = 80;
-      }
+   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
 
    /** Could the dialup manager be initialized correctly? If this function
        returns FALSE, no other functions will work neither, so it's a good idea


@@ -101,12 +105,29 @@ public:
    virtual bool IsOnline() const
       {
          if( (! m_timer) // we are not polling, so test now:
    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;
       }
 
             )
             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 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
    // 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


@@ -150,6 +171,11 @@ private:
    /// The path to ifconfig
    wxString m_IfconfigPath;
 
    /// The path to ifconfig
    wxString m_IfconfigPath;
 

+   ///  Can we use ping to find hosts?
+   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:


@@ -163,13 +189,27 @@ private:
    wxString m_ISPname;
    /// a timer for regular testing
    class AutoCheckTimer *m_timer;
    wxString m_ISPname;
    /// a timer for regular testing
    class AutoCheckTimer *m_timer;

-

    friend class AutoCheckTimer;
    friend class AutoCheckTimer;

+
+   /// a wxProcess for dialling in background
+   class wxDialProcess *m_DialProcess;
+   /// pid of dial process
+   int m_DialPId;
+   friend class wxDialProcess;
+

    /// determine status
    /// determine status

-   void CheckStatus(void) const;
+   void CheckStatus(bool fromAsync = FALSE) const;

 
    /// real status check
    void CheckStatusInternal(void);
 
    /// real status check
    void CheckStatusInternal(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);
+

 };
 
 
 };
 
 


@@ -182,11 +222,11 @@ public:
          m_started = FALSE;
       }
 
          m_started = FALSE;
       }
 

-   virtual bool Start( int millisecs = -1 )
+   virtual bool Start( int millisecs = -1, bool WXUNUSED(one_shot) = FALSE )

       { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
 
    virtual void Notify()
       { 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(); }
 
    virtual void Stop()
       { if ( m_started ) wxTimer::Stop(); }


@@ -195,6 +235,66 @@ public:
    wxDialUpManagerImpl *m_dupman;
 };
 
    wxDialUpManagerImpl *m_dupman;
 };
 

+class wxDialProcess : public wxProcess
+{
+public:
+   wxDialProcess(wxDialUpManagerImpl *dupman)
+      {
+         m_DupMan = dupman;
+      }
+   void Disconnect(void) { m_DupMan = NULL; }
+   virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status))
+      {
+         if(m_DupMan)
+         {
+            m_DupMan->m_DialProcess = NULL;
+            m_DupMan->CheckStatus(TRUE);
+         }
+      }
+private:
+      wxDialUpManagerImpl *m_DupMan;
+};
+
+
+wxDialUpManagerImpl::wxDialUpManagerImpl()
+{
+   /* 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;
+
+#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"));
+   SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand,
+                     hup ? wxString(hup) : m_HangUpCommand);
+}
+
+wxDialUpManagerImpl::~wxDialUpManagerImpl()
+{
+   if(m_timer) delete m_timer;
+   if(m_DialProcess)
+   {
+      m_DialProcess->Disconnect();
+      m_DialProcess->Detach();
+   }
+}
+

 bool
 wxDialUpManagerImpl::Dial(const wxString &isp,
                           const wxString & WXUNUSED(username),
 bool
 wxDialUpManagerImpl::Dial(const wxString &isp,
                           const wxString & WXUNUSED(username),


@@ -203,22 +303,28 @@ 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;
    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;
 
    if ( async )
    {
       cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
    else
       cmd = m_ConnectCommand;
 
    if ( async )
    {

-       wxFAIL_MSG(_T("TODO"));
+      m_DialProcess = new wxDialProcess(this);
+      m_DialPId = (int)wxExecute(cmd, FALSE, m_DialProcess);
+      if(m_DialPId == 0)
+      {
+         delete m_DialProcess;
+         m_DialProcess = NULL;
+         return FALSE;
+      }
+      else
+         return TRUE;

    }
    else
    }
    else

-   {

        return wxExecute(cmd, /* sync */ TRUE) == 0;
        return wxExecute(cmd, /* sync */ TRUE) == 0;

-   }

 }
 
 bool
 }
 
 bool


@@ -226,20 +332,32 @@ wxDialUpManagerImpl::HangUp(void)
 {
    if(m_IsOnline == 0)
       return FALSE;
 {
    if(m_IsOnline == 0)
       return FALSE;

-   m_IsOnline = -1;
+   if(IsDialing())
+   {
+      wxLogError(_("Already dialling ISP."));
+      return FALSE;
+   }

    wxString cmd;
    wxString cmd;

-   if(m_HangUpCommand.Find("%s"))
-      cmd.Printf(m_HangUpCommand,m_ISPname.c_str());
+   if(m_HangUpCommand.Find(wxT("%s")))
+      cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);

    else
       cmd = m_HangUpCommand;
    return wxExecute(cmd, /* sync */ TRUE) == 0;
 }
 
 
    else
       cmd = m_HangUpCommand;
    return wxExecute(cmd, /* sync */ TRUE) == 0;
 }
 
 

+bool
+wxDialUpManagerImpl::CancelDialing()
+{
+   if(! IsDialing())
+      return FALSE;
+   return kill(m_DialPId, SIGTERM) > 0;
+}
+

 bool
 wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds)
 {
 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)
    m_timer = new AutoCheckTimer(this);
    bool rc = m_timer->Start(nSeconds*1000);
    if(! rc)


@@ -253,22 +371,31 @@ wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds)
 void
 wxDialUpManagerImpl::DisableAutoCheckOnlineStatus()
 {
 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;
+   }

 }
 
 
 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?
    /// does hostname contain a port number?

-   wxString port = hostname.After(':');
+   wxString port = hostname.After(wxT(':'));

    if(port.Length())
    {
    if(port.Length())
    {

-      m_BeaconHost = hostname.Before(':');
-      m_BeaconPort = atoi(port);
+      m_BeaconHost = hostname.Before(wxT(':'));
+      m_BeaconPort = wxAtoi(port);

    }
    else
    {
    }
    else
    {


@@ -279,7 +406,7 @@ wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
 
 
 void
 
 
 void

-wxDialUpManagerImpl::CheckStatus(void) const
+wxDialUpManagerImpl::CheckStatus(bool fromAsync) const

 {
    // This function calls the CheckStatusInternal() helper function
    // which is OS - specific and then sends the events.
 {
    // This function calls the CheckStatusInternal() helper function
    // which is OS - specific and then sends the events.


@@ -288,12 +415,15 @@ wxDialUpManagerImpl::CheckStatus(void) 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)
+   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) 
+      )

    {
    {

-      if(m_IsOnline)
-         ; // send ev
-      else
-         ; // send ev
+      wxDialUpEvent event(m_IsOnline, ! fromAsync);
+      (void)wxTheApp->ProcessEvent(event);

    }
 }
 
    }
 }
 


@@ -315,73 +445,192 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
 {
    m_IsOnline = -1;
 
 {
    m_IsOnline = -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
+   int testResult;
+
+   testResult = CheckConnect();
+   if(testResult == -1)
+      testResult = CheckIfconfig();
+   if(testResult == -1)
+      testResult = CheckPing();
+      m_IsOnline = testResult;
+}
+
+int
+wxDialUpManagerImpl::CheckConnect(void)
+{
+   // 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;
+
+   if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL)
+      return 0; // no DNS no net
+
+   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);
+
+   int sockfd;
+   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)

    {
    {

-      if(wxFileExists("/sbin/ifconfig"))
-         m_IfconfigPath = "/sbin/ifconfig";
-      else if(wxFileExists("/usr/sbin/ifconfig"))
-         m_IfconfigPath = "/usr/sbin/ifconfig";
+      return -1;  // no info

    }
 
    }
 

+   if( connect(sockfd, (struct sockaddr *) &serv_addr,
+               sizeof(serv_addr)) >= 0)
+   {
+      close(sockfd);
+      return 1; // we cant connect, so we have a network!
+   }
+   //connected!
+   close(sockfd);
+   if(errno == ENETUNREACH)
+      return 0; // network is unreachable
+   // connect failed, but don't know why
+   return -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
+   {
+       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

    // Let´s try the ifconfig method first, should be fastest:
    if(m_CanUseIfconfig != 0) // unknown or yes
    {
       wxASSERT(m_IfconfigPath.length());
 
       wxString tmpfile = wxGetTempFileName("_wxdialuptest");
    // Let´s try the ifconfig method first, should be fastest:
    if(m_CanUseIfconfig != 0) // unknown or yes
    {
       wxASSERT(m_IfconfigPath.length());
 
       wxString tmpfile = wxGetTempFileName("_wxdialuptest");

-      wxString cmd = m_IfconfigPath;
-      cmd << " >" << tmpfile;
-      if(wxExecute(m_IfconfigPath,TRUE /* sync */) == 0)
+      wxString cmd = "/bin/sh -c \'";
+      cmd << m_IfconfigPath;
+#if defined(__SOLARIS__) || defined (__SUNOS__)
+      // need to add -a flag
+      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;
+      return -1;
+#endif
+      cmd << " >" << 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
+         the shell first. I have no idea why. :-(  (KB) */
+      if(wxExecute(cmd,TRUE /* sync */) == 0)

       {
          m_CanUseIfconfig = 1;
       {
          m_CanUseIfconfig = 1;

-         wxString cmd1 = "grep ppp <"+tmpfile;  // PPP
-         wxString cmd2 = "grep sl <"+tmpfile;   // SLIP
-         wxString cmd3 = "grep pl <"+tmpfile;   // PLIP
-         if(wxExecute(cmd1,TRUE) == 0
-            || wxExecute(cmd2,TRUE) == 0
-            || wxExecute(cmd3,TRUE) == 0
-            )
-            m_IsOnline = 1;
+         wxFile file;
+         if( file.Open(tmpfile) )
+         {
+            char *output = new char [file.Length()+1];
+            output[file.Length()] = '\0';
+            if(file.Read(output,file.Length()) == file.Length())
+            {
+               // FIXME shouldn't we grep for "^ppp"? (VZ)
+
+#if defined(__SOLARIS__) || defined (__SUNOS__)
+               // 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
+#elif defined(__SGI__)  // IRIX
+               rc = strstr(output, "ppp"); // PPP
+#elif defined(__HPUX__)
+               // if could run ifconfig on interface, then it exists
+               rc = TRUE;
+#endif
+            }
+            file.Close();
+            delete [] output;
+         }
+         // else rc remains -1 as we don't know for sure

       }
       else // could not run ifconfig correctly
          m_CanUseIfconfig = 0; // don´t try again
       }
       else // could not run ifconfig correctly
          m_CanUseIfconfig = 0; // don´t try again

-      wxRemoveFile(tmpfile);
-      if(m_IsOnline != -1) // we are done
-         return;
+      (void) wxRemoveFile(tmpfile);

    }
 
    }
 

-   // second method: try to connect to well known host:
-   struct hostent     *hp;
-   struct sockaddr_in  serv_addr;
-   int    sockfd;
+   return rc;
+}

 
 

-   m_IsOnline = 0; // assume false
-   if((hp = gethostbyname(m_BeaconHost)) == NULL)
-      return; // no DNS no net
+int
+wxDialUpManagerImpl::CheckPing(void)
+{
+   if(! m_CanUsePing)
+      return -1;

 
 

-   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);
-   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
-   {
-      //  sys_error("cannot create socket for gw");
-      return;
-   }
-   if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
+   // First time check for ping location. We only use the variant
+   // which does not take arguments, a la GNU.
+   if(m_CanUsePing == -1) // unknown

    {
    {

-      //sys_error("cannot connect to server");
-      return;
+      if(wxFileExists("/bin/ping"))
+         m_PingPath = "/bin/ping";
+      else if(wxFileExists("/usr/sbin/ping"))
+         m_PingPath = "/usr/sbin/ping";
+      if(! m_PingPath)
+      {
+         m_CanUsePing = 0;
+         return -1;
+      }

    }
    }

-   //connected!
-   close(sockfd);
-}

 
 

+   wxLogNull ln; // suppress all error messages
+   wxASSERT(m_PingPath.length());
+   wxString cmd;
+   cmd << m_PingPath << ' ';
+#if defined(__SOLARIS__) || defined (__SUNOS__)
+   // 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;
+   return -1;
+#endif
+   cmd << m_BeaconHost;
+   if(wxExecute(cmd, TRUE /* sync */) == 0)
+      return 1;
+   else
+      return 0;
+}

 
 /* static */
 wxDialUpManager *
 
 /* static */
 wxDialUpManager *

-wxDialUpManager::wxDialUpManager::Create(void)
+wxDialUpManager::Create(void)

 {
    return new wxDialUpManagerImpl;
 }
 {
    return new wxDialUpManagerImpl;
 }