wxMotif compilation fixes for wxDataObject and PROCESS_EVENTS (wxSocket)

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

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 85de4fa1670c2c7ede6067f44e50dc1ab5cb17ca..2dac8544b89e67ee3e155386c1556fb97098da2e 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -11,12 +11,12 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_DIALUP_MANAGER
-
 #ifdef __GNUG__
-    #pragma implementation "dialup.h"
+#   pragma implementation "dialup.h"
 #endif
 
+#if wxUSE_DIALUP_MANAGER
+
 #ifndef  WX_PRECOMP
 #   include "wx/defs.h"
 #endif // !PCH
@@ -32,6 +32,7 @@
 #include "wx/process.h"
 #include "wx/intl.h"
 #include "wx/app.h"
+#include "wx/wxchar.h"
 
 #include <stdlib.h>
 
@@ -72,7 +73,7 @@ class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
 public:
    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
        to call this function and check its result before calling any other
@@ -109,14 +110,23 @@ public:
          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 IsDialling() const
+   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();
 
+   unsigned int 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
@@ -180,7 +190,7 @@ private:
    /// pid of dial process
    int m_DialPId;
    friend class wxDialProcess;
-   
+
    /// determine status
    void CheckStatus(bool fromAsync = FALSE) const;
 
@@ -236,6 +246,12 @@ wxDialUpManagerImpl::wxDialUpManagerImpl()
    m_CanUseIfconfig = -1; // unknown
    m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
    m_BeaconPort = 80;
+   SetConnectCommand("pon", "poff"); // default values for Debian/GNU linux
+   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); 
 }
 
 wxDialUpManagerImpl::~wxDialUpManagerImpl()
@@ -282,7 +298,7 @@ wxDialUpManagerImpl::HangUp(void)
 {
    if(m_IsOnline == 0)
       return FALSE;
-   if(IsDialling())
+   if(IsDialing())
    {
       wxLogError(_("Already dialling ISP."));
       return FALSE;
@@ -300,7 +316,7 @@ wxDialUpManagerImpl::HangUp(void)
 bool
 wxDialUpManagerImpl::CancelDialing()
 {
-   if(! IsDialling())
+   if(! IsDialing())
       return FALSE;
    return kill(m_DialPId, SIGTERM) > 0;
 }
@@ -397,13 +413,13 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    if(m_CanUseIfconfig != 0) // unknown or yes
    {
       wxASSERT(m_IfconfigPath.length());
-      
+
       wxString tmpfile = wxGetTempFileName("_wxdialuptest");
       wxString cmd = "/bin/sh -c \'";
       cmd << m_IfconfigPath << " >" << 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 
+         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:
@@ -463,7 +479,6 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    // This can be used under Win 9x, too!
    struct hostent     *hp;
    struct sockaddr_in  serv_addr;
-   int sockfd;
 
    m_IsOnline = 0; // assume false
    if((hp = gethostbyname(m_BeaconHost)) == NULL)
@@ -472,18 +487,35 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    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);
+
+      // PING method:
+
+   int sockfd;
    if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) 
    {   
       //  sys_error("cannot create socket for gw");
       return;
    }
+   
+   if(sendto(sockfd, "hello",
+             strlen("hello"), /* flags */ 0,
+             (struct  sockaddr *) &serv_addr,
+             sizeof(serv_addr)) == -1)
+   {
+      close(sockfd);
+      return;
+   }
+
+#if 0
    if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
-   {   
+   {
       //sys_error("cannot connect to server");
       return;
    }
    //connected!
+#endif
    close(sockfd);
+   m_IsOnline = TRUE;
 }