From 945cd55ff2fdd0cb4f3f893bf2f7c4440ca527e1 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 26 Sep 2000 20:32:50 +0000 Subject: [PATCH] use new udp size constants defined by ca lib --- src/cas/generic/casDGClient.cc | 10 +++++----- src/cas/generic/st/ioBlocked.cc | 2 +- src/cas/io/bsdSocket/casDGIntfIO.cc | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cas/generic/casDGClient.cc b/src/cas/generic/casDGClient.cc index b7a2a4ef0..5286d62ab 100644 --- a/src/cas/generic/casDGClient.cc +++ b/src/cas/generic/casDGClient.cc @@ -46,7 +46,7 @@ // casDGClient::casDGClient() // casDGClient::casDGClient (caServerI &serverIn) : - casClient (serverIn, MAX_UDP+sizeof(cadg)) + casClient (serverIn, MAX_UDP_RECV+sizeof(cadg)) { } @@ -413,9 +413,9 @@ inBuf::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv, inBuf::fillCondition stat; cadg *pHdr; - while (pAfter-pCurBuf >= static_cast(MAX_UDP+sizeof(cadg))) { + while (pAfter-pCurBuf >= static_cast(MAX_UDP_RECV+sizeof(cadg))) { pHdr = reinterpret_cast(pCurBuf); - stat = this->osdRecv (reinterpret_cast(pHdr+1), MAX_UDP, parm, + stat = this->osdRecv (reinterpret_cast(pHdr+1), MAX_UDP_RECV, parm, nDGBytesRecv, pHdr->cadg_addr); if (stat==casFillProgress) { pHdr->cadg_nBytes = nDGBytesRecv + sizeof(*pHdr); @@ -458,7 +458,7 @@ caStatus casDGClient::asyncSearchResponse (const caNetAddr &outAddr, // void *pRaw; const outBufCtx outctx = this->outBuf::pushCtx - (sizeof(cadg), MAX_UDP, pRaw); + (sizeof(cadg), MAX_UDP_SEND, pRaw); if (outctx.pushResult()!=outBufCtx::pushCtxSuccess) { return S_cas_sendBlocked; } @@ -500,7 +500,7 @@ caStatus casDGClient::processDG () // and grab the send lock // void *pRaw; - const outBufCtx outctx = this->outBuf::pushCtx (sizeof(cadg), MAX_UDP, pRaw); + const outBufCtx outctx = this->outBuf::pushCtx (sizeof(cadg), MAX_UDP_SEND, pRaw); if ( outctx.pushResult() != outBufCtx::pushCtxSuccess ) { status = S_cas_sendBlocked; break; diff --git a/src/cas/generic/st/ioBlocked.cc b/src/cas/generic/st/ioBlocked.cc index 62e58b811..183305204 100644 --- a/src/cas/generic/st/ioBlocked.cc +++ b/src/cas/generic/st/ioBlocked.cc @@ -9,7 +9,7 @@ #include -#include "casdef.h" +#include "server.h" // // ioBlocked::ioBlocked () diff --git a/src/cas/io/bsdSocket/casDGIntfIO.cc b/src/cas/io/bsdSocket/casDGIntfIO.cc index fad168055..ac5c2e12e 100644 --- a/src/cas/io/bsdSocket/casDGIntfIO.cc +++ b/src/cas/io/bsdSocket/casDGIntfIO.cc @@ -433,7 +433,7 @@ bufSizeT casDGIntfIO::optimumOutBufferSize () // must update client before the message size can be // increased here // - return MAX_UDP; + return MAX_UDP_SEND; #else int n; int size; @@ -449,11 +449,11 @@ bufSizeT casDGIntfIO::optimumOutBufferSize () (char *)&size, &n); if(status < 0 || n != sizeof(size)){ - size = MAX_UDP; + size = MAX_UDP_SEND; } if (size<=0) { - size = MAX_UDP; + size = MAX_UDP_SEND; } return (bufSizeT) size; #endif