GSocket:
- Added lots of comments to both code and headers. - Restructured some parts of Unix version. Will try to merge with MSW soon and have a gsockcmn.c - Fixed a potential bug in the MSW version of GSocket_Connect when in blocking mode. - Fixed a potential (different) bug in the corresponding Unix version. - Now WaitConnection correctly fills out the peer address field. - Added GAddress_INET_SetAnyAddress (sets address to INADDR_ANY) - Default address is INADDR_ANY again, not INADDR_NONE; failed hostname lookups sets the address to INADDR_NONE. wxSocket: - Added some safety checks to the wxPostEvent stuff. wxIPV4address: - Added a wxIPV4address::AnyAddress method. wxIPCConnection and co.: - Servers binds to INADDR_ANY, instead of binding to localhost. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -69,6 +69,11 @@ void Client_OnRequest(wxSocketBase& sock,
|
||||
wxSocketNotify evt,
|
||||
char *cdata);
|
||||
|
||||
|
||||
// All sockets will be created with the following flags
|
||||
|
||||
#define SCKIPC_FLAGS wxSOCKET_NONE
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// wxTCPClient
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -93,7 +98,7 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
|
||||
const wxString& server_name,
|
||||
const wxString& topic)
|
||||
{
|
||||
wxSocketClient *client = new wxSocketClient();
|
||||
wxSocketClient *client = new wxSocketClient(SCKIPC_FLAGS);
|
||||
wxSocketStream *stream = new wxSocketStream(*client);
|
||||
wxDataInputStream *data_is = new wxDataInputStream(*stream);
|
||||
wxDataOutputStream *data_os = new wxDataOutputStream(*stream);
|
||||
@@ -165,18 +170,18 @@ wxTCPServer::wxTCPServer ()
|
||||
|
||||
bool wxTCPServer::Create(const wxString& server_name)
|
||||
{
|
||||
wxIPV4address addr;
|
||||
wxSocketServer *server;
|
||||
|
||||
addr.LocalHost(); // GRG
|
||||
// wxIPV4address defaults to INADDR_ANY:0
|
||||
wxIPV4address addr;
|
||||
addr.Service(server_name);
|
||||
|
||||
// Create a socket listening on specified port
|
||||
server = new wxSocketServer(addr);
|
||||
server = new wxSocketServer(addr, SCKIPC_FLAGS);
|
||||
server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
|
||||
server->CallbackData((char *)this);
|
||||
server->SetNotify(wxSOCKET_CONNECTION_FLAG);
|
||||
server->Notify(TRUE); // GRG
|
||||
server->Notify(TRUE);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user