aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Napatech code formatting fixes.

Browse Source
remotes/origin/master
Victor Julien 15 years ago
parent 95a5bebb6a
commit e1a309a6b2
2 changed files with 187 additions and 189 deletions
Show Stats Download Patch File Download Diff File

310
src/runmode-napatech.c
Unescape Escape View File

@ -48,14 +48,12 @@ void RunModeNapatechRegister(void)
#ifdef HAVE_NAPATECH #ifdef HAVE_NAPATECH
default_mode = "auto"; default_mode = "auto";
RunModeRegisterNewRunMode(RUNMODE_NAPATECH, "auto", RunModeRegisterNewRunMode(RUNMODE_NAPATECH, "auto",
"Multi threaded Napatech mode", "Multi threaded Napatech mode",
RunModeNapatechAuto2); RunModeNapatechAuto2);
return; return;
#endif #endif
} }
#define MAX_NAPATECH_DETECT 2
int RunModeNapatechAuto(DetectEngineCtx *de_ctx) { int RunModeNapatechAuto(DetectEngineCtx *de_ctx) {
#ifdef HAVE_NAPATECH #ifdef HAVE_NAPATECH
int i; int i;
@ -106,33 +104,33 @@ int RunModeNapatechAuto(DetectEngineCtx *de_ctx) {
/* create the threads */ /* create the threads */
ThreadVars *tv_napatechFeed = TmThreadCreatePacketHandler(threadName,"packetpool", ThreadVars *tv_napatechFeed = TmThreadCreatePacketHandler(threadName,"packetpool",
"packetpool",outQueueName, "packetpool",outQueueName,
"simple","pktacqloop"); "simple","pktacqloop");
if (tv_napatechFeed == NULL) { if (tv_napatechFeed == NULL) {
fprintf(stderr, "ERROR: TmThreadsCreate failed\n"); fprintf(stderr, "ERROR: TmThreadsCreate failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmModule *tm_module = TmModuleGetByName("NapatechFeed"); TmModule *tm_module = TmModuleGetByName("NapatechFeed");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechFeed\n"); fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechFeed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend (tv_napatechFeed,tm_module,feedName); TmSlotSetFuncAppend (tv_napatechFeed,tm_module,feedName);
tm_module = TmModuleGetByName("NapatechDecode"); tm_module = TmModuleGetByName("NapatechDecode");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechDecode\n"); fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechDecode\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_napatechFeed,tm_module,feedName); TmSlotSetFuncAppend(tv_napatechFeed,tm_module,feedName);
if (threading_set_cpu_affinity) { if (threading_set_cpu_affinity) {
TmThreadSetCPUAffinity(tv_napatechFeed, feed); TmThreadSetCPUAffinity(tv_napatechFeed, feed);
} }
if (TmThreadSpawn(tv_napatechFeed) != TM_ECODE_OK) { if (TmThreadSpawn(tv_napatechFeed) != TM_ECODE_OK) {
printf("ERROR: TmThreadSpawn failed\n"); printf("ERROR: TmThreadSpawn failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* /*
* ------------------------------------------- * -------------------------------------------
@ -141,60 +139,60 @@ int RunModeNapatechAuto(DetectEngineCtx *de_ctx) {
/* hard code it for now */ /* hard code it for now */
uint16_t detect=0; uint16_t detect=0;
/* always create at least one thread */ /* always create at least one thread */
int thread_max = TmThreadGetNbThreads(DETECT_CPU_SET); int thread_max = TmThreadGetNbThreads(DETECT_CPU_SET);
if (thread_max == 0) if (thread_max == 0)
thread_max = ncpus * threading_detect_ratio; thread_max = ncpus * threading_detect_ratio;
if (thread_max < 1) if (thread_max < 1)
thread_max = 1; thread_max = 1;
for (i=0; i< thread_max; i++) for (i=0; i< thread_max; i++)
{ {
snprintf(tname, sizeof(tname),"Detect%"PRIu16"/%"PRIu16,feed,detect++); snprintf(tname, sizeof(tname),"Detect%"PRIu16"/%"PRIu16,feed,detect++);
threadName = SCStrdup(tname); threadName = SCStrdup(tname);
snprintf(tname, sizeof(tname),"feed-queue%"PRIu16,feed); snprintf(tname, sizeof(tname),"feed-queue%"PRIu16,feed);
inQueueName = SCStrdup(tname); inQueueName = SCStrdup(tname);
ThreadVars *tv_detect = TmThreadCreatePacketHandler(threadName, ThreadVars *tv_detect = TmThreadCreatePacketHandler(threadName,
inQueueName,"simple", inQueueName,"simple",
"packetpool","packetpool","varslot"); "packetpool","packetpool","varslot");
if (tv_detect == NULL) { if (tv_detect == NULL) {
fprintf(stderr,"ERROR: TmThreadsCreate failed\n"); fprintf(stderr,"ERROR: TmThreadsCreate failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
tm_module = TmModuleGetByName("StreamTcp"); tm_module = TmModuleGetByName("StreamTcp");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName StreamTcp failed\n"); fprintf(stderr, "ERROR: TmModuleGetByName StreamTcp failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_detect,tm_module,NULL); TmSlotSetFuncAppend(tv_detect,tm_module,NULL);
tm_module = TmModuleGetByName("Detect"); tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName Detect failed\n"); fprintf(stderr, "ERROR: TmModuleGetByName Detect failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_detect,tm_module,(void *)de_ctx); TmSlotSetFuncAppend(tv_detect,tm_module,(void *)de_ctx);
thread_group_name = SCStrdup("Detect"); thread_group_name = SCStrdup("Detect");
if (thread_group_name == NULL) { if (thread_group_name == NULL) {
fprintf(stderr, "Error allocating memory\n"); fprintf(stderr, "Error allocating memory\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
tv_detect->thread_group_name = thread_group_name; tv_detect->thread_group_name = thread_group_name;
SetupOutputs(tv_detect); SetupOutputs(tv_detect);
thread_group_name = SCStrdup("Outputs"); thread_group_name = SCStrdup("Outputs");
if (thread_group_name == NULL) { if (thread_group_name == NULL) {
fprintf(stderr, "Error allocating memory\n"); fprintf(stderr, "Error allocating memory\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
tv_detect->thread_group_name = thread_group_name; tv_detect->thread_group_name = thread_group_name;
if (TmThreadSpawn(tv_detect) != TM_ECODE_OK) { if (TmThreadSpawn(tv_detect) != TM_ECODE_OK) {
fprintf(stderr, "ERROR: TmThreadSpawn failed\n"); fprintf(stderr, "ERROR: TmThreadSpawn failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
} }
@ -252,62 +250,62 @@ int RunModeNapatechAuto2(DetectEngineCtx *de_ctx) {
/* create the threads */ /* create the threads */
ThreadVars *tv_napatechFeed = TmThreadCreatePacketHandler(threadName,"packetpool", ThreadVars *tv_napatechFeed = TmThreadCreatePacketHandler(threadName,"packetpool",
"packetpool","packetpool", "packetpool","packetpool",
"packetpool","pktacqloop"); "packetpool","pktacqloop");
if (tv_napatechFeed == NULL) { if (tv_napatechFeed == NULL) {
fprintf(stderr, "ERROR: TmThreadsCreate failed\n"); fprintf(stderr, "ERROR: TmThreadsCreate failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmModule *tm_module = TmModuleGetByName("NapatechFeed"); TmModule *tm_module = TmModuleGetByName("NapatechFeed");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechFeed\n"); fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechFeed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend (tv_napatechFeed,tm_module,feedName); TmSlotSetFuncAppend (tv_napatechFeed,tm_module,feedName);
tm_module = TmModuleGetByName("NapatechDecode"); tm_module = TmModuleGetByName("NapatechDecode");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechDecode\n"); fprintf(stderr, "ERROR: TmModuleGetByName failed for NapatechDecode\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_napatechFeed,tm_module,feedName); TmSlotSetFuncAppend(tv_napatechFeed,tm_module,feedName);
if (threading_set_cpu_affinity) { if (threading_set_cpu_affinity) {
TmThreadSetCPUAffinity(tv_napatechFeed, feed); TmThreadSetCPUAffinity(tv_napatechFeed, feed);
}
tm_module = TmModuleGetByName("StreamTcp");
if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName StreamTcp failed\n");
exit(EXIT_FAILURE);
}
TmSlotSetFuncAppend(tv_napatechFeed,tm_module,NULL);
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName Detect failed\n");
exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_napatechFeed,tm_module,(void *)de_ctx);
tm_module = TmModuleGetByName("StreamTcp"); thread_group_name = SCStrdup("Detect");
if (tm_module == NULL) { if (thread_group_name == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName StreamTcp failed\n"); fprintf(stderr, "Error allocating memory\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_napatechFeed,tm_module,NULL); tv_napatechFeed->thread_group_name = thread_group_name;
tm_module = TmModuleGetByName("Detect"); SetupOutputs(tv_napatechFeed);
if (tm_module == NULL) { thread_group_name = SCStrdup("Outputs");
fprintf(stderr, "ERROR: TmModuleGetByName Detect failed\n"); if (thread_group_name == NULL) {
exit(EXIT_FAILURE); fprintf(stderr, "Error allocating memory\n");
} exit(EXIT_FAILURE);
TmSlotSetFuncAppend(tv_napatechFeed,tm_module,(void *)de_ctx); }
tv_napatechFeed->thread_group_name = thread_group_name;
thread_group_name = SCStrdup("Detect");
if (thread_group_name == NULL) {
fprintf(stderr, "Error allocating memory\n");
exit(EXIT_FAILURE);
}
tv_napatechFeed->thread_group_name = thread_group_name;
SetupOutputs(tv_napatechFeed);
thread_group_name = SCStrdup("Outputs");
if (thread_group_name == NULL) {
fprintf(stderr, "Error allocating memory\n");
exit(EXIT_FAILURE);
}
tv_napatechFeed->thread_group_name = thread_group_name;
if (TmThreadSpawn(tv_napatechFeed) != TM_ECODE_OK) { if (TmThreadSpawn(tv_napatechFeed) != TM_ECODE_OK) {
printf("ERROR: TmThreadSpawn failed\n"); printf("ERROR: TmThreadSpawn failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#if 0 #if 0
@ -318,60 +316,60 @@ int RunModeNapatechAuto2(DetectEngineCtx *de_ctx) {
/* hard code it for now */ /* hard code it for now */
uint16_t detect=0; uint16_t detect=0;
/* always create at least one thread */ /* always create at least one thread */
int thread_max = TmThreadGetNbThreads(DETECT_CPU_SET); int thread_max = TmThreadGetNbThreads(DETECT_CPU_SET);
if (thread_max == 0) if (thread_max == 0)
thread_max = ncpus * threading_detect_ratio; thread_max = ncpus * threading_detect_ratio;
if (thread_max < 1) if (thread_max < 1)
thread_max = 1; thread_max = 1;
for (i=0; i< thread_max; i++) for (i=0; i< thread_max; i++)
{ {
snprintf(tname, sizeof(tname),"Detect%"PRIu16"/%"PRIu16,feed,detect++); snprintf(tname, sizeof(tname),"Detect%"PRIu16"/%"PRIu16,feed,detect++);
threadName = SCStrdup(tname); threadName = SCStrdup(tname);
snprintf(tname, sizeof(tname),"feed-queue%"PRIu16,feed); snprintf(tname, sizeof(tname),"feed-queue%"PRIu16,feed);
inQueueName = SCStrdup(tname); inQueueName = SCStrdup(tname);
ThreadVars *tv_detect = TmThreadCreatePacketHandler(threadName, ThreadVars *tv_detect = TmThreadCreatePacketHandler(threadName,
inQueueName,"simple", inQueueName,"simple",
"packetpool","packetpool","varslot"); "packetpool","packetpool","varslot");
if (tv_detect == NULL) { if (tv_detect == NULL) {
fprintf(stderr,"ERROR: TmThreadsCreate failed\n"); fprintf(stderr,"ERROR: TmThreadsCreate failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
tm_module = TmModuleGetByName("StreamTcp"); tm_module = TmModuleGetByName("StreamTcp");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName StreamTcp failed\n"); fprintf(stderr, "ERROR: TmModuleGetByName StreamTcp failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_detect,tm_module,NULL); TmSlotSetFuncAppend(tv_detect,tm_module,NULL);
tm_module = TmModuleGetByName("Detect"); tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) { if (tm_module == NULL) {
fprintf(stderr, "ERROR: TmModuleGetByName Detect failed\n"); fprintf(stderr, "ERROR: TmModuleGetByName Detect failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
TmSlotSetFuncAppend(tv_detect,tm_module,(void *)de_ctx); TmSlotSetFuncAppend(tv_detect,tm_module,(void *)de_ctx);
thread_group_name = SCStrdup("Detect"); thread_group_name = SCStrdup("Detect");
if (thread_group_name == NULL) { if (thread_group_name == NULL) {
fprintf(stderr, "Error allocating memory\n"); fprintf(stderr, "Error allocating memory\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
tv_detect->thread_group_name = thread_group_name; tv_detect->thread_group_name = thread_group_name;
SetupOutputs(tv_detect); SetupOutputs(tv_detect);
thread_group_name = SCStrdup("Outputs"); thread_group_name = SCStrdup("Outputs");
if (thread_group_name == NULL) { if (thread_group_name == NULL) {
fprintf(stderr, "Error allocating memory\n"); fprintf(stderr, "Error allocating memory\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
tv_detect->thread_group_name = thread_group_name; tv_detect->thread_group_name = thread_group_name;
if (TmThreadSpawn(tv_detect) != TM_ECODE_OK) { if (TmThreadSpawn(tv_detect) != TM_ECODE_OK) {
fprintf(stderr, "ERROR: TmThreadSpawn failed\n"); fprintf(stderr, "ERROR: TmThreadSpawn failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
#endif #endif
} }

66
src/source-napatech.c
Unescape Escape View File

@ -65,8 +65,8 @@ void TmModuleNapatechDecodeRegister (void) {
TmEcode NoNapatechSupportExit(ThreadVars *tv, void *initdata, void **data) TmEcode NoNapatechSupportExit(ThreadVars *tv, void *initdata, void **data)
{ {
SCLogError(SC_ERR_NAPATECH_NOSUPPORT, SCLogError(SC_ERR_NAPATECH_NOSUPPORT,
"Error creating thread %s: you do not have support for Napatech adapter " "Error creating thread %s: you do not have support for Napatech adapter "
"enabled please recompile with --enable-napatech", tv->name); "enabled please recompile with --enable-napatech", tv->name);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -102,7 +102,7 @@ TmEcode NapatechDecode(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueu
/** /**
* \brief Register the Napatech receiver (reader) module. * \brief Register the Napatech receiver (reader) module.
*/ */
void void
TmModuleNapatechFeedRegister(void) TmModuleNapatechFeedRegister(void)
{ {
tmm_modules[TMM_RECEIVENAPATECH].name = "NapatechFeed"; tmm_modules[TMM_RECEIVENAPATECH].name = "NapatechFeed";
@ -118,7 +118,7 @@ TmModuleNapatechFeedRegister(void)
/** /**
* \brief Register the Napatech decoder module. * \brief Register the Napatech decoder module.
*/ */
void void
TmModuleNapatechDecodeRegister(void) TmModuleNapatechDecodeRegister(void)
{ {
tmm_modules[TMM_DECODENAPATECH].name = "NapatechDecode"; tmm_modules[TMM_DECODENAPATECH].name = "NapatechDecode";
@ -146,7 +146,7 @@ TmModuleNapatechDecodeRegister(void)
* \param data data pointer gets populated with * \param data data pointer gets populated with
* *
*/ */
TmEcode TmEcode
NapatechFeedThreadInit(ThreadVars *tv, void *initdata, void **data) NapatechFeedThreadInit(ThreadVars *tv, void *initdata, void **data)
{ {
SCEnter(); SCEnter();
@ -161,7 +161,7 @@ NapatechFeedThreadInit(ThreadVars *tv, void *initdata, void **data)
NapatechThreadVars *ntv = SCMalloc(sizeof(NapatechThreadVars)); NapatechThreadVars *ntv = SCMalloc(sizeof(NapatechThreadVars));
if (ntv == NULL) { if (ntv == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, SCLogError(SC_ERR_MEM_ALLOC,
"Failed to allocate memory for NAPATECH thread vars."); "Failed to allocate memory for NAPATECH thread vars.");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -171,7 +171,7 @@ NapatechFeedThreadInit(ThreadVars *tv, void *initdata, void **data)
ntv->tv = tv; ntv->tv = tv;
/* Use max_pending_packets as our maximum number of packets read /* Use max_pending_packets as our maximum number of packets read
from the NAPATECH buffer. from the NAPATECH buffer.
*/ */
ntv->max_read_packets = max_pending_packets; ntv->max_read_packets = max_pending_packets;
SCLogInfo("Opening NAPATECH %d:%d for processing", ntv->adapter_number, ntv->feed_number); SCLogInfo("Opening NAPATECH %d:%d for processing", ntv->adapter_number, ntv->feed_number);
@ -210,7 +210,7 @@ TmEcode NapatechFeedLoop(ThreadVars *tv, void *data, void *slot)
while (1) { while (1) {
if (suricata_ctl_flags & SURICATA_STOP || if (suricata_ctl_flags & SURICATA_STOP ||
suricata_ctl_flags & SURICATA_KILL) suricata_ctl_flags & SURICATA_KILL)
{ {
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }
@ -223,7 +223,7 @@ TmEcode NapatechFeedLoop(ThreadVars *tv, void *data, void *slot)
} }
} while (packet_q_len == 0); } while (packet_q_len == 0);
/* /*
* Napatech returns frames in segment chunks. Function ntci_next_frame * Napatech returns frames in segment chunks. Function ntci_next_frame
* returns 1 for a frame, 0 if the segment is empty, and -1 on error * returns 1 for a frame, 0 if the segment is empty, and -1 on error
*/ */
@ -232,35 +232,35 @@ TmEcode NapatechFeedLoop(ThreadVars *tv, void *data, void *slot)
/* /*
* no frames currently available * no frames currently available
*/ */
continue; continue;
} }
else if (status < 0) { else if (status < 0) {
SCLogError(SC_ERR_NAPATECH_FEED_NEXT_FAILED, SCLogError(SC_ERR_NAPATECH_FEED_NEXT_FAILED,
"Failed to read from Napatech feed %d:%d", "Failed to read from Napatech feed %d:%d",
ntv->adapter_number, ntv->feed_number); ntv->adapter_number, ntv->feed_number);
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }
// beware that storelen is aligned; therefore, it may be larger than "caplen" // beware that storelen is aligned; therefore, it may be larger than "caplen"
caplen = (header->wireLen < header->storeLen) ? header->wireLen : header->storeLen; caplen = (header->wireLen < header->storeLen) ? header->wireLen : header->storeLen;
Packet *p = PacketGetFromQueueOrAlloc(); Packet *p = PacketGetFromQueueOrAlloc();
if (unlikely(p == NULL)) { if (unlikely(p == NULL)) {
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }
p->ts.tv_sec = header->ts.tv_sec; p->ts.tv_sec = header->ts.tv_sec;
p->ts.tv_usec = header->ts.tv_usec; p->ts.tv_usec = header->ts.tv_usec;
SCLogDebug("p->ts.tv_sec %"PRIuMAX"", (uintmax_t)p->ts.tv_sec); SCLogDebug("p->ts.tv_sec %"PRIuMAX"", (uintmax_t)p->ts.tv_sec);
p->datalink = LINKTYPE_ETHERNET; p->datalink = LINKTYPE_ETHERNET;
ntv->pkts++; ntv->pkts++;
ntv->bytes += caplen; ntv->bytes += caplen;
if (unlikely(PacketCopyData(p, frame, caplen))) { if (unlikely(PacketCopyData(p, frame, caplen))) {
TmqhOutputPacketpool(ntv->tv, p); TmqhOutputPacketpool(ntv->tv, p);
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }
TmThreadsSlotProcessPkt(ntv->tv, ntv->slot, p); TmThreadsSlotProcessPkt(ntv->tv, ntv->slot, p);
} }
@ -273,7 +273,7 @@ TmEcode NapatechFeedLoop(ThreadVars *tv, void *data, void *slot)
* \param tv Pointer to ThreadVars. * \param tv Pointer to ThreadVars.
* \param data Pointer to data, ErfFileThreadVars. * \param data Pointer to data, ErfFileThreadVars.
*/ */
void void
NapatechFeedThreadExitStats(ThreadVars *tv, void *data) NapatechFeedThreadExitStats(ThreadVars *tv, void *data)
{ {
NapatechThreadVars *ntv = (NapatechThreadVars *)data; NapatechThreadVars *ntv = (NapatechThreadVars *)data;
@ -315,7 +315,7 @@ TmEcode NapatechFeedThreadDeinit(ThreadVars *tv, void *data)
* \param pq pointer to the current PacketQueue * \param pq pointer to the current PacketQueue
*/ */
TmEcode NapatechDecode(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, TmEcode NapatechDecode(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
PacketQueue *postpq) PacketQueue *postpq)
{ {
SCEnter(); SCEnter();
@ -328,7 +328,7 @@ TmEcode NapatechDecode(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, p->pktlen); SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, p->pktlen);
SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->sc_perf_pca, p->pktlen); SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->sc_perf_pca, p->pktlen);
SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->sc_perf_pca, SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->sc_perf_pca,
(p->pktlen * 8)/1000000.0); (p->pktlen * 8)/1000000.0);
SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, p->pktlen); SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, p->pktlen);
SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, p->pktlen); SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, p->pktlen);
@ -339,8 +339,8 @@ TmEcode NapatechDecode(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
break; break;
default: default:
SCLogError(SC_ERR_DATALINK_UNIMPLEMENTED, SCLogError(SC_ERR_DATALINK_UNIMPLEMENTED,
"Error: datalink type %" PRId32 " not yet supported in module DecodeNapatech", "Error: datalink type %" PRId32 " not yet supported in module DecodeNapatech",
p->datalink); p->datalink);
break; break;
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);

Write Preview
Loading…
Cancel
Save