Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't duplicate GSocket creation/destruction and shutdown code in BSD and Winsock implementations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-23 01:44:50 +00:00
parent afe0e40097
commit eb97543d28
7 changed files with 120 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/unix/gsocket.cpp
View File

@@ -134,13 +134,6 @@ int _System soclose(int);
#define SOCKOPTLEN_T WX_SOCKLEN_T
#endif
/*
* MSW defines this, Unices don't.
*/
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
#endif
/* UnixWare reportedly needs this for FIONBIO definition */
#ifdef __UNIXWARE__
#include <sys/filio.h>
@@ -476,34 +469,10 @@ void GSocket_Cleanup()
GSocket::GSocket()
{
int i;
m_fd = INVALID_SOCKET;
m_handler = NULL;
for (i=0;i<GSOCK_MAX_EVENT;i++)
{
m_cbacks[i] = NULL;
}
m_detected = 0;
m_local = NULL;
m_peer = NULL;
m_error = GSOCK_NOERROR;
m_server = false;
m_stream = true;
m_gui_dependent = NULL;
m_non_blocking = false;
m_reusable = false;
m_broadcast = false;
m_dobind = true;
m_timeout = 10*60*1000;
/* 10 minutes * 60 sec * 1000 millisec */
m_establishing = false;
m_use_events = false;
m_initialRecvBufferSize = -1;
m_initialSendBufferSize = -1;
m_ok = GSocketManager::Get()->Init_Socket(this);
}
void GSocket::Close()
@@ -526,23 +495,7 @@ void GSocket::Close()
GSocket::~GSocket()
{
assert(this);
/* Check that the socket is really shutdowned */
if (m_fd != INVALID_SOCKET)
Shutdown();
GSocketManager::Get()->Destroy_Socket(this);
delete m_handler;
/* Destroy private addresses */
if (m_local)
GAddress_destroy(m_local);
if (m_peer)
GAddress_destroy(m_peer);
}
/* GSocket_Shutdown:
@@ -551,26 +504,11 @@ GSocket::~GSocket()
*/
void GSocket::Shutdown()
{
int evt;
/* Don't allow events to fire after socket has been closed */
if (m_use_events)
DisableEvents();
assert(this);
/* Don't allow events to fire after socket has been closed */
if (m_use_events)
DisableEvents();
/* If socket has been created, shutdown it */
if (m_fd != INVALID_SOCKET)
{
shutdown(m_fd, 1);
Close();
}
/* Disable GUI callbacks */
for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
m_cbacks[evt] = NULL;
m_detected = GSOCK_LOST_FLAG;
GSocketBase::Shutdown();
}
/* Address handling */
@@ -803,7 +741,7 @@ GSocket *GSocket::WaitConnection()
}
/* Create a GSocket object for the new connection */
connection = GSocket_new();
connection = GSocket::Create();
if (!connection)
{
@@ -1743,18 +1681,6 @@ void GSocket::Detected_Write()
}
}
/* Compatibility functions for GSocket */
GSocket *GSocket_new(void)
{
GSocket *newsocket = new GSocket();
if (newsocket->IsOk())
return newsocket;
delete newsocket;
return NULL;
}
/*
* -------------------------------------------------------------------------
* GAddress