From 0ef5c4951943fb02c1d4abc3f8397ea88d6ba59c Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 15 Sep 1999 00:02:31 +0000 Subject: [PATCH] changed the field name "m_type" to "m_dataType" to avoid 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 --- src/cas/generic/casDGClient.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cas/generic/casDGClient.cc b/src/cas/generic/casDGClient.cc index ef3d20ad2..507177ee7 100644 --- a/src/cas/generic/casDGClient.cc +++ b/src/cas/generic/casDGClient.cc @@ -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); } //