summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--action.c1
-rw-r--r--plugins/omudpspoof/omudpspoof.c3
-rw-r--r--runtime/libgcry.c2
-rw-r--r--runtime/lmcry_gcry.c5
-rw-r--r--runtime/lmsig_gt.c8
-rw-r--r--runtime/queue.c2
-rw-r--r--runtime/stream.c3
-rw-r--r--tools/syslogd.c1
8 files changed, 4 insertions, 21 deletions
diff --git a/action.c b/action.c
index 49ab4839..259fb666 100644
--- a/action.c
+++ b/action.c
@@ -1277,7 +1277,6 @@ processBatchMain(action_t *pAction, batch_t *pBatch, int *pbShutdownImmediate)
if(pbShutdownImmediate != NULL) {
pbShutdownImmdtSave = pBatch->pbShutdownImmediate;
pBatch->pbShutdownImmediate = pbShutdownImmediate;
-dbgprintf("DDDD: processBatchMain ShutdownImmediate is %p, was %p\n", pBatch->pbShutdownImmediate, pbShutdownImmdtSave);
}
CHKiRet(prepareBatch(pAction, pBatch, &activeSave, &bMustRestoreActivePtr));
diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c
index 9c4c80ba..c80f0e57 100644
--- a/plugins/omudpspoof/omudpspoof.c
+++ b/plugins/omudpspoof/omudpspoof.c
@@ -435,8 +435,6 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len)
/* Write it to the wire. */
lsent = libnet_write(pData->libnet_handle);
- dbgprintf("DDDD: omudpspoof stage 1 return state %d (expected %d), fd %d\n", lsent,
- (int) (LIBNET_IPV4_H+LIBNET_UDP_H+pktLen), pData->libnet_handle->fd);
if(lsent != (int) (LIBNET_IPV4_H+LIBNET_UDP_H+pktLen)) {
/* note: access to fd is a libnet internal. If a newer version of libnet does
* not expose that member, we should simply remove it. However, while it is there
@@ -490,7 +488,6 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len)
}
/* Write it to the wire. */
lsent = libnet_write(pData->libnet_handle);
- dbgprintf("DDDD: omudpspoof stage 1 return state %d (expected %d)\n", lsent, (int) (LIBNET_IPV4_H+pktLen));
if(lsent != (int) (LIBNET_IPV4_H+pktLen)) {
DBGPRINTF("omudpspoof: fragment write error len %d, sent %d: %s\n",
LIBNET_IPV4_H+LIBNET_UDP_H+len, lsent, libnet_geterror(pData->libnet_handle));
diff --git a/runtime/libgcry.c b/runtime/libgcry.c
index e57ee8bc..51c10af4 100644
--- a/runtime/libgcry.c
+++ b/runtime/libgcry.c
@@ -238,7 +238,7 @@ addPadding(gcryfile pF, uchar *buf, size_t *plen)
unsigned i;
size_t nPad;
nPad = (pF->blkLength - *plen % pF->blkLength) % pF->blkLength;
- dbgprintf("DDDD: addPadding %d chars, blkLength %d, mod %d, pad %d\n",
+ DBGPRINTF("libgcry: addPadding %d chars, blkLength %d, mod %d, pad %d\n",
*plen, pF->blkLength, *plen % pF->blkLength, nPad);
for(i = 0 ; i < nPad ; ++i)
buf[(*plen)+i] = 0x00;
diff --git a/runtime/lmcry_gcry.c b/runtime/lmcry_gcry.c
index 2e4cfff3..0a9b94bc 100644
--- a/runtime/lmcry_gcry.c
+++ b/runtime/lmcry_gcry.c
@@ -69,7 +69,6 @@ errfunc(__attribute__((unused)) void *usrptr, uchar *emsg)
/* Standard-Constructor
*/
BEGINobjConstruct(lmcry_gcry)
- dbgprintf("DDDD: lmcry_gcry: called construct\n");
pThis->ctx = gcryCtxNew();
ENDobjConstruct(lmcry_gcry)
@@ -77,7 +76,6 @@ ENDobjConstruct(lmcry_gcry)
/* destructor for the lmcry_gcry object */
BEGINobjDestruct(lmcry_gcry) /* be sure to specify the object type also in END and CODESTART macros! */
CODESTARTobjDestruct(lmcry_gcry)
- dbgprintf("DDDD: lmcry_gcry: called destruct\n");
rsgcryCtxDel(pThis->ctx);
ENDobjDestruct(lmcry_gcry)
@@ -198,7 +196,6 @@ OnFileOpen(void *pT, uchar *fn, void *pGF)
lmcry_gcry_t *pThis = (lmcry_gcry_t*) pT;
gcryfile *pgf = (gcryfile*) pGF;
DEFiRet;
-dbgprintf("DDDD: cry: onFileOpen: %s\n", fn);
CHKiRet(rsgcryInitCrypt(pThis->ctx, pgf, fn));
finalize_it:
@@ -213,7 +210,6 @@ static rsRetVal
Encrypt(void *pF, uchar *rec, size_t *lenRec)
{
DEFiRet;
-dbgprintf("DDDD: Encrypt (%u): %s\n", *lenRec-1, rec);
iRet = rsgcryEncrypt(pF, rec, lenRec);
RETiRet;
@@ -223,7 +219,6 @@ static rsRetVal
OnFileClose(void *pF, off64_t offsLogfile)
{
DEFiRet;
-dbgprintf("DDDD: onFileClose\n");
gcryfileDestruct(pF, offsLogfile);
RETiRet;
diff --git a/runtime/lmsig_gt.c b/runtime/lmsig_gt.c
index 09691292..e9194c76 100644
--- a/runtime/lmsig_gt.c
+++ b/runtime/lmsig_gt.c
@@ -66,7 +66,6 @@ errfunc(__attribute__((unused)) void *usrptr, uchar *emsg)
/* Standard-Constructor
*/
BEGINobjConstruct(lmsig_gt)
- dbgprintf("DDDD: lmsig_gt: called construct\n");
pThis->ctx = rsgtCtxNew();
rsgtsetErrFunc(pThis->ctx, errfunc, NULL);
ENDobjConstruct(lmsig_gt)
@@ -75,7 +74,6 @@ ENDobjConstruct(lmsig_gt)
/* destructor for the lmsig_gt object */
BEGINobjDestruct(lmsig_gt) /* be sure to specify the object type also in END and CODESTART macros! */
CODESTARTobjDestruct(lmsig_gt)
- dbgprintf("DDDD: lmsig_gt: called destruct\n");
rsgtCtxDel(pThis->ctx);
ENDobjDestruct(lmsig_gt)
@@ -133,7 +131,7 @@ OnFileOpen(void *pT, uchar *fn, void *pGF)
lmsig_gt_t *pThis = (lmsig_gt_t*) pT;
gtfile *pgf = (gtfile*) pGF;
DEFiRet;
-dbgprintf("DDDD: onFileOpen: %s\n", fn);
+ DBGPRINTF("lmsig_gt: onFileOpen: %s\n", fn);
/* note: if *pgf is set to NULL, this auto-disables GT functions */
*pgf = rsgtCtxOpenFile(pThis->ctx, fn);
sigblkInit(*pgf);
@@ -152,7 +150,7 @@ static rsRetVal
OnRecordWrite(void *pF, uchar *rec, rs_size_t lenRec)
{
DEFiRet;
-dbgprintf("DDDD: onRecordWrite (%d): %s\n", lenRec-1, rec);
+ DBGPRINTF("lmsig_gt: onRecordWrite (%d): %s\n", lenRec-1, rec);
sigblkAddRecord(pF, rec, lenRec-1);
RETiRet;
@@ -162,7 +160,7 @@ static rsRetVal
OnFileClose(void *pF)
{
DEFiRet;
-dbgprintf("DDDD: onFileClose\n");
+ DBGPRINTF("lmsig_gt: onFileClose\n");
rsgtfileDestruct(pF);
RETiRet;
diff --git a/runtime/queue.c b/runtime/queue.c
index 74090a4d..600b5688 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -1150,7 +1150,6 @@ tryShutdownWorkersWithinActionTimeout(qqueue_t *pThis)
DBGOPRINT((obj_t*) pThis, "trying to shutdown workers within Action Timeout");
DBGOPRINT((obj_t*) pThis, "setting EnqOnly mode\n");
pThis->bEnqOnly = 1;
-dbgprintf("DDDD: setting shutdownImmediate mode, ptr %p!\n", &pThis->bShutdownImmediate);
pThis->bShutdownImmediate = 1;
/* now DA queue */
if(pThis->bIsDA) {
@@ -1856,7 +1855,6 @@ ConsumerReg(qqueue_t *pThis, wti_t *pWti)
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &iCancelStateSave);
-dbgprintf("DDDD: calling consumer with shutdownImmeditate ptr %p\n", &pThis->bShutdownImmediate);
CHKiRet(pThis->pConsumer(pThis->pAction, &pWti->batch, &pThis->bShutdownImmediate));
/* we now need to check if we should deliberately delay processing a bit
diff --git a/runtime/stream.c b/runtime/stream.c
index b0df8418..b781324a 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -255,7 +255,6 @@ doPhysOpen(strm_t *pThis)
pThis->bIsTTY = 0;
}
-dbgprintf("DDDD: cryprov %p\n", pThis->cryprov);
if(pThis->cryprov != NULL) {
CHKiRet(pThis->cryprov->OnFileOpen(pThis->cryprovData,
pThis->pszCurrFName, &pThis->cryprovFileData));
@@ -1218,11 +1217,9 @@ strmPhysWrite(strm_t *pThis, uchar *pBuf, size_t lenBuf)
CHKiRet(strmOpenFile(pThis));
/* here we place our crypto interface */
-dbgprintf("DDDD: doing crypto, len %d\n", lenBuf);
if(pThis->cryprov != NULL) {
pThis->cryprov->Encrypt(pThis->cryprovFileData, pBuf, &lenBuf);
}
-dbgprintf("DDDD: done crypto, len %d\n", lenBuf);
/* end crypto */
iWritten = lenBuf;
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 77adb2cb..fe1205dd 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -567,7 +567,6 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShu
assert(pBatch != NULL);
pBatch->pbShutdownImmediate = pbShutdownImmediate; /* TODO: move this to batch creation! */
preprocessBatch(pBatch);
-dbgprintf("DDDD: batches ShutdownImmediate is %p\n", pBatch->pbShutdownImmediate);
ruleset.ProcessBatch(pBatch);
//TODO: the BATCH_STATE_COMM must be set somewhere down the road, but we
//do not have this yet and so we emulate -- 2010-06-10
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 12:33:47 +0000