#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
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;
// NB: this won't result in DISCONNECTED event being sent
virtual bool CancelDialing();
- unsigned int GetISPNames(class wxArrayString &) const
+ size_t GetISPNames(class wxArrayString &) const
{ return 0; }
// sometimes the built-in logic for determining the online status may fail,
/// 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:
/// 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);
+
};
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()
- { 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(); }
m_DupMan = dupman;
}
void Disconnect(void) { m_DupMan = NULL; }
- void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) const
+ virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status))
{
if(m_DupMan)
{
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
m_IsOnline = -1;
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;
}
m_IsOnline = -1;
wxString cmd;
- if(m_HangUpCommand.Find("%s"))
+ if(m_HangUpCommand.Find(wxT("%s")))
cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);
else
cmd = m_HangUpCommand;
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)
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;
+ }
}
wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
{
/// does hostname contain a port number?
- wxString port = hostname.After(':');
+ wxString port = hostname.After(wxT(':'));
if(port.Length())
{
- m_BeaconHost = hostname.Before(':');
- m_BeaconPort = atoi(port);
+ m_BeaconHost = hostname.Before(wxT(':'));
+ m_BeaconPort = wxAtoi(port);
}
else
{
{
m_IsOnline = -1;
+ 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)
+ {
+ 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
wxString tmpfile = wxGetTempFileName("_wxdialuptest");
wxString cmd = "/bin/sh -c \'";
- cmd << m_IfconfigPath << " >" << tmpfile << '\'';
+ cmd << m_IfconfigPath;
+#if defined(__SOLARIS__) || defined (__SUNOS__)
+ // need to add -a flag
+ cmd << " -a";
+#elif defined(__LINUX__) || defined (__FREEBSD__)
+ // nothing to be added to ifconfig
+#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 0
- // temporarily redirect stdout/stderr:
- int
- new_stdout = dup(STDOUT_FILENO),
- new_stderr = dup(STDERR_FILENO);
- close(STDOUT_FILENO);
- close(STDERR_FILENO);
-
- int
- // new stdout:
- output_fd = open(tmpfile, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR),
- // new stderr:
- null_fd = open("/dev/null", O_CREAT, S_IRUSR|S_IWUSR);
- // verify well behaved unix behaviour:
- wxASSERT(output_fd == STDOUT_FILENO);
- wxASSERT(null_fd == STDERR_FILENO);
- int rc = wxExecute(m_IfconfigPath,TRUE /* sync */,NULL ,wxEXECUTE_DONT_CLOSE_FDS);
- close(null_fd); close(output_fd);
- // restore old stdout, stderr:
- int test;
- test = dup(new_stdout); close(new_stdout); wxASSERT(test == STDOUT_FILENO);
- test = dup(new_stderr); close(new_stderr); wxASSERT(test == STDERR_FILENO);
- if(rc == 0)
-#endif
if(wxExecute(cmd,TRUE /* sync */) == 0)
{
m_CanUseIfconfig = 1;
output[file.Length()] = '\0';
if(file.Read(output,file.Length()) == file.Length())
{
- if(strstr(output,"ppp") // ppp
+ if(
+#if defined(__SOLARIS__) || defined (__SUNOS__)
+ strstr(output,"ipdptp") // dialup device
+#elif defined(__LINUX__) || defined (__FREEBSD__)
+ strstr(output,"ppp") // ppp
|| strstr(output,"sl") // slip
|| strstr(output,"pl") // plip
+#else
+ wxASSERT(0); // unreachable code
+#endif
)
- m_IsOnline = 1;
+ rc = 1;
else
- m_IsOnline = 0;
+ rc = 0;
}
file.Close();
delete [] output;
}
- // else m_IsOnline remains -1 as we don't know for sure
+ // else rc remains -1 as we don't know for sure
}
else // could not run ifconfig correctly
m_CanUseIfconfig = 0; // don´t try again
(void) wxRemoveFile(tmpfile);
- if(m_IsOnline != -1) // we are done
- return;
}
+ return rc;
+}
- // second method: try to connect to well known host:
- // This can be used under Win 9x, too!
- struct hostent *hp;
- struct sockaddr_in serv_addr;
-
- m_IsOnline = 0; // assume false
- if((hp = gethostbyname(m_BeaconHost)) == NULL)
- return; // 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);
-
- // PING method:
-
- int sockfd;
- if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
- {
- // sys_error("cannot create socket for gw");
- return;
- }
+int
+wxDialUpManagerImpl::CheckPing(void)
+{
+ if(! m_CanUsePing)
+ return -1;
- if(sendto(sockfd, "hello",
- strlen("hello"), /* flags */ 0,
- (struct sockaddr *) &serv_addr,
- sizeof(serv_addr)) == -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
{
- close(sockfd);
- 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;
+ }
}
-#if 0
- if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
- {
- //sys_error("cannot connect to server");
- return;
- }
- //connected!
+ 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
+#else
+# pragma warning "No Ping information for this OS."
+ m_CanUsePing = 0;
+ return -1;
#endif
- close(sockfd);
- m_IsOnline = TRUE;
+ cmd << m_BeaconHost;
+ if(wxExecute(cmd, TRUE /* sync */) == 0)
+ return 1;
+ else
+ return 0;
}
-
/* static */
wxDialUpManager *
wxDialUpManager::Create(void)
projects / wxWidgets.git / blobdiff