X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a51e601e17bb23bd4e4df68358a4b2741be2ff60..7a0a6cc8f61cb53ce1c76897489e1e363d1a1fa5:/src/unix/net.cpp diff --git a/src/unix/net.cpp b/src/unix/net.cpp index a87a2e8442..194f58e6ea 100644 --- a/src/unix/net.cpp +++ b/src/unix/net.cpp @@ -1,11 +1,11 @@ // -*- c++ -*- /////////////////////////////////////////////////////////////// // Name: unix/net.cpp // Purpose: Network related wxWindows classes and functions -// Author: Karsten Ballüder +// Author: Karsten Ballüder // Modified by: // Created: 03.10.99 // RCS-ID: $Id$ -// Copyright: (c) Karsten Ballüder +// Copyright: (c) Karsten Ballüder // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -95,7 +95,7 @@ public: /// Hang up the currently active dial up connection. virtual bool HangUp(); - + // returns TRUE if the computer is connected to the network: under Windows, // this just means that a RAS connection exists, under Unix we check that // the "well-known host" (as specified by SetWellKnownHost) is reachable @@ -143,9 +143,9 @@ public: { m_ConnectCommand = command; m_HangUpCommand = hupcmd; } private: - /// -1: don´t know, 0 = no, 1 = yes + /// -1: don't know, 0 = no, 1 = yes int m_IsOnline; - + /// Can we use ifconfig to list active devices? int m_CanUseIfconfig; /// The path to ifconfig @@ -299,7 +299,7 @@ wxDialUpManagerImpl::CheckStatus(void) const 3. check /proc/net/dev on linux?? This method should be preferred, if possible. Need to do more testing. - + */ void @@ -318,17 +318,17 @@ wxDialUpManagerImpl::CheckStatusInternal(void) } wxLogNull ln; // suppress all error messages - // Let´s try the ifconfig method first, should be fastest: + // Let's try the ifconfig method first, should be fastest: if(m_CanUseIfconfig != 0) // unknown or yes { wxASSERT(m_IfconfigPath.length()); - + wxString tmpfile = wxFileName::CreateTempFileName("_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: @@ -378,7 +378,7 @@ wxDialUpManagerImpl::CheckStatusInternal(void) // else m_IsOnline remains -1 as we don't know for sure } else // could not run ifconfig correctly - m_CanUseIfconfig = 0; // don´t try again + m_CanUseIfconfig = 0; // don't try again (void) wxRemoveFile(tmpfile); if(m_IsOnline != -1) // we are done return; @@ -388,22 +388,22 @@ wxDialUpManagerImpl::CheckStatusInternal(void) // This can be used under Win 9x, too! struct hostent *hp; struct sockaddr_in serv_addr; - int sockfd; + int sockfd; m_IsOnline = 0; // assume false if((hp = gethostbyname(m_BeaconHost)) == NULL) return; // 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); - if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) - { + 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) - { + { //sys_error("cannot connect to server"); return; }