From: Victor Julien <victor@inliniac.net>
Date: Tue, 21 Jan 2014 12:50:38 +0000 (+0100)
Subject: app-layer: update UDP entry function
X-Git-Tag: suricata-2.0rc1~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09e5ea230ac995db3821d486ad72132ce0574d95;p=thirdparty%2Fsuricata.git

app-layer: update UDP entry function

Update AppLayerHandleUdp to take the ThreadVars pointer as an
argument in prepraration of handling counters in this function.
---

diff --git a/src/app-layer.c b/src/app-layer.c
index b9343b4ead..b6d64c112e 100644
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -363,7 +363,7 @@ int AppLayerHandleTCPData(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx,
  *  \retval 0 ok
  *  \retval -1 error
  */
-int AppLayerHandleUdp(AppLayerThreadCtx *tctx, Packet *p, Flow *f)
+int AppLayerHandleUdp(ThreadVars *tv, AppLayerThreadCtx *tctx, Packet *p, Flow *f)
 {
     SCEnter();
 
diff --git a/src/app-layer.h b/src/app-layer.h
index a025739e91..5d4f51ca32 100644
--- a/src/app-layer.h
+++ b/src/app-layer.h
@@ -48,7 +48,8 @@ int AppLayerHandleTCPData(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx,
 /**
  * \brief Handles an udp chunk.
  */
-int AppLayerHandleUdp(AppLayerThreadCtx *app_tctx, Packet *p, Flow *f);
+int AppLayerHandleUdp(ThreadVars *tv, AppLayerThreadCtx *app_tctx,
+                      Packet *p, Flow *f);
 
 /***** Utility *****/
 
diff --git a/src/decode-udp.c b/src/decode-udp.c
index e5ba28aea2..e1d52082e3 100644
--- a/src/decode-udp.c
+++ b/src/decode-udp.c
@@ -94,7 +94,7 @@ int DecodeUDP(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint8_t *pkt, ui
 
     /* handle the app layer part of the UDP packet payload */
     if (unlikely(p->flow != NULL)) {
-        AppLayerHandleUdp(dtv->app_tctx, p, p->flow);
+        AppLayerHandleUdp(tv, dtv->app_tctx, p, p->flow);
     }
 
     return TM_ECODE_OK;