Permalink
Browse files

P2P, cosmetic: break out buffer send(2) code into separate function

  • Loading branch information...
Jeff Garzik authored and sipa committed Nov 15, 2012
1 parent 607dbfd commit bc2f5aa72cfb3f456280a6d34c5d425bf24b009c
Showing with 25 additions and 22 deletions.
  1. +25 −22 src/net.cpp
View
@@ -708,6 +708,30 @@ int CNetMessage::readData(const char *pch, unsigned int nBytes)
+// requires LOCK(cs_vSend)
+void SocketSendData(CNode *pnode)
+{
+ CDataStream& vSend = pnode->vSend;
+ if (vSend.empty())
+ return;
+
+ int nBytes = send(pnode->hSocket, &vSend[0], vSend.size(), MSG_NOSIGNAL | MSG_DONTWAIT);
+ if (nBytes > 0)
+ {
+ vSend.erase(vSend.begin(), vSend.begin() + nBytes);
+ pnode->nLastSend = GetTime();
+ }
+ else if (nBytes < 0)
+ {
+ // error
+ int nErr = WSAGetLastError();
+ if (nErr != WSAEWOULDBLOCK && nErr != WSAEMSGSIZE && nErr != WSAEINTR && nErr != WSAEINPROGRESS)
+ {
+ printf("socket send error %d\n", nErr);
+ pnode->CloseSocketDisconnect();
+ }
+ }
+}
void ThreadSocketHandler(void* parg)
{
@@ -994,28 +1018,7 @@ void ThreadSocketHandler2(void* parg)
{
TRY_LOCK(pnode->cs_vSend, lockSend);
if (lockSend)
- {
- CDataStream& vSend = pnode->vSend;
- if (!vSend.empty())
- {
- int nBytes = send(pnode->hSocket, &vSend[0], vSend.size(), MSG_NOSIGNAL | MSG_DONTWAIT);
- if (nBytes > 0)
- {
- vSend.erase(vSend.begin(), vSend.begin() + nBytes);
- pnode->nLastSend = GetTime();
- }
- else if (nBytes < 0)
- {
- // error
- int nErr = WSAGetLastError();
- if (nErr != WSAEWOULDBLOCK && nErr != WSAEMSGSIZE && nErr != WSAEINTR && nErr != WSAEINPROGRESS)
- {
- printf("socket send error %d\n", nErr);
- pnode->CloseSocketDisconnect();
- }
- }
- }
- }
+ SocketSendData(pnode);
}
//

0 comments on commit bc2f5aa

Please sign in to comment.