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

extact common GAddress declarations to the common header instead of duplicating them for Windows and Unix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-28 17:37:01 +00:00
parent 8ac36abb0f
commit d80170bd4d
3 changed files with 25 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/wx/gsocket.h
View File

@@ -4,7 +4,7 @@
* Author: Guilhem Lavaux * Author: Guilhem Lavaux
* Guillermo Rodriguez Garcia <guille@iies.es> * Guillermo Rodriguez Garcia <guille@iies.es>
* Copyright: (c) Guilhem Lavaux * Copyright: (c) Guilhem Lavaux
* (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org> * (c) 2007,2008 Vadim Zeitlin <vadim@wxwidgets.org>
* Licence: wxWindows Licence * Licence: wxWindows Licence
* Purpose: GSocket include file (system independent) * Purpose: GSocket include file (system independent)
* CVSID: $Id$ * CVSID: $Id$
@@ -23,7 +23,7 @@
#include <stddef.h> #include <stddef.h>
/* /*
Including sys/types.h under cygwin results in the warnings about "fd_set Including sys/types.h under Cygwin results in the warnings about "fd_set
having been defined in sys/types.h" when winsock.h is included later and having been defined in sys/types.h" when winsock.h is included later and
doesn't seem to be necessary anyhow. It's not needed under Mac neither. doesn't seem to be necessary anyhow. It's not needed under Mac neither.
*/ */
@@ -35,8 +35,6 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
typedef struct _GAddress GAddress;
enum GAddressType enum GAddressType
{ {
GSOCK_NOFAMILY = 0, GSOCK_NOFAMILY = 0,
@@ -87,6 +85,7 @@ enum
typedef int GSocketEventFlags; typedef int GSocketEventFlags;
struct GAddress;
class GSocket; class GSocket;
typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event, typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
@@ -179,6 +178,19 @@ GSocket *GSocket_new();
/* GAddress */ /* GAddress */
// Represents a socket endpoint, i.e. -- in spite of its name -- not an address
// but an (address, port) pair
struct GAddress
{
struct sockaddr *m_addr;
size_t m_len;
GAddressType m_family;
int m_realfamily;
GSocketError m_error;
};
GAddress *GAddress_new(); GAddress *GAddress_new();
GAddress *GAddress_copy(GAddress *address); GAddress *GAddress_copy(GAddress *address);
void GAddress_destroy(GAddress *address); void GAddress_destroy(GAddress *address);
@@ -205,6 +217,12 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname,
unsigned long GAddress_INET_GetHostAddress(GAddress *address); unsigned long GAddress_INET_GetHostAddress(GAddress *address);
unsigned short GAddress_INET_GetPort(GAddress *address); unsigned short GAddress_INET_GetPort(GAddress *address);
GSocketError _GAddress_translate_from(GAddress *address,
struct sockaddr *addr, int len);
GSocketError _GAddress_translate_to (GAddress *address,
struct sockaddr **addr, int *len);
GSocketError _GAddress_Init_INET(GAddress *address);
#if wxUSE_IPV6 #if wxUSE_IPV6
GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname); GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname);
@@ -222,8 +240,9 @@ unsigned short GAddress_INET6_GetPort(GAddress *address);
#endif // wxUSE_IPV6 #endif // wxUSE_IPV6
/* TODO: Define specific parts (UNIX) */ // these functions are available under all platforms but only implemented under
// Unix ones, elsewhere they just return GSOCK_INVADDR
GSocketError _GAddress_Init_UNIX(GAddress *address);
GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path); GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path);
GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf); GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);

22
include/wx/msw/gsockmsw.h
View File

@@ -101,26 +101,4 @@ public:
int m_msgnumber; int m_msgnumber;
}; };
/* Definition of GAddress */
struct _GAddress
{
struct sockaddr *m_addr;
size_t m_len;
GAddressType m_family;
int m_realfamily;
GSocketError m_error;
};
/* GAddress */
GSocketError _GAddress_translate_from(GAddress *address,
struct sockaddr *addr, int len);
GSocketError _GAddress_translate_to (GAddress *address,
struct sockaddr **addr, int *len);
GSocketError _GAddress_Init_INET(GAddress *address);
GSocketError _GAddress_Init_UNIX(GAddress *address);
#endif /* _WX_MSW_GSOCKMSW_H_ */ #endif /* _WX_MSW_GSOCKMSW_H_ */

21
include/wx/unix/gsockunx.h
View File

@@ -99,27 +99,6 @@ public:
void *m_gui_dependent; void *m_gui_dependent;
}; };
/* Definition of GAddress */
struct _GAddress
{
struct sockaddr *m_addr;
size_t m_len;
GAddressType m_family;
int m_realfamily;
GSocketError m_error;
};
/* GAddress */
GSocketError _GAddress_translate_from(GAddress *address,
struct sockaddr *addr, int len);
GSocketError _GAddress_translate_to (GAddress *address,
struct sockaddr **addr, int *len);
GSocketError _GAddress_Init_INET(GAddress *address);
GSocketError _GAddress_Init_UNIX(GAddress *address);
// A version of GSocketManager which uses FDs for socket IO // A version of GSocketManager which uses FDs for socket IO
// //
// This class uses GSocket::m_gui_dependent field to store the 2 (for input and // This class uses GSocket::m_gui_dependent field to store the 2 (for input and