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

Define wxSOCKET_XXX flags as wxSOCKET_XXX_READ|wxSOCKET_XXX_WRITE.

Browse Source 
The recently introduced (in r72591) wxSOCKET_{WAITALL,NOWAIT}_{READ,WRITE}
flags weere for some reason completely different and unrelated to the existing
bidirectional wxSOCKET_{WAITALL,NOWAIT} ones. Change this by defining the
bidirectional version simply as the sum of the two others. This makes much
more sense than testing for either wxSOCKET_XXX or wxSOCKET_XXX_READ or
wxSOCKET_XXX_WRITE being specified.

And it also fixes an assert in wxSocketWaitModeChanger where a sanity check
failed when this class was used with wxSOCKET_WAITALL|wxSOCKET_WAITALL_READ.

See #14506.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-31 00:17:17 +00:00
parent 03e8dc0e40
commit d8986023a3
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/socket.h
View File

@@ -71,17 +71,17 @@ enum wxSocketError
// socket options/flags bit masks // socket options/flags bit masks
enum enum
{ {
wxSOCKET_NONE = 0, wxSOCKET_NONE = 0x0000,
wxSOCKET_NOWAIT = 1, wxSOCKET_NOWAIT_READ = 0x0001,
wxSOCKET_WAITALL = 2, wxSOCKET_NOWAIT_WRITE = 0x0002,
wxSOCKET_BLOCK = 4, wxSOCKET_NOWAIT = wxSOCKET_NOWAIT_READ | wxSOCKET_NOWAIT_WRITE,
wxSOCKET_REUSEADDR = 8, wxSOCKET_WAITALL_READ = 0x0004,
wxSOCKET_BROADCAST = 16, wxSOCKET_WAITALL_WRITE = 0x0008,
wxSOCKET_NOBIND = 32, wxSOCKET_WAITALL = wxSOCKET_WAITALL_READ | wxSOCKET_WAITALL_WRITE,
wxSOCKET_NOWAIT_READ = 64, wxSOCKET_BLOCK = 0x0010,
wxSOCKET_WAITALL_READ = 128, wxSOCKET_REUSEADDR = 0x0020,
wxSOCKET_NOWAIT_WRITE = 256, wxSOCKET_BROADCAST = 0x0040,
wxSOCKET_WAITALL_WRITE = 512 wxSOCKET_NOBIND = 0x0080
}; };
typedef int wxSocketFlags; typedef int wxSocketFlags;

20
src/common/socket.cpp
View File

@@ -172,7 +172,9 @@ public:
m_oldflags(socket->GetFlags()) m_oldflags(socket->GetFlags())
{ {
wxASSERT_MSG( flag == wxSOCKET_WAITALL || flag == wxSOCKET_NOWAIT, // We can be passed only wxSOCKET_WAITALL{_READ,_WRITE} or
// wxSOCKET_NOWAIT{_READ,_WRITE} normally.
wxASSERT_MSG( !(flag & wxSOCKET_WAITALL) || !(flag & wxSOCKET_NOWAIT),
"not a wait flag" ); "not a wait flag" );
// preserve wxSOCKET_BLOCK value when switching to wxSOCKET_WAITALL // preserve wxSOCKET_BLOCK value when switching to wxSOCKET_WAITALL
@@ -986,7 +988,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK ) if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
{ {
// if we don't want to wait, just return immediately // if we don't want to wait, just return immediately
if ( m_flags & (wxSOCKET_NOWAIT|wxSOCKET_NOWAIT_READ )) if ( m_flags & wxSOCKET_NOWAIT_READ )
{ {
// this shouldn't be counted as an error in this case // this shouldn't be counted as an error in this case
SetError(wxSOCKET_NOERROR); SetError(wxSOCKET_NOERROR);
@@ -1022,7 +1024,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
// we're not going to read anything else and so if we haven't read // we're not going to read anything else and so if we haven't read
// anything (or not everything in wxSOCKET_WAITALL case) already, // anything (or not everything in wxSOCKET_WAITALL case) already,
// signal an error // signal an error
if ( (m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_READ)) || !total ) if ( (m_flags & wxSOCKET_WAITALL_READ) || !total )
SetError(wxSOCKET_IOERR); SetError(wxSOCKET_IOERR);
break; break;
} }
@@ -1031,7 +1033,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
// if we are happy to read something and not the entire nbytes bytes, // if we are happy to read something and not the entire nbytes bytes,
// then we're done // then we're done
if ( !(m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_READ)) ) if ( !(m_flags & wxSOCKET_WAITALL_READ) )
break; break;
nbytes -= ret; nbytes -= ret;
@@ -1051,7 +1053,7 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
wxSocketReadGuard read(this); wxSocketReadGuard read(this);
wxSocketWaitModeChanger changeFlags(this, (wxSOCKET_WAITALL|wxSOCKET_WAITALL_READ)); wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_READ);
bool ok = false; bool ok = false;
if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) ) if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) )
@@ -1156,7 +1158,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
{ {
if ( m_impl->m_stream && !m_connected ) if ( m_impl->m_stream && !m_connected )
{ {
if ( (m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_WRITE)) || !total ) if ( (m_flags & wxSOCKET_WAITALL_WRITE) || !total )
SetError(wxSOCKET_IOERR); SetError(wxSOCKET_IOERR);
break; break;
} }
@@ -1166,7 +1168,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
{ {
if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK ) if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
{ {
if ( m_flags & (wxSOCKET_NOWAIT|wxSOCKET_NOWAIT_WRITE) ) if ( m_flags & wxSOCKET_NOWAIT_WRITE )
break; break;
if ( !DoWaitWithTimeout(wxSOCKET_OUTPUT_FLAG) ) if ( !DoWaitWithTimeout(wxSOCKET_OUTPUT_FLAG) )
@@ -1186,7 +1188,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
total += ret; total += ret;
if ( !(m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_WRITE)) ) if ( !(m_flags & wxSOCKET_WAITALL_WRITE) )
break; break;
nbytes -= ret; nbytes -= ret;
@@ -1206,7 +1208,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
wxSocketWriteGuard write(this); wxSocketWriteGuard write(this);
wxSocketWaitModeChanger changeFlags(this, (wxSOCKET_WAITALL|wxSOCKET_WAITALL_WRITE)); wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_WRITE);
msg.sig[0] = (unsigned char) 0xad; msg.sig[0] = (unsigned char) 0xad;
msg.sig[1] = (unsigned char) 0xde; msg.sig[1] = (unsigned char) 0xde;