adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-04 00:41:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest Csocket

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1727 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-01-28 19:55:23 +00:00
parent e87f440d1c
commit c7546c0c05
2 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.cpp
+22 -25
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.121 $
* $Revision: 1.122 $
*/
#include "Csocket.h"
@@ -632,11 +632,11 @@ void Csock::CloseSocksFD()
{
if ( m_iReadSock != m_iWriteSock )
{
if( m_iReadSock >= 0 )
if( m_iReadSock != CS_INVALID_SOCK )
CS_CLOSE( m_iReadSock );
if( m_iWriteSock >= 0 )
if( m_iWriteSock != CS_INVALID_SOCK )
CS_CLOSE( m_iWriteSock );
} else if( m_iReadSock >= 0 )
} else if( m_iReadSock CS_INVALID_SOCK )
CS_CLOSE( m_iReadSock );
m_iReadSock = CS_INVALID_SOCK;
@@ -888,7 +888,7 @@ bool Csock::Connect( const CS_STRING & sBindHost, bool bSkipSetup )
int Csock::WriteSelect()
{
if ( m_iWriteSock < 0 )
if ( m_iWriteSock == CS_INVALID_SOCK )
return( SEL_ERR );
struct timeval tv;
@@ -918,7 +918,7 @@ int Csock::WriteSelect()
int Csock::ReadSelect()
{
if ( m_iReadSock < 0 )
if ( m_iReadSock == CS_INVALID_SOCK )
return( SEL_ERR );
struct timeval tv;
@@ -993,15 +993,15 @@ bool Csock::Listen( u_short iPort, int iMaxConns, const CS_STRING & sBindHost, u
return( true );
}
int Csock::Accept( CS_STRING & sHost, u_short & iRPort )
cs_sock_t Csock::Accept( CS_STRING & sHost, u_short & iRPort )
{
int iSock = -1;
cs_sock_t iSock = CS_INVALID_SOCK;
if( !GetIPv6() )
{
struct sockaddr_in client;
socklen_t clen = sizeof( client );
iSock = accept( m_iReadSock, (struct sockaddr *) &client, &clen );
if( iSock != -1 )
if( iSock != CS_INVALID_SOCK )
{
getpeername( iSock, (struct sockaddr *) &client, &clen );
sHost = inet_ntoa( client.sin_addr );
@@ -1015,7 +1015,7 @@ int Csock::Accept( CS_STRING & sHost, u_short & iRPort )
struct sockaddr_in6 client;
socklen_t clen = sizeof( client );
iSock = accept( m_iReadSock, (struct sockaddr *) &client, &clen );
if( iSock != -1 )
if( iSock != CS_INVALID_SOCK )
{
getpeername( iSock, (struct sockaddr *) &client, &clen );
if( inet_ntop( AF_INET6, &client.sin6_addr, straddr, sizeof(straddr) ) > 0 )
@@ -1027,7 +1027,7 @@ int Csock::Accept( CS_STRING & sHost, u_short & iRPort )
}
#endif /* HAVE_IPV6 */
if ( iSock != -1 )
if ( iSock != CS_INVALID_SOCK )
{
// Make it close-on-exec
set_close_on_exec( iSock );
@@ -1041,7 +1041,7 @@ int Csock::Accept( CS_STRING & sHost, u_short & iRPort )
if ( !ConnectionFrom( sHost, iRPort ) )
{
CS_CLOSE( iSock );
iSock = -1;
iSock = CS_INVALID_SOCK;
}
}
@@ -1574,9 +1574,9 @@ CS_STRING Csock::GetLocalIP()
if ( !m_sLocalIP.empty() )
return( m_sLocalIP );
int iSock = GetSock();
cs_sock_t iSock = GetSock();
if ( iSock < 0 )
if ( iSock == CS_INVALID_SOCK )
return( "" );
if( !GetIPv6() )
@@ -1608,13 +1608,10 @@ CS_STRING Csock::GetRemoteIP()
if ( !m_sRemoteIP.empty() )
return( m_sRemoteIP );
int iSock = GetSock();
cs_sock_t iSock = GetSock();
if ( iSock < 0 )
{
std::cerr << "What the hell is wrong with my fd!?" << endl;
if ( iSock == CS_INVALID_SOCK )
return( "" );
}
if( !GetIPv6() )
{
@@ -1787,9 +1784,9 @@ u_short Csock::GetRemotePort()
if ( m_iRemotePort > 0 )
return( m_iRemotePort );
int iSock = GetSock();
cs_sock_t iSock = GetSock();
if ( iSock >= 0 )
if ( iSock != CS_INVALID_SOCK )
{
if( !GetIPv6() )
{
@@ -1817,9 +1814,9 @@ u_short Csock::GetLocalPort()
if ( m_iLocalPort > 0 )
return( m_iLocalPort );
int iSock = GetSock();
cs_sock_t iSock = GetSock();
if ( iSock >= 0 )
if ( iSock != CS_INVALID_SOCK )
{
if( !GetIPv6() )
{
@@ -1880,7 +1877,7 @@ int Csock::PemPassCB( char *buf, int size, int rwflag, void *pcSocket )
memset( buf, '\0', size );
strncpy( buf, sPassword.c_str(), size );
buf[size-1] = '\0';
return( strlen( buf ) );
return( (int)strlen( buf ) );
}
int Csock::CertVerifyCB( int preverify_ok, X509_STORE_CTX *x509_ctx )
@@ -2321,7 +2318,7 @@ cs_sock_t Csock::CreateSocket( bool bListen )
cs_sock_t iRet = socket( PF_INET, SOCK_STREAM, IPPROTO_TCP );
#endif /* HAVE_IPV6 */
if ( iRet >= 0 ) {
if ( iRet != CS_INVALID_SOCK ) {
set_close_on_exec( iRet );
if ( bListen ) {
Csocket.h
+10 -10
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.221 $
* $Revision: 1.222 $
*/
// note to compile with win32 need to link to winsock2, using gcc its -lws2_32
@@ -314,12 +314,12 @@ inline void TFD_ZERO( fd_set *set )
FD_ZERO( set );
}
inline void TFD_SET( u_int iSock, fd_set *set )
inline void TFD_SET( cs_sock_t iSock, fd_set *set )
{
FD_SET( iSock, set );
}
inline bool TFD_ISSET( u_int iSock, fd_set *set )
inline bool TFD_ISSET( cs_sock_t iSock, fd_set *set )
{
if ( FD_ISSET( iSock, set ) )
return( true );
@@ -327,7 +327,7 @@ inline bool TFD_ISSET( u_int iSock, fd_set *set )
return( false );
}
inline void TFD_CLR( u_int iSock, fd_set *set )
inline void TFD_CLR( cs_sock_t iSock, fd_set *set )
{
FD_CLR( iSock, set );
}
@@ -535,7 +535,7 @@ public:
virtual bool Listen( u_short iPort, int iMaxConns = SOMAXCONN, const CS_STRING & sBindHost = "", u_int iTimeout = 0 );
//! Accept an inbound connection, this is used internally
virtual int Accept( CS_STRING & sHost, u_short & iRPort );
virtual cs_sock_t Accept( CS_STRING & sHost, u_short & iRPort );
//! Accept an inbound SSL connection, this is used internally and called after Accept
virtual bool AcceptSSL();
@@ -1365,9 +1365,9 @@ public:
AddSock( pcSock, cListen.GetSockName() );
if( ( piRandPort ) && ( cListen.GetPort() == 0 ) )
{
int iSock = pcSock->GetSock();
cs_sock_t iSock = pcSock->GetSock();
if ( iSock < 0 )
if ( iSock == CS_INVALID_SOCK )
{
CS_DEBUG( "Failed to attain a valid file descriptor" );
pcSock->Close();
@@ -1735,7 +1735,7 @@ public:
//! Get the Select Timeout in MICROSECONDS ( 1000 == 1 millisecond )
u_long GetSelectTimeout() { return( m_iSelectWait ); }
//! Set the Select Timeout in MICROSECODS ( 1000 == 1 millisecond )
//! Set the Select Timeout in MICROSECONDS ( 1000 == 1 millisecond )
//! Setting this to 0 will cause no timeout to happen, Select() will return instantly
void SetSelectTimeout( u_long iTimeout ) { m_iSelectWait = iTimeout; }
@@ -2084,9 +2084,9 @@ private:
{
CS_STRING sHost;
u_short port;
int inSock = pcSock->Accept( sHost, port );
cs_sock_t inSock = pcSock->Accept( sHost, port );
if ( inSock != -1 )
if ( inSock != CS_INVALID_SOCK )
{
if ( T::TMO_ACCEPT & pcSock->GetTimeoutType() )
pcSock->ResetTimer(); // let them now it got dinged