epics/epics-base
0
0 Fork 0
Code Issues Pull Requests Projects Wiki Activity

rsrv: remove pPayload for debug logging

Browse Source 
Unused since 33f4d15ff3.
Now make clear that this is so.
This commit is contained in:
Michael Davidsaver authored and Dirk Zimoch committed 2026-11-03 16:18:08 +01:00
1 parent 1929355167
commit 8a3e7811e3
1 file changed
+39 -39
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/ioc/rsrv/camessage.c
+39 -39
View File
@@ -57,8 +57,8 @@
static EVENTFUNC read_reply;
#define logBadId(CLIENT, MP, PPL)\
logBadIdWithFileAndLineno(CLIENT, MP, PPL, __FILE__, __LINE__)
#define logBadId(CLIENT, MP)\
logBadIdWithFileAndLineno(CLIENT, MP, __FILE__, __LINE__)
/*
* for tracking db put notifies
@@ -283,7 +283,6 @@ static void log_header (
const char *pContext,
struct client *client,
const caHdrLargeArray *mp,
const void *pPayLoad,
unsigned mnum
)
{
@@ -345,12 +344,11 @@ static void log_header (
static void logBadIdWithFileAndLineno(
struct client *client,
caHdrLargeArray *mp,
const void *pPayload,
char *pFileName,
unsigned lineno
)
{
log_header ( "bad resource ID", client, mp, pPayload, 0 );
log_header ( "bad resource ID", client, mp, 0 );
SEND_LOCK ( client );
send_err ( mp, ECA_INTERNAL, client, "Bad Resource ID at %s.%d",
pFileName, lineno );
@@ -365,7 +363,7 @@ static int bad_udp_cmd_beacon ( caHdrLargeArray *mp,
{
if (CASDEBUG > 0)
log_header ("got a beacon on the wrong UDP port",
pClient, mp, pPayload, 0);
pClient, mp, 0);
return RSRV_ERROR;
}
@@ -375,9 +373,10 @@ static int bad_udp_cmd_beacon ( caHdrLargeArray *mp,
static int bad_udp_cmd_action ( caHdrLargeArray *mp,
void *pPayload, struct client *pClient )
{
(void)pPayload;
if (CASDEBUG > 0)
log_header ("invalid (damaged?) request code from UDP",
pClient, mp, pPayload, 0);
pClient, mp, 0);
return RSRV_ERROR;
}
@@ -388,7 +387,8 @@ static int bad_tcp_cmd_action ( caHdrLargeArray *mp, void *pPayload,
struct client *client )
{
const char *pCtx = "invalid (damaged?) request code from TCP";
log_header ( pCtx, client, mp, pPayload, 0 );
(void)pPayload;
log_header ( pCtx, client, mp, 0 );
/*
* by default, clients don't recover
@@ -658,7 +658,7 @@ static int read_action ( caHdrLargeArray *mp, void *pPayloadIn, struct client *p
db_field_log *pfl = NULL;
if ( ! pciu ) {
logBadId ( pClient, mp, 0 );
logBadId ( pClient, mp );
return RSRV_ERROR;
}
readAccess = asCheckGet ( pciu->asClientPVT );
@@ -753,7 +753,7 @@ static int read_notify_action ( caHdrLargeArray *mp, void *pPayload, struct clie
pciu = MPTOPCIU ( mp, client );
if ( !pciu ) {
logBadId ( client, mp, pPayload );
logBadId ( client, mp );
return RSRV_ERROR;
}
@@ -794,12 +794,12 @@ static int write_action ( caHdrLargeArray *mp,
pciu = MPTOPCIU(mp, client);
if(!pciu){
logBadId(client, mp, pPayload);
logBadId(client, mp);
return RSRV_ERROR;
}
if (INVALID_DB_REQ(mp->m_dataType)) {
log_header ("bad put data type", client, mp, pPayload, 0);
log_header ("bad put data type", client, mp, 0);
return RSRV_ERROR;
}
if (mp->m_count > dbChannelFinalElements(pciu->dbch)) {
@@ -827,7 +827,7 @@ static int write_action ( caHdrLargeArray *mp,
mp->m_dataType, pPayload, pPayload,
FALSE /* net -> host format */, mp->m_count );
if ( status != ECA_NORMAL ) {
log_header ("invalid data type", client, mp, pPayload, 0);
log_header ("invalid data type", client, mp, 0);
SEND_LOCK(client);
send_err(
mp,
@@ -897,7 +897,7 @@ static int host_name_action ( caHdrLargeArray *mp, void *pPayload,
size = epicsStrnLen(pName, mp->m_postsize)+1;
if (size > 512 || size > mp->m_postsize) {
log_header ( "bad (very long) host name",
client, mp, pPayload, 0 );
client, mp, 0 );
SEND_LOCK(client);
send_err(
mp,
@@ -922,7 +922,7 @@ static int host_name_action ( caHdrLargeArray *mp, void *pPayload,
pMalloc = malloc(size);
if(!pMalloc){
log_header ( "no space in pool for new host name",
client, mp, pPayload, 0 );
client, mp, 0 );
SEND_LOCK(client);
send_err(
mp,
@@ -984,7 +984,7 @@ static int client_name_action ( caHdrLargeArray *mp, void *pPayload,
size = epicsStrnLen(pName, mp->m_postsize)+1;
if (size > 512 || size > mp->m_postsize) {
log_header ("a very long user name was specified",
client, mp, pPayload, 0);
client, mp, 0);
SEND_LOCK(client);
send_err(
mp,
@@ -1001,7 +1001,7 @@ static int client_name_action ( caHdrLargeArray *mp, void *pPayload,
pMalloc = malloc(size);
if(!pMalloc){
log_header ("no memory for new user name",
client, mp, pPayload, 0);
client, mp, 0);
SEND_LOCK(client);
send_err(
mp,
@@ -1277,7 +1277,7 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
*/
if (mp->m_postsize<=1) {
log_header ( "empty PV name in UDP search request?",
client, mp, pPayload, 0 );
client, mp, 0 );
return RSRV_OK;
}
pName[mp->m_postsize-1] = '\0';
@@ -1302,7 +1302,7 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
mp->m_cid);
if (!pciu) {
log_header ("no memory to create new channel",
client, mp, pPayload, 0);
client, mp, 0);
SEND_LOCK(client);
send_err(mp,
ECA_ALLOCMEM,
@@ -1324,7 +1324,7 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
client->pHostName ? client->pHostName : "");
if(status != 0 && status != S_asLib_asNotActive){
log_header ("No room for security table",
client, mp, pPayload, 0);
client, mp, 0);
SEND_LOCK(client);
send_err(mp, ECA_ALLOCMEM, client, "No room for security table");
SEND_UNLOCK(client);
@@ -1354,7 +1354,7 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
}
else if (status!=0) {
log_header ("No room for access security state change subscription",
client, mp, pPayload, 0);
client, mp, 0);
SEND_LOCK(client);
send_err(mp, ECA_ALLOCMEM, client,
"No room for access security state change subscription");
@@ -1714,12 +1714,12 @@ static int write_notify_action ( caHdrLargeArray *mp, void *pPayload,
pciu = MPTOPCIU(mp, client);
if(!pciu){
logBadId ( client, mp, pPayload );
logBadId ( client, mp );
return RSRV_ERROR;
}
if (INVALID_DB_REQ(mp->m_dataType)) {
log_header ("bad put notify data type", client, mp, pPayload, 0);
log_header ("bad put notify data type", client, mp, 0);
putNotifyErrorReply (client, mp, ECA_BADTYPE);
return RSRV_ERROR;
}
@@ -1776,7 +1776,7 @@ static int write_notify_action ( caHdrLargeArray *mp, void *pPayload,
if ( busyTmp ) {
log_header("put call back time out", client,
&pciu->pPutNotify->msg, pciu->pPutNotify->pbuffer, 0);
&pciu->pPutNotify->msg, 0);
asTrapWriteAfter ( asWritePvtTmp );
putNotifyErrorReply (client, &pciu->pPutNotify->msg, ECA_PUTCBINPROG);
}
@@ -1793,7 +1793,7 @@ static int write_notify_action ( caHdrLargeArray *mp, void *pPayload,
* if there isn't enough memory left
*/
log_header ( "no memory to initiate put notify",
client, mp, pPayload, 0 );
client, mp, 0 );
putNotifyErrorReply (client, mp, ECA_ALLOCMEM);
return RSRV_ERROR;
}
@@ -1801,7 +1801,7 @@ static int write_notify_action ( caHdrLargeArray *mp, void *pPayload,
if ( ! rsrvExpandPutNotify ( pciu->pPutNotify, size ) ) {
log_header ( "no memory to initiate vector put notify",
client, mp, pPayload, 0 );
client, mp, 0 );
putNotifyErrorReply ( client, mp, ECA_ALLOCMEM );
return RSRV_ERROR;
}
@@ -1815,7 +1815,7 @@ static int write_notify_action ( caHdrLargeArray *mp, void *pPayload,
mp->m_dataType, pPayload, pciu->pPutNotify->pbuffer,
FALSE /* net -> host format */, mp->m_count );
if ( status != ECA_NORMAL ) {
log_header ("invalid data type", client, mp, pPayload, 0);
log_header ("invalid data type", client, mp, 0);
putNotifyErrorReply ( client, mp, status );
return RSRV_ERROR;
}
@@ -1852,7 +1852,7 @@ static int event_add_action (caHdrLargeArray *mp, void *pPayload, struct client
pciu = MPTOPCIU ( mp, client );
if ( ! pciu ) {
logBadId ( client, mp, pPayload );
logBadId ( client, mp );
return RSRV_ERROR;
}
@@ -1869,7 +1869,7 @@ static int event_add_action (caHdrLargeArray *mp, void *pPayload, struct client
if (!pevext) {
log_header ("no memory to add subscription",
client, mp, pPayload, 0);
client, mp, 0);
SEND_LOCK(client);
send_err(
mp,
@@ -1897,7 +1897,7 @@ static int event_add_action (caHdrLargeArray *mp, void *pPayload, struct client
read_reply, pevext, pevext->mask);
if (pevext->pdbev == NULL) {
log_header ("no memory to add subscription to db",
client, mp, pPayload, 0);
client, mp, 0);
SEND_LOCK(client);
send_err (mp, ECA_ALLOCMEM, client,
"subscription install into record %s failed",
@@ -1966,7 +1966,7 @@ static int clear_channel_reply ( caHdrLargeArray *mp,
*/
pciu = MPTOPCIU(mp, client);
if(!pciu){
logBadId ( client, mp, pPayload );
logBadId ( client, mp );
return RSRV_ERROR;
}
@@ -2042,7 +2042,7 @@ static int clear_channel_reply ( caHdrLargeArray *mp,
if(status != S_bucket_success){
UNLOCK_CLIENTQ;
errMessage (status, "Bad resource id during channel clear");
logBadId ( client, mp, pPayload );
logBadId ( client, mp );
return RSRV_ERROR;
}
rsrvChannelCount--;
@@ -2075,7 +2075,7 @@ static int event_cancel_reply ( caHdrLargeArray *mp, void *pPayload, struct clie
*/
pciu = MPTOPCIU(mp, client);
if (!pciu) {
logBadId ( client, mp, pPayload );
logBadId ( client, mp );
return RSRV_ERROR;
}
@@ -2247,7 +2247,7 @@ static int search_reply_udp ( caHdrLargeArray *mp, void *pPayload, struct client
*/
if (mp->m_postsize<=1) {
log_header ("empty PV name in UDP search request?",
client, mp, pPayload, 0);
client, mp, 0);
return RSRV_OK;
}
pName[mp->m_postsize-1] = '\0';
@@ -2337,7 +2337,7 @@ static int search_reply_tcp (
*/
if (mp->m_postsize<=1) {
log_header ("empty PV name in UDP search request?",
client, mp, pPayload, 0);
client, mp, 0);
return RSRV_OK;
}
pName[mp->m_postsize-1] = '\0';
@@ -2535,7 +2535,7 @@ int camessage ( struct client *client )
"CAS: Client version %u too old", client->minor_version_number );
SEND_UNLOCK(client);
log_header ( "CAS: Client version too old",
client, &msg, 0, nmsg );
client, &msg, nmsg );
if (msgsize >= bytes_left) {
client->recvBytesToDrain = msgsize - bytes_left;
client->recv.stk = client->recv.cnt;
@@ -2564,7 +2564,7 @@ int camessage ( struct client *client )
"CAS: Missaligned protocol rejected" );
SEND_UNLOCK(client);
log_header ( "CAS: Missaligned protocol rejected",
client, &msg, 0, nmsg );
client, &msg, nmsg );
}
status = RSRV_ERROR;
break;
@@ -2586,7 +2586,7 @@ int camessage ( struct client *client )
rsrvSizeofLargeBufTCP );
SEND_UNLOCK(client);
log_header ( "CAS: server unable to load large request message",
client, &msg, 0, nmsg );
client, &msg, nmsg );
}
assert ( client->recv.cnt <= client->recv.maxstk );
assert ( msgsize >= bytes_left );
@@ -2608,7 +2608,7 @@ int camessage ( struct client *client )
nmsg++;
if ( CASDEBUG > 2 )
log_header (NULL, client, &msg, pBody, nmsg);
log_header (NULL, client, &msg, nmsg);
if ( client->proto==IPPROTO_UDP ) {
if ( msg.m_cmmd < NELEMENTS ( udpJumpTable ) ) {