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

merge

Browse Source
This commit is contained in:
Matej Sekoranja
2014-11-11 12:28:05 +01:00
parent 3917483cb6 2f1c227f4f
commit 4ec961e98b
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgtags
+7
View File
@@ -24,3 +24,10 @@ cf6fc9696904fd1735523a70a4f59b5ad6a3f2d5 4.0.0
84ef9a50bccaf7fcd1aef1b3a5d0cd6336fdac4c 4.0.0
84ef9a50bccaf7fcd1aef1b3a5d0cd6336fdac4c 4.0.0
c6df866bf6ca8f9385c91dd74b65fea34bab58ca 4.0.0
c6df866bf6ca8f9385c91dd74b65fea34bab58ca 4.0.0
873428fb5c69e02b3c036112a12623dcd81914ca 4.0.0
873428fb5c69e02b3c036112a12623dcd81914ca 4.0.0
9b26817264fe1d44b6cb2076ac0ba13cd09d63d1 4.0.0
9b26817264fe1d44b6cb2076ac0ba13cd09d63d1 4.0.0
f9d4bcb4bd1d37c1c9046a89d2dd5c53842f5386 4.0.0
46bd8146413cd5e201d6cc04fbf8574083be3d3a 4.0.1
pvtoolsSrc/pvlist.cpp
+4 -2
View File
@@ -152,7 +152,9 @@ void processSearchResponse(osiSockAddr const & responseFrom, ByteBuffer & receiv
if (serverAddress.ia.sin_addr.s_addr == INADDR_ANY)
serverAddress.ia.sin_addr = responseFrom.ia.sin_addr;
serverAddress.ia.sin_port = htons(receiveBuffer.getShort());
// NOTE: htons might be a macro (e.g. vxWorks)
int16 port = receiveBuffer.getShort();
serverAddress.ia.sin_port = htons(port);
string protocol = /*SerializeHelper::*/deserializeString(&receiveBuffer);
@@ -283,7 +285,7 @@ bool discoverServers(double timeOut)
sendBuffer.putByte(PVA_VERSION);
sendBuffer.putByte((EPICS_BYTE_ORDER == EPICS_ENDIAN_BIG) ? 0x80 : 0x00); // data + 7-bit endianess
sendBuffer.putByte((int8_t)3); // search
sendBuffer.putInt(4+1+3+16+2+1); // "zero" payload
sendBuffer.putInt(4+1+3+16+2+1+2); // "zero" payload
sendBuffer.putInt(0); // sequenceId
sendBuffer.putByte((int8_t)0x81); // reply required // TODO unicast vs multicast; for now we mark ourselves as unicast
src/pva/pvaVersion.h
+2 -2
View File
@@ -26,8 +26,8 @@
// TODO to be generated, etc.
#define EPICS_PVA_MAJOR_VERSION 4
#define EPICS_PVA_MINOR_VERSION 0
#define EPICS_PVA_MAINTENANCE_VERSION 0
#define EPICS_PVA_DEVELOPMENT_FLAG 1
#define EPICS_PVA_MAINTENANCE_VERSION 1
#define EPICS_PVA_DEVELOPMENT_FLAG 0
namespace epics {
namespace pvAccess {
src/remoteClient/clientContextImpl.cpp
+6 -2
View File
@@ -2749,7 +2749,9 @@ namespace epics {
if (serverAddress.ia.sin_addr.s_addr == INADDR_ANY)
serverAddress.ia.sin_addr = responseFrom->ia.sin_addr;
serverAddress.ia.sin_port = htons(payloadBuffer->getShort());
// NOTE: htons might be a macro (e.g. vxWorks)
int16 port = payloadBuffer->getShort();
serverAddress.ia.sin_port = htons(port);
/*string protocol =*/ SerializeHelper::deserializeString(payloadBuffer, transport.get());
@@ -2812,7 +2814,9 @@ namespace epics {
if (serverAddress.ia.sin_addr.s_addr == INADDR_ANY)
serverAddress.ia.sin_addr = responseFrom->ia.sin_addr;
serverAddress.ia.sin_port = htons(payloadBuffer->getShort());
// NOTE: htons might be a macro (e.g. vxWorks)
int16 port = payloadBuffer->getShort();
serverAddress.ia.sin_port = htons(port);
string protocol = SerializeHelper::deserializeString(payloadBuffer, transport.get());
src/server/responseHandlers.cpp
+3 -1
View File
@@ -236,7 +236,9 @@ void ServerSearchHandler::handleResponse(osiSockAddr* responseFrom,
if (responseAddress.ia.sin_addr.s_addr == INADDR_ANY)
responseAddress.ia.sin_addr = responseFrom->ia.sin_addr;
responseAddress.ia.sin_port = htons(payloadBuffer->getShort());
// NOTE: htons might be a macro (e.g. vxWorks)
int16 port = payloadBuffer->getShort();
responseAddress.ia.sin_port = htons(port);
size_t protocolsCount = SerializeHelper::readSize(payloadBuffer, transport.get());
bool allowed = (protocolsCount == 0);