include/wx/choice.hpragma warning is only for VC++

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

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index ddafb960fde05c4c39528ee8b976e68ce4ece77a..a46ef04b1e8ceddcf82346ab1898964b6c1d634b 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


@@ -68,7 +72,7 @@ class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
 public:
    wxDialUpManagerImpl();
    ~wxDialUpManagerImpl();
 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
    /** 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


@@ -105,14 +109,23 @@ public:
          return m_IsOnline != 0;
       }
 
          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
    /// 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();
 
       { 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
    // 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


@@ -176,7 +189,7 @@ private:
    /// pid of dial process
    int m_DialPId;
    friend class wxDialProcess;
    /// pid of dial process
    int m_DialPId;
    friend class wxDialProcess;

-   
+

    /// determine status
    void CheckStatus(bool fromAsync = FALSE) const;
 
    /// determine status
    void CheckStatus(bool fromAsync = FALSE) const;
 


@@ -214,7 +227,7 @@ public:
       {
          m_DupMan = dupman;
       }
       {
          m_DupMan = dupman;
       }

-   void OnTerminate(int pid, int status) const
+   void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) const

       {
          m_DupMan->m_DialProcess = NULL;
          m_DupMan->CheckStatus(TRUE);
       {
          m_DupMan->m_DialProcess = NULL;
          m_DupMan->CheckStatus(TRUE);


@@ -278,7 +291,7 @@ wxDialUpManagerImpl::HangUp(void)
 {
    if(m_IsOnline == 0)
       return FALSE;
 {
    if(m_IsOnline == 0)
       return FALSE;

-   if(IsDialling())
+   if(IsDialing())

    {
       wxLogError(_("Already dialling ISP."));
       return FALSE;
    {
       wxLogError(_("Already dialling ISP."));
       return FALSE;


@@ -296,7 +309,7 @@ wxDialUpManagerImpl::HangUp(void)
 bool
 wxDialUpManagerImpl::CancelDialing()
 {
 bool
 wxDialUpManagerImpl::CancelDialing()
 {

-   if(! IsDialling())
+   if(! IsDialing())

       return FALSE;
    return kill(m_DialPId, SIGTERM) > 0;
 }
       return FALSE;
    return kill(m_DialPId, SIGTERM) > 0;
 }


@@ -393,13 +406,13 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    if(m_CanUseIfconfig != 0) // unknown or yes
    {
       wxASSERT(m_IfconfigPath.length());
    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
       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:
          the shell first. I have no idea why. :-(  (KB) */
 #if 0
       // temporarily redirect stdout/stderr:


@@ -459,7 +472,6 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    // This can be used under Win 9x, too!
    struct hostent     *hp;
    struct sockaddr_in  serv_addr;
    // 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)
 
    m_IsOnline = 0; // assume false
    if((hp = gethostbyname(m_BeaconHost)) == NULL)


@@ -468,24 +480,41 @@ 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);
    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( ( 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)
    if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)

-   {   
+   {

       //sys_error("cannot connect to server");
       return;
    }
    //connected!
       //sys_error("cannot connect to server");
       return;
    }
    //connected!

+#endif

    close(sockfd);
    close(sockfd);

+   m_IsOnline = TRUE;

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

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

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