src: remove unused headers-exported functions

+ remove double definition of IPPairLock
OISF · Jun 29, 2023 · 8c1b27c · 8c1b27c
1 parent d822ba5
commit 8c1b27c
Show file tree

Hide file tree

Showing 104 changed files with 15 additions and 1,264 deletions.
diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
@@ -1369,17 +1369,6 @@ void RegisterFTPParsers(void)
 #endif
 }
 
-void FTPAtExitPrintStats(void)
-{
-#ifdef DEBUG
-    SCMutexLock(&ftp_state_mem_lock);
-    SCLogDebug("ftp_state_memcnt %"PRIu64", ftp_state_memuse %"PRIu64"",
-               ftp_state_memcnt, ftp_state_memuse);
-    SCMutexUnlock(&ftp_state_mem_lock);
-#endif
-}
-
-
 /*
  * \brief Returns the ending offset of the next line from a multi-line buffer.
  *

diff --git a/src/app-layer-ftp.h b/src/app-layer-ftp.h
@@ -184,7 +184,6 @@ typedef struct FtpDataState_ {
 
 void RegisterFTPParsers(void);
 void FTPParserRegisterTests(void);
-void FTPAtExitPrintStats(void);
 void FTPParserCleanup(void);
 uint64_t FTPMemuseGlobalCounter(void);
 uint64_t FTPMemcapGlobalCounter(void);

diff --git a/src/app-layer-htp-body.c b/src/app-layer-htp-body.c
@@ -91,28 +91,6 @@ int HtpBodyAppendChunk(const HTPCfgDir *hcfg, HtpBody *body,
  * \param body pointer to the HtpBody holding the list
  * \retval none
  */
-void HtpBodyPrint(HtpBody *body)
-{
-    if (SCLogDebugEnabled()||1) {
-        SCEnter();
-
-        if (body->first == NULL)
-            return;
-
-        HtpBodyChunk *cur = NULL;
-        SCLogDebug("--- Start body chunks at %p ---", body);
-        printf("--- Start body chunks at %p ---\n", body);
-        for (cur = body->first; cur != NULL; cur = cur->next) {
-            const uint8_t *data = NULL;
-            uint32_t data_len = 0;
-            StreamingBufferSegmentGetData(body->sb, &cur->sbseg, &data, &data_len);
-            SCLogDebug("Body %p; data %p, len %"PRIu32, body, data, data_len);
-            printf("Body %p; data %p, len %"PRIu32"\n", body, data, data_len);
-            PrintRawDataFp(stdout, data, data_len);
-        }
-        SCLogDebug("--- End body chunks at %p ---", body);
-    }
-}
 
 /**
  * \brief Free the information held in the request body

diff --git a/src/app-layer-htp-body.h b/src/app-layer-htp-body.h
@@ -29,7 +29,6 @@
 #define __APP_LAYER_HTP_BODY_H__
 
 int HtpBodyAppendChunk(const HTPCfgDir *, HtpBody *, const uint8_t *, uint32_t);
-void HtpBodyPrint(HtpBody *);
 void HtpBodyFree(const HTPCfgDir *, HtpBody *);
 void HtpBodyPrune(HtpState *, HtpBody *, int);
 

diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
@@ -422,12 +422,6 @@ void AppLayerParserRegisterOptionFlags(uint8_t ipproto, AppProto alproto,
     SCReturn;
 }
 
-uint32_t AppLayerParserGetOptionFlags(uint8_t protomap, AppProto alproto)
-{
-    SCEnter();
-    SCReturnUInt(alp_ctx.ctxs[protomap][alproto].option_flags);
-}
-
 void AppLayerParserRegisterStateFuncs(uint8_t ipproto, AppProto alproto,
         void *(*StateAlloc)(void *, AppProto), void (*StateFree)(void *))
 {
@@ -866,11 +860,6 @@ AppLayerDecoderEvents *AppLayerParserGetDecoderEvents(AppLayerParserState *pstat
                 "AppLayerDecoderEvents *");
 }
 
-void AppLayerParserSetDecoderEvents(AppLayerParserState *pstate, AppLayerDecoderEvents *devents)
-{
-    pstate->decoder_events = devents;
-}
-
 AppLayerDecoderEvents *AppLayerParserGetEventsByTx(uint8_t ipproto, AppProto alproto,
                                         void *tx)
 {
@@ -1827,27 +1816,6 @@ static inline void AppLayerParserStreamTruncated(AppLayerParserState *pstate, co
     SCReturn;
 }
 
-#ifdef DEBUG
-void AppLayerParserStatePrintDetails(AppLayerParserState *pstate)
-{
-    SCEnter();
-
-    if (pstate == NULL)
-        SCReturn;
-
-    AppLayerParserState *p = pstate;
-    SCLogDebug("AppLayerParser parser state information for parser state p(%p). "
-               "p->inspect_id[0](%"PRIu64"), "
-               "p->inspect_id[1](%"PRIu64"), "
-               "p->log_id(%"PRIu64"), "
-               "p->decoder_events(%p).",
-               pstate, p->inspect_id[0], p->inspect_id[1], p->log_id,
-               p->decoder_events);
-
-    SCReturn;
-}
-#endif
-
 /***** Unittests *****/
 
 #ifdef UNITTESTS

diff --git a/src/app-layer-parser.h b/src/app-layer-parser.h
@@ -218,7 +218,6 @@ void AppLayerParserRegisterStateDataFunc(
 
 /***** Get and transaction functions *****/
 
-uint32_t AppLayerParserGetOptionFlags(uint8_t protomap, AppProto alproto);
 AppLayerGetTxIteratorFunc AppLayerGetTxIterator(const uint8_t ipproto,
          const AppProto alproto);
 
@@ -235,7 +234,6 @@ void AppLayerParserSetTransactionInspectId(const Flow *f, AppLayerParserState *p
                                 void *alstate, const uint8_t flags, bool tag_txs_as_inspected);
 
 AppLayerDecoderEvents *AppLayerParserGetDecoderEvents(AppLayerParserState *pstate);
-void AppLayerParserSetDecoderEvents(AppLayerParserState *pstate, AppLayerDecoderEvents *devents);
 AppLayerDecoderEvents *AppLayerParserGetEventsByTx(uint8_t ipproto, AppProto alproto, void *tx);
 AppLayerGetFileState AppLayerParserGetTxFiles(
         const Flow *f, void *state, void *tx, const uint8_t direction);
@@ -315,11 +313,6 @@ void AppLayerParserStateFree(AppLayerParserState *pstate);
 
 void AppLayerParserTransactionsCleanup(Flow *f, const uint8_t pkt_dir);
 
-#ifdef DEBUG
-void AppLayerParserStatePrintDetails(AppLayerParserState *pstate);
-#endif
-
-
 /***** Unittests *****/
 
 #ifdef UNITTESTS

diff --git a/src/conf.c b/src/conf.c
@@ -581,25 +581,6 @@ int ConfValIsFalse(const char *val)
  * \retval 1 will be returned if the name is found and was properly
  * converted to a double, otherwise 0 will be returned.
  */
-int ConfGetDouble(const char *name, double *val)
-{
-    const char *strval = NULL;
-    double tmpdo;
-    char *endptr;
-
-    if (ConfGet(name, &strval) == 0)
-        return 0;
-
-    errno = 0;
-    tmpdo = strtod(strval, &endptr);
-    if (strval[0] == '\0' || *endptr != '\0')
-        return 0;
-    if (errno == ERANGE)
-        return 0;
-
-    *val = tmpdo;
-    return 1;
-}
 
 /**
  * \brief Retrieve a configuration value as a float
@@ -868,36 +849,6 @@ int ConfNodeChildValueIsTrue(const ConfNode *node, const char *key)
  *  \param file The name of the file
  *  \retval str Pointer to the string path + sig_file
  */
-char *ConfLoadCompleteIncludePath(const char *file)
-{
-    const char *defaultpath = NULL;
-    char *path = NULL;
-
-    /* Path not specified */
-    if (PathIsRelative(file)) {
-        if (ConfGet("include-path", &defaultpath) == 1) {
-            SCLogDebug("Default path: %s", defaultpath);
-            size_t path_len = sizeof(char) * (strlen(defaultpath) +
-                          strlen(file) + 2);
-            path = SCMalloc(path_len);
-            if (unlikely(path == NULL))
-                return NULL;
-            strlcpy(path, defaultpath, path_len);
-            if (path[strlen(path) - 1] != '/')
-                strlcat(path, "/", path_len);
-            strlcat(path, file, path_len);
-       } else {
-            path = SCStrdup(file);
-            if (unlikely(path == NULL))
-                return NULL;
-        }
-    } else {
-        path = SCStrdup(file);
-        if (unlikely(path == NULL))
-            return NULL;
-    }
-    return path;
-}
 
 /**
  * \brief Prune a configuration node.

diff --git a/src/conf.h b/src/conf.h
@@ -61,7 +61,6 @@ ConfNode *ConfGetRootNode(void);
 int ConfGet(const char *name, const char **vptr);
 int ConfGetInt(const char *name, intmax_t *val);
 int ConfGetBool(const char *name, int *val);
-int ConfGetDouble(const char *name, double *val);
 int ConfGetFloat(const char *name, float *val);
 int ConfSet(const char *name, const char *val);
 int ConfSetFromString(const char *input, int final);
@@ -91,8 +90,8 @@ int ConfGetChildValueInt(const ConfNode *base, const char *name, intmax_t *val);
 int ConfGetChildValueBool(const ConfNode *base, const char *name, int *val);
 int ConfGetChildValueWithDefault(const ConfNode *base, const ConfNode *dflt, const char *name, const char **vptr);
 int ConfGetChildValueIntWithDefault(const ConfNode *base, const ConfNode *dflt, const char *name, intmax_t *val);
-int ConfGetChildValueBoolWithDefault(const ConfNode *base, const ConfNode *dflt, const char *name, int *val);
-char *ConfLoadCompleteIncludePath(const char *);
+int ConfGetChildValueBoolWithDefault(
+        const ConfNode *base, const ConfNode *dflt, const char *name, int *val);
 int ConfNodeIsSequence(const ConfNode *node);
 ConfNode *ConfSetIfaceNode(const char *ifaces_node_name, const char *iface);
 int ConfSetRootAndDefaultNodes(

diff --git a/src/defrag-hash.c b/src/defrag-hash.c
@@ -74,11 +74,6 @@ uint64_t DefragTrackerGetMemuse(void)
     return memusecopy;
 }
 
-uint32_t DefragTrackerSpareQueueGetSize(void)
-{
-    return DefragTrackerQueueLen(&defragtracker_spare_q);
-}
-
 void DefragTrackerMoveToSpare(DefragTracker *h)
 {
     DefragTrackerEnqueue(&defragtracker_spare_q, h);

diff --git a/src/defrag-hash.h b/src/defrag-hash.h
@@ -96,7 +96,6 @@ DefragTracker *DefragGetTrackerFromHash (Packet *);
 void DefragTrackerRelease(DefragTracker *);
 void DefragTrackerClearMemory(DefragTracker *);
 void DefragTrackerMoveToSpare(DefragTracker *);
-uint32_t DefragTrackerSpareQueueGetSize(void);
 
 int DefragTrackerSetMemcap(uint64_t);
 uint64_t DefragTrackerGetMemcap(void);

diff --git a/src/defrag-queue.c b/src/defrag-queue.c
@@ -130,13 +130,3 @@ DefragTracker *DefragTrackerDequeue (DefragTrackerQueue *q)
     DQLOCK_UNLOCK(q);
     return dt;
 }
-
-uint32_t DefragTrackerQueueLen(DefragTrackerQueue *q)
-{
-    uint32_t len;
-    DQLOCK_LOCK(q);
-    len = q->len;
-    DQLOCK_UNLOCK(q);
-    return len;
-}
-
diff --git a/src/defrag-queue.h b/src/defrag-queue.h
@@ -77,8 +77,7 @@ DefragTrackerQueue *DefragTrackerQueueInit(DefragTrackerQueue *);
 void DefragTrackerQueueDestroy (DefragTrackerQueue *);
 
 void DefragTrackerEnqueue (DefragTrackerQueue *, DefragTracker *);
-DefragTracker *DefragTrackerDequeue (DefragTrackerQueue *);
-uint32_t DefragTrackerQueueLen(DefragTrackerQueue *);
+DefragTracker *DefragTrackerDequeue(DefragTrackerQueue *);
 
 #endif /* __DEFRAG_QUEUE_H__ */
 
diff --git a/src/detect-engine-address.c b/src/detect-engine-address.c
@@ -137,23 +137,6 @@ DetectAddress *DetectAddressCopy(DetectAddress *orig)
     return ag;
 }
 
-#ifdef DEBUG
-/**
- * \brief Prints the address data information for all the DetectAddress
- *        instances in the DetectAddress list sent as the argument.
- *
- * \param head Pointer to a list of DetectAddress instances.
- */
-void DetectAddressPrintList(DetectAddress *head)
-{
-    SCLogInfo("list:");
-    for (DetectAddress *cur = head; cur != NULL; cur = cur->next) {
-        DetectAddressPrint(cur);
-    }
-    SCLogInfo("endlist");
-}
-#endif
-
 /**
  * \internal
  * \brief Frees a list of DetectAddress instances.

diff --git a/src/detect-engine-address.h b/src/detect-engine-address.h
@@ -50,8 +50,4 @@ void DetectAddressMapFree(DetectEngineCtx *de_ctx);
 const DetectAddressHead *DetectParseAddress(DetectEngineCtx *de_ctx,
         const char *string, bool *contains_negation);
 
-#ifdef DEBUG
-void DetectAddressPrintList(DetectAddress *);
-#endif
-
 #endif /* __DETECT_ADDRESS_H__ */
diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
@@ -888,11 +888,6 @@ void PatternMatchDestroy(MpmCtx *mpm_ctx, uint16_t mpm_matcher)
     mpm_table[mpm_matcher].DestroyCtx(mpm_ctx);
 }
 
-void PatternMatchThreadPrint(MpmThreadCtx *mpm_thread_ctx, uint16_t mpm_matcher)
-{
-    SCLogDebug("mpm_thread_ctx %p, mpm_matcher %"PRIu16" defunct", mpm_thread_ctx, mpm_matcher);
-    //mpm_table[mpm_matcher].PrintThreadCtx(mpm_thread_ctx);
-}
 void PatternMatchThreadDestroy(MpmThreadCtx *mpm_thread_ctx, uint16_t mpm_matcher)
 {
     SCLogDebug("mpm_thread_ctx %p, mpm_matcher %"PRIu16"", mpm_thread_ctx, mpm_matcher);

diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h
@@ -46,10 +46,8 @@ void PatternMatchThreadPrepare(MpmThreadCtx *, uint16_t type);
 
 void PatternMatchDestroy(MpmCtx *, uint16_t);
 void PatternMatchThreadDestroy(MpmThreadCtx *mpm_thread_ctx, uint16_t);
-void PatternMatchThreadPrint(MpmThreadCtx *, uint16_t);
 
 int PatternMatchPrepareGroup(DetectEngineCtx *, SigGroupHead *);
-void DetectEngineThreadCtxInfo(ThreadVars *, DetectEngineThreadCtx *);
 
 TmEcode DetectEngineThreadCtxInit(ThreadVars *, void *, void **);
 TmEcode DetectEngineThreadCtxDeinit(ThreadVars *, void *);

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
@@ -284,11 +284,6 @@ int SigGroupHeadHashAdd(DetectEngineCtx *de_ctx, SigGroupHead *sgh)
     return ret;
 }
 
-int SigGroupHeadHashRemove(DetectEngineCtx *de_ctx, SigGroupHead *sgh)
-{
-    return HashListTableRemove(de_ctx->sgh_hash_table, (void *)sgh, 0);
-}
-
 /**
  * \brief Used to lookup a SigGroupHead hash from the detection engine context
  *        SigGroupHead hash table.

diff --git a/src/detect-engine-siggroup.h b/src/detect-engine-siggroup.h
@@ -38,8 +38,6 @@ void SigGroupHeadHashFree(DetectEngineCtx *);
 
 int SigGroupHeadHashInit(DetectEngineCtx *);
 
-int SigGroupHeadHashRemove(DetectEngineCtx *, SigGroupHead *);
-
 void SigGroupHeadInitDataFree(SigGroupHeadInitData *sghid);
 void SigGroupHeadSetSigCnt(SigGroupHead *sgh, uint32_t max_idx);
 void SigGroupHeadSetProtoAndDirection(SigGroupHead *sgh,

diff --git a/src/detect-engine-tag.c b/src/detect-engine-tag.c
@@ -76,14 +76,6 @@ void TagDestroyCtx(void)
 #endif
 }
 
-/** \brief Reset the tagging engine context
- */
-void TagRestartCtx(void)
-{
-    TagDestroyCtx();
-    TagInitCtx();
-}
-
 int TagHostHasTag(Host *host)
 {
     return HostGetStorageById(host, host_tag_id) ? 1 : 0;

diff --git a/src/detect-engine-tag.h b/src/detect-engine-tag.h
@@ -48,7 +48,6 @@ void TagHandlePacket(DetectEngineCtx *, DetectEngineThreadCtx *, Packet *);
 
 void TagInitCtx(void);
 void TagDestroyCtx(void);
-void TagRestartCtx(void);
 
 int TagTimeoutCheck(Host *, SCTime_t);