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

Fixed a bug when GSocket_SetCallback was used before allocating the internal socket

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
1999-09-12 11:17:00 +00:00
parent 83802b0bd9
commit 2f7c2af547
2 changed files with 87 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/gsocket.c
View File

@@ -6,7 +6,7 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifdef __WXMSW__ #ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h" #include "wx/setup.h"
#include "wx/msw/gsockmsw.h" #include "wx/msw/gsockmsw.h"
@@ -25,10 +25,10 @@
*/ */
#define INSTANCE hInst #define INSTANCE hInst
#endif /* __WXMSW__ */ #endif /* __GSOCKET_STANDALONE__ */
#if !defined(__WXMSW__) || (defined(__WXMSW__) && wxUSE_SOCKETS) #if defined(__GSOCKET_STANDALONE__) || defined(wxUSE_SOCKETS)
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@@ -1376,7 +1376,8 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
} }
#endif /* !defined(__WXMSW__) || (defined(__WXMSW__) && wxUSE_SOCKETS) */ #endif /* defined(__GSOCKET_STANDALONE__) || defined(wxUSE_SOCKETS) */

121
src/unix/gsocket.c
View File

@@ -262,12 +262,12 @@ GAddress *GSocket_GetPeer(GSocket *socket)
/* Server specific parts */ /* Server specific parts */
/* /* GSocket_SetServer:
GSocket_SetServer() setup the socket as a server. It uses the "Local" field * Sets up the socket as a server. It uses the "Local" field of GSocket.
of GSocket. "Local" must be set by GSocket_SetLocal() before * "Local" must be set by GSocket_SetLocal() before GSocket_SetServer()
GSocket_SetServer() is called. GSOCK_INVSOCK if socket has been initialized. * is called. Possible error codes are: GSOCK_INVSOCK if socket has not
In case, you haven't yet defined the local address, it returns GSOCK_INVADDR. * been initialized, GSOCK_INVADDR if the local address has not been
In the other cases it returns GSOCK_IOERR. * defined and GSOCK_IOERR for other internal errors.
*/ */
GSocketError GSocket_SetServer(GSocket *sck) GSocketError GSocket_SetServer(GSocket *sck)
{ {
@@ -313,14 +313,15 @@ GSocketError GSocket_SetServer(GSocket *sck)
return GSOCK_IOERR; return GSOCK_IOERR;
} }
_GSocket_Configure_Callbacks(sck);
GSocket_SetNonBlocking(sck, sck->m_non_blocking); GSocket_SetNonBlocking(sck, sck->m_non_blocking);
GSocket_SetTimeout(sck, sck->m_timeout); GSocket_SetTimeout(sck, sck->m_timeout);
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
/* /* GSocket_WaitConnection:
GSocket_WaitConnection() waits for an incoming client connection. * Waits for an incoming client connection.
*/ */
GSocket *GSocket_WaitConnection(GSocket *socket) GSocket *GSocket_WaitConnection(GSocket *socket)
{ {
@@ -370,6 +371,10 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
connection->m_server = FALSE; connection->m_server = FALSE;
connection->m_oriented = TRUE; connection->m_oriented = TRUE;
_GSocket_Configure_Callbacks(connection);
GSocket_SetNonBlocking(connection, connection->m_non_blocking);
GSocket_SetTimeout(connection, connection->m_timeout);
return connection; return connection;
} }
@@ -409,6 +414,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
return GSOCK_IOERR; return GSOCK_IOERR;
} }
_GSocket_Configure_Callbacks(sck);
GSocket_SetNonBlocking(sck, sck->m_non_blocking); GSocket_SetNonBlocking(sck, sck->m_non_blocking);
GSocket_SetTimeout(sck, sck->m_timeout); GSocket_SetTimeout(sck, sck->m_timeout);
@@ -417,10 +423,14 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
/* Client specific parts */ /* Client specific parts */
/* /* GSocket_Connect:
GSocket_Connect() establishes a client connection to a server using the "Peer" * Establishes a client connection to a server using the "Peer"
field of GSocket. "Peer" must be set by GSocket_SetPeer() before * field of GSocket. "Peer" must be set by GSocket_SetPeer() before
GSocket_Connect() is called. In the other case, it returns GSOCK_INVADDR. * GSocket_Connect() is called. Possible error codes are GSOCK_INVSOCK,
* GSOCK_INVADDR, GSOCK_TIMEDOUT, GSOCK_WOULDBLOCK and GSOCK_IOERR.
* If a socket is nonblocking and Connect() returns GSOCK_WOULDBLOCK,
* the connection request can be completed later. Use GSocket_Select()
* to check or wait for a GSOCK_CONNECTION event.
*/ */
GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{ {
@@ -455,6 +465,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
return GSOCK_IOERR; return GSOCK_IOERR;
} }
_GSocket_Configure_Callbacks(sck);
GSocket_SetNonBlocking(sck, sck->m_non_blocking); GSocket_SetNonBlocking(sck, sck->m_non_blocking);
GSocket_SetTimeout(sck, sck->m_timeout); GSocket_SetTimeout(sck, sck->m_timeout);
@@ -593,9 +604,9 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
/* Flags */ /* Flags */
/* /* GSocket_SetNonBlocking:
GSocket_SetNonBlocking() puts the socket in non-blocking mode. This is useful * Sets the socket to non-blocking mode. This is useful if
if we don't want to wait. * we don't want to wait.
*/ */
void GSocket_SetNonBlocking(GSocket *socket, bool non_block) void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
{ {
@@ -607,10 +618,10 @@ void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
ioctl(socket->m_fd, FIONBIO, &non_block); ioctl(socket->m_fd, FIONBIO, &non_block);
} }
/* /* GSocket_SetTimeout:
* GSocket_SetTimeout() * Sets the timeout for blocking calls. Time is
* expressed in milliseconds.
*/ */
void GSocket_SetTimeout(GSocket *socket, unsigned long millisec) void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
{ {
assert(socket != NULL); assert(socket != NULL);
@@ -618,10 +629,9 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
socket->m_timeout = millisec; socket->m_timeout = millisec;
} }
/* /* GSocket_GetError:
GSocket_GetError() returns the last error occured on the socket stream. * Returns the last error occured for this socket.
*/ */
GSocketError GSocket_GetError(GSocket *socket) GSocketError GSocket_GetError(GSocket *socket)
{ {
assert(socket != NULL); assert(socket != NULL);
@@ -631,24 +641,29 @@ GSocketError GSocket_GetError(GSocket *socket)
/* Callbacks */ /* Callbacks */
/* /* Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION
Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION) * and LOST). The callbacks are called in the following situations:
INPUT: The function is called when there is at least a byte in the *
input buffer * INPUT: There is at least one byte in the input buffer
OUTPUT: The function is called when the system is sure the next write call * OUTPUT: The system is sure that the next write call will not block
will not block * CONNECTION: Two cases are possible:
CONNECTION: Two cases is possible: * Client socket -> the connection is established
Client socket -> the connection is established * Server socket -> a client requests a connection
Server socket -> a client request a connection * LOST: The connection is lost
LOST: the connection is lost *
* An event is generated only once and its state is reseted when the
* relative IO call is requested.
* For example: INPUT -> GSocket_Read()
* CONNECTION -> GSocket_Accept()
*/
SetCallback accepts a combination of these flags so a same callback can /* GSocket_SetCallback:
receive different events. * Enables the callbacks specified by 'flags'. Note that 'flags'
* may be a combination of flags OR'ed toghether, so the same
An event is generated only once and its state is reseted when the relative * callback function can be made to accept different events.
IO call is requested. * The callback function must have the following prototype:
For example: INPUT -> GSocket_Read() *
CONNECTION -> GSocket_Accept() * void function(GSocket *socket, GSocketEvent event, char *cdata)
*/ */
void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags, void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
GSocketCallback callback, char *cdata) GSocketCallback callback, char *cdata)
@@ -663,35 +678,33 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
if ((flags & (1 << count)) != 0) { if ((flags & (1 << count)) != 0) {
socket->m_cbacks[count] = callback; socket->m_cbacks[count] = callback;
socket->m_data[count] = cdata; socket->m_data[count] = cdata;
_GSocket_Enable(socket, count);
} }
} }
_GSocket_Configure_Callbacks(socket);
} }
/* /* GSocket_UnsetCallback:
UnsetCallback will disables all callbacks specified by "flags". * Disables all callbacks specified by 'flags', which may be a
NOTE: "flags" may be a combination of flags * combination of flags OR'ed toghether.
*/ */
void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ {
int count = 0; int count;
assert(socket != NULL); assert(socket != NULL);
for (count=0;count<GSOCK_MAX_EVENT;count++) { for (count=0;count<GSOCK_MAX_EVENT;count++) {
if ((flags & (1 << count)) != 0) { if ((flags & (1 << count)) != 0) {
_GSocket_Disable(socket, count);
socket->m_cbacks[count] = NULL; socket->m_cbacks[count] = NULL;
} }
} }
_GSocket_Configure_Callbacks(socket);
} }
#define CALL_CALLBACK(socket, event) \ #define CALL_CALLBACK(socket, event) \
if (socket->m_iocalls[event] && \ if (socket->m_iocalls[event] && socket->m_cbacks[event]) { \
socket->m_cbacks[event]) {\
_GSocket_Disable(socket, event); \ _GSocket_Disable(socket, event); \
socket->m_cbacks[event](socket, event, \ socket->m_cbacks[event](socket, event, socket->m_data[event]); \
socket->m_data[event]); \
} }
void _GSocket_Enable(GSocket *socket, GSocketEvent event) void _GSocket_Enable(GSocket *socket, GSocketEvent event)
@@ -708,6 +721,18 @@ void _GSocket_Disable(GSocket *socket, GSocketEvent event)
_GSocket_Uninstall_Callback(socket, event); _GSocket_Uninstall_Callback(socket, event);
} }
void _GSocket_Configure_Callbacks(GSocket *socket)
{
int count;
for (count=0;count<GSOCK_MAX_EVENT;count++) {
if ((socket->m_cbacks[count]) != NULL) {
GSocket_Enable(socket, count);
} else {
GSocket_Disable(socket, count);
}
}
}
int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
{ {
int ret; int ret;