decode: create util function for basic counter updates

diff --git a/src/decode.c b/src/decode.c
index 682e0b3c9a01eb2fb65efc6edef78fa43d9e0967..b80703884169f2a1a4eb0ab3fb2c57cb732acf92 100644 (file)
--- a/src/decode.c
+++ b/src/decode.c
@@ -420,6 +420,16 @@ void DecodeRegisterPerfCounters(DecodeThreadVars *dtv, ThreadVars *tv)
     return;
 }
 
+void DecodeUpdatePacketCounters(ThreadVars *tv,
+                                const DecodeThreadVars *dtv, const Packet *p)
+{
+    StatsIncr(tv, dtv->counter_pkts);
+    //StatsIncr(tv, dtv->counter_pkts_per_sec);
+    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
+    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+}
+
 /**
  *  \brief Debug print function for printing addresses
  *

diff --git a/src/decode.h b/src/decode.h
index 1c1bba5f54dd495108c35f30ba6ab7c36c7347c1..3f77cd06da3986e7e5cfd8c5d14e1a0bc44aa819 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -862,6 +862,8 @@ const char *PktSrcToString(enum PktSrcEnum pkt_src);
 
 DecodeThreadVars *DecodeThreadVarsAlloc(ThreadVars *);
 void DecodeThreadVarsFree(ThreadVars *, DecodeThreadVars *);
+void DecodeUpdatePacketCounters(ThreadVars *tv,
+                                const DecodeThreadVars *dtv, const Packet *p);
 
 /* decoder functions */
 int DecodeEthernet(ThreadVars *, DecodeThreadVars *, Packet *, uint8_t *, uint16_t, PacketQueue *);

diff --git a/src/source-af-packet.c b/src/source-af-packet.c
index 654ce00c8b6cfaf5e49038b544681314092652eb..3f1f44e19ddd6621c0e66f615badbd14019a998c 100644 (file)
--- a/src/source-af-packet.c
+++ b/src/source-af-packet.c
@@ -1852,11 +1852,7 @@ TmEcode DecodeAFP(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packet
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-    //StatsIncr(tv, dtv->counter_pkts_per_sec);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     /* If suri has set vlan during reading, we increase vlan counter */
     if (p->vlan_idx) {

diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c
index 30baadcd1d745be3f69a3ec0ead7473d41a335b5..2614dd05b3dffc41719d99178476fd6b9b680bda 100644 (file)
--- a/src/source-erf-dag.c
+++ b/src/source-erf-dag.c
@@ -621,11 +621,7 @@ DecodeErfDag(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-    //StatsIncr(tv, dtv->counter_pkts_per_sec);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
         /* call the decoder */
     switch(p->datalink) {

diff --git a/src/source-erf-file.c b/src/source-erf-file.c
index fd6973f57ff1db4ec3689781bbf51f9cdbb71534..938621c40a31c109e91a5ce2348da16febf1bae6 100644 (file)
--- a/src/source-erf-file.c
+++ b/src/source-erf-file.c
@@ -284,11 +284,7 @@ DecodeErfFile(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueu
         return TM_ECODE_OK;
 
     /* Update counters. */
-    StatsIncr(tv, dtv->counter_pkts);
-    //StatsIncr(tv, dtv->counter_pkts_per_sec);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
 

diff --git a/src/source-ipfw.c b/src/source-ipfw.c
index 1b4c1c7e99094953ca76b151bd08d18c9d9a1aec..4c68958bed947706a53a519cb8861878502aa275 100644 (file)
--- a/src/source-ipfw.c
+++ b/src/source-ipfw.c
@@ -452,10 +452,7 @@ TmEcode DecodeIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packe
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     /* Process IP packets */
     if (IPV4_GET_RAW_VER(ip4h) == 4) {

diff --git a/src/source-mpipe.c b/src/source-mpipe.c
index 54a567bc7545ebaf64fa04cbe2aceb39ecf519c1..9fdebf65a0eb6820827d279b7f1ba98491153dbf 100644 (file)
--- a/src/source-mpipe.c
+++ b/src/source-mpipe.c
@@ -1039,13 +1039,7 @@ TmEcode DecodeMpipe(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-//    StatsIncr(tv, dtv->counter_pkts_per_sec);
-
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     /* call the decoder */
     DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);

diff --git a/src/source-napatech.c b/src/source-napatech.c
index e964d4e8bed22ed836fb648ab858344b78ca3208..27432314e8930c525ee93b04853b6b83a7d2ede6 100644 (file)
--- a/src/source-napatech.c
+++ b/src/source-napatech.c
@@ -357,11 +357,7 @@ TmEcode NapatechDecode(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-//    StatsIncr(tv, dtv->counter_pkts_per_sec);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     switch (p->datalink) {
         case LINKTYPE_ETHERNET:

diff --git a/src/source-netmap.c b/src/source-netmap.c
index 89fd69fea08b054d2f2c8c59e1a85fcbf715dc29..570ecfc4da470aa294fdd9928fe6fa9e2d049e53 100644 (file)
--- a/src/source-netmap.c
+++ b/src/source-netmap.c
@@ -930,10 +930,7 @@ static TmEcode DecodeNetmap(ThreadVars *tv, Packet *p, void *data, PacketQueue *
         SCReturnInt(TM_ECODE_OK);
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
 

diff --git a/src/source-nflog.c b/src/source-nflog.c
index 865edd5282182fedbb9a9e77be40ce91d10a1265..7722244ffee151d184f6052393dc6043ae5fd955 100644 (file)
--- a/src/source-nflog.c
+++ b/src/source-nflog.c
@@ -499,10 +499,7 @@ TmEcode DecodeNFLOG(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Pack
     IPV6Hdr *ip6h = (IPV6Hdr *)GET_PKT_DATA(p);
     DecodeThreadVars *dtv = (DecodeThreadVars *)data;
 
-    StatsIncr(tv, dtv->counter_pkts);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     if (IPV4_GET_RAW_VER(ip4h) == 4) {
         SCLogDebug("IPv4 packet");

diff --git a/src/source-nfq.c b/src/source-nfq.c
index 34a747cb32406980d3b6026332090615c79bffe2..b8b38bc3e621de7789781e2ca6a47f4e95d6a0df 100644 (file)
--- a/src/source-nfq.c
+++ b/src/source-nfq.c
@@ -1223,10 +1223,7 @@ TmEcode DecodeNFQ(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packet
     if (p->flags & PKT_PSEUDO_STREAM_END)
         return TM_ECODE_OK;
 
-    StatsIncr(tv, dtv->counter_pkts);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     if (IPV4_GET_RAW_VER(ip4h) == 4) {
         SCLogDebug("IPv4 packet");

diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index 7a857fdff4685a2097667b90939ad8746a4cd811..5d60b9871340f40ac7b1a6dffc86550f68c0f360 100644 (file)
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -401,11 +401,7 @@ TmEcode DecodePcapFile(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, P
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-    //StatsIncr(tv, dtv->counter_pkts_per_sec);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     double curr_ts = p->ts.tv_sec + p->ts.tv_usec / 1000.0;
     if (curr_ts < prev_signaled_ts || (curr_ts - prev_signaled_ts) > 60.0) {

diff --git a/src/source-pcap.c b/src/source-pcap.c
index cb38e3f7dc6443da6758566c96f71ed5fc4dea63..0656f9589069bbc609b3b0dee84d9a112781203f 100644 (file)
--- a/src/source-pcap.c
+++ b/src/source-pcap.c
@@ -704,11 +704,7 @@ TmEcode DecodePcap(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packe
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-    //StatsIncr(tv, dtv->counter_pkts_per_sec);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     /* call the decoder */
     switch(p->datalink) {

diff --git a/src/source-pfring.c b/src/source-pfring.c
index 88e128622ef368bdd0a2f9d601f92c03eb952051..84fe0df6156830494716228a8717e7e261747967 100644 (file)
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -602,11 +602,7 @@ TmEcode DecodePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Pac
         return TM_ECODE_OK;
 
     /* update counters */
-    StatsIncr(tv, dtv->counter_pkts);
-    //StatsIncr(tv, dtv->counter_pkts_per_sec);
-    StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
-    StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
-    StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
+    DecodeUpdatePacketCounters(tv, dtv, p);
 
     /* If suri has set vlan during reading, we increase vlan counter */
     if (p->vlan_idx) {