epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed tricky UDP transport replayTo issue

Browse Source
This commit is contained in:
Matej Sekoranja
2016-03-02 22:24:22 +01:00
parent d380e4c367
commit 39739c8437
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/remote/blockingUDPTransport.cpp
View File

@@ -218,8 +218,7 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
osiSockAddr fromAddress;
osiSocklen_t addrStructSize = sizeof(sockaddr);
Transport::shared_pointer thisTransport = shared_from_this(),
replyTo(_replyTransport ? _replyTransport : thisTransport);
Transport::shared_pointer thisTransport = shared_from_this();
try {
@@ -227,13 +226,6 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
size_t recvfrom_buffer_len =_receiveBuffer->getSize()-RECEIVE_BUFFER_PRE_RESERVE;
while(!_closed.get())
{
// we poll to prevent blocking indefinitely
// data ready to be read
_receiveBuffer->clear();
// reserve some space for CMD_ORIGIN_TAG
_receiveBuffer->setPosition(RECEIVE_BUFFER_PRE_RESERVE);
int bytesRead = recvfrom(_channel,
recvfrom_buffer_start, recvfrom_buffer_len,
0, (sockaddr*)&fromAddress,
@@ -259,7 +251,7 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
_receiveBuffer->setLimit(RECEIVE_BUFFER_PRE_RESERVE+bytesRead);
try{
processBuffer(replyTo, fromAddress, _receiveBuffer.get());
processBuffer(thisTransport, fromAddress, _receiveBuffer.get());
}catch(std::exception& e){
LOG(logLevelError,
"an exception caught while in UDP receiveThread at %s:%d: %s",
@@ -314,11 +306,13 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
_shutdownEvent.signal();
}
bool BlockingUDPTransport::processBuffer(Transport::shared_pointer const & replyTransport,
bool BlockingUDPTransport::processBuffer(Transport::shared_pointer const & transport,
osiSockAddr& fromAddress, ByteBuffer* receiveBuffer) {
// handle response(s)
while(likely((int)receiveBuffer->getRemaining()>=PVA_MESSAGE_HEADER_SIZE)) {
//
// read header
//
@@ -398,7 +392,7 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
else
{
// handle
_responseHandler->handleResponse(&fromAddress, replyTransport,
_responseHandler->handleResponse(&fromAddress, transport,
version, command, payloadSize,
_receiveBuffer.get());
}
@@ -668,8 +662,10 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
PVA_DEFAULT_PRIORITY));
/* The other wrinkle is that nothing should be sent from this second
* socket. So replies are made through the unicast socket.
*/
*
transport2->setReplyTransport(transport);
*/
// NOTE: search responses all always send from sendTransport
if (ignoreAddressVector.get() && ignoreAddressVector->size())
transport2->setIgnoredAddresses(ignoreAddressVector.get());