From 1c06d5220822b8e336f526f30e0581529ea2128d Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sun, 28 Jul 2013 12:59:52 +0200 Subject: [PATCH] Misc fixes after make check feedback --- src/runmode-tile.c | 8 ++++++++ src/source-mpipe.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/runmode-tile.c b/src/runmode-tile.c index 3e5e58f677..bb5815536b 100644 --- a/src/runmode-tile.c +++ b/src/runmode-tile.c @@ -202,9 +202,17 @@ int RunModeTileMpipeWorkers(DetectEngineCtx *de_ctx) } else { mpipe_devc = SCStrdup(mpipe_dev); } + if (mpipe_devc == NULL) { + printf("ERROR: SCStrdup failed for ReceiveMpipe\n"); + exit(EXIT_FAILURE); + } snprintf(tname, sizeof(tname), "Worker%d", pipe+1); thread_name = SCStrdup(tname); + if (thread_name == NULL) { + printf("ERROR: SCStrdup failed for ReceiveMpipe\n"); + exit(EXIT_FAILURE); + } /* create the threads */ ThreadVars *tv_worker = diff --git a/src/source-mpipe.c b/src/source-mpipe.c index b98164eadc..e343b2edf4 100644 --- a/src/source-mpipe.c +++ b/src/source-mpipe.c @@ -964,10 +964,10 @@ TmEcode DecodeMpipe(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, SCPerfCounterIncr(dtv->counter_pkts, tv->sc_perf_pca); SCPerfCounterIncr(dtv->counter_pkts_per_sec, tv->sc_perf_pca); - SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, p->pktlen); + SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, GET_PKT_LEN(p)); - SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, p->pktlen); - SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, p->pktlen); + SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, GET_PKT_LEN(p)); + SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, GET_PKT_LEN(p)); /* call the decoder */ DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);