From bb26e6216e5190d841529c0ecb1292b9a358ed54 Mon Sep 17 00:00:00 2001 From: Jingyu Yang Date: Mon, 24 Dec 2018 16:22:42 +0800 Subject: [PATCH] source-pcap:set PktAcqBreakLoop as pcap_breakloop --- src/source-pcap.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/source-pcap.c b/src/source-pcap.c index ddb34c7f02..6ba556fc53 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -94,6 +94,7 @@ TmEcode ReceivePcapThreadInit(ThreadVars *, const void *, void **); void ReceivePcapThreadExitStats(ThreadVars *, void *); TmEcode ReceivePcapThreadDeinit(ThreadVars *, void *); TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot); +TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data); TmEcode DecodePcapThreadInit(ThreadVars *, const void *, void **); TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data); @@ -113,7 +114,7 @@ void TmModuleReceivePcapRegister (void) tmm_modules[TMM_RECEIVEPCAP].ThreadInit = ReceivePcapThreadInit; tmm_modules[TMM_RECEIVEPCAP].Func = NULL; tmm_modules[TMM_RECEIVEPCAP].PktAcqLoop = ReceivePcapLoop; - tmm_modules[TMM_RECEIVEPCAP].PktAcqBreakLoop = NULL; + tmm_modules[TMM_RECEIVEPCAP].PktAcqBreakLoop = ReceivePcapBreakLoop; tmm_modules[TMM_RECEIVEPCAP].ThreadExitPrintStats = ReceivePcapThreadExitStats; tmm_modules[TMM_RECEIVEPCAP].ThreadDeinit = NULL; tmm_modules[TMM_RECEIVEPCAP].RegisterTests = NULL; @@ -298,6 +299,20 @@ TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot) SCReturnInt(TM_ECODE_OK); } +/** + * \brief PCAP Break Loop function. + */ +TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data) +{ + SCEnter(); + PcapThreadVars *ptv = (PcapThreadVars *)data; + if (ptv->pcap_handle == NULL) { + SCReturnInt(TM_ECODE_FAILED); + } + pcap_breakloop(ptv->pcap_handle); + SCReturnInt(TM_ECODE_OK); +} + /** * \brief Init function for ReceivePcap. * -- 2.47.2