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

changed the field name "m_type" to "m_dataType" to avoid

Browse Source 
collision with a MACRO that is defined by the SENS IP stack
which is mandatory in WRS's Tornado II product.

Dont set the local interfaces's address in the msg header
when sending a beacon because it is difficult to predict
which interface will be used
This commit is contained in:
Jeff Hill
1999-09-15 00:02:31 +00:00
parent b9cb4dbdba
commit 0ef5c49519
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cas/generic/casDGClient.cc
View File

@@ -258,13 +258,13 @@ caStatus casDGClient::searchResponse(const caHdr &msg,
}
}
search_reply->m_cid = ntohl (ina.sin_addr.s_addr);
search_reply->m_type = ntohs (ina.sin_port);
search_reply->m_dataType = ntohs (ina.sin_port);
}
else {
caNetAddr addr = this->serverAddress ();
struct sockaddr_in ina = addr.getSockIP();
search_reply->m_cid = ~0U;
search_reply->m_type = ntohs (ina.sin_port);
search_reply->m_dataType = ntohs (ina.sin_port);
}
search_reply->m_count = 0ul;
@@ -322,11 +322,12 @@ void casDGClient::sendBeacon ()
//
memset(&buf, 0, sizeof(msg));
msg.m_cmmd = htons(CA_PROTO_RSRV_IS_UP);
msg.m_available = htonl (INADDR_ANY);
//
// send it to all addresses on the beacon list
//
this->sendBeaconIO(buf, sizeof(msg), msg.m_available, msg.m_count);
this->sendBeaconIO (buf, sizeof(msg), msg.m_count);
}
//