From: Victor Julien <victor@inliniac.net>
Date: Thu, 30 Jan 2014 08:18:12 +0000 (+0100)
Subject: log api: use AppProto instead of uint16_t
X-Git-Tag: suricata-2.0rc1~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4bd37cc46a839c23d423976f80961cf312e483cb;p=thirdparty%2Fsuricata.git

log api: use AppProto instead of uint16_t
---

diff --git a/src/output-tx.c b/src/output-tx.c
index d250fcab75..7c56353a06 100644
--- a/src/output-tx.c
+++ b/src/output-tx.c
@@ -44,7 +44,7 @@ typedef struct OutputLoggerThreadData_ {
  * it's perfectly valid that have multiple instances of the same
  * log module (e.g. http.log) with different output ctx'. */
 typedef struct OutputTxLogger_ {
-    uint16_t alproto;
+    AppProto alproto;
     TxLogger LogFunc;
     OutputCtx *output_ctx;
     struct OutputTxLogger_ *next;
@@ -53,7 +53,7 @@ typedef struct OutputTxLogger_ {
 
 static OutputTxLogger *list = NULL;
 
-int OutputRegisterTxLogger(const char *name, uint16_t alproto, TxLogger LogFunc, OutputCtx *output_ctx)
+int OutputRegisterTxLogger(const char *name, AppProto alproto, TxLogger LogFunc, OutputCtx *output_ctx)
 {
     OutputTxLogger *op = SCMalloc(sizeof(*op));
     if (op == NULL)
diff --git a/src/output-tx.h b/src/output-tx.h
index badc18351a..9281549900 100644
--- a/src/output-tx.h
+++ b/src/output-tx.h
@@ -36,7 +36,7 @@ typedef int (*TxLogger)(ThreadVars *, void *thread_data, const Packet *, Flow *f
  */
 //typedef int (*TxLogCondition)(ThreadVars *, const Packet *);
 
-int OutputRegisterTxLogger(const char *name, uint16_t alproto, TxLogger LogFunc, OutputCtx *);
+int OutputRegisterTxLogger(const char *name, AppProto alproto, TxLogger LogFunc, OutputCtx *);
 
 void TmModuleTxLoggerRegister (void);
 
diff --git a/src/output.c b/src/output.c
index 5e7d88f2a3..043e37d80a 100644
--- a/src/output.c
+++ b/src/output.c
@@ -147,7 +147,7 @@ error:
  */
 void
 OutputRegisterTxModule(const char *name, const char *conf_name,
-    OutputCtx *(*InitFunc)(ConfNode *), uint16_t alproto,
+    OutputCtx *(*InitFunc)(ConfNode *), AppProto alproto,
     TxLogger TxLogFunc)
 {
     if (unlikely(TxLogFunc == NULL)) {
@@ -176,7 +176,7 @@ error:
 void
 OutputRegisterTxSubModule(const char *parent_name, const char *name,
     const char *conf_name, OutputCtx *(*InitFunc)(ConfNode *, OutputCtx *parent_ctx),
-    uint16_t alproto, TxLogger TxLogFunc)
+    AppProto alproto, TxLogger TxLogFunc)
 {
     if (unlikely(TxLogFunc == NULL)) {
         goto error;
diff --git a/src/output.h b/src/output.h
index 88659b59f6..e0f2f6794a 100644
--- a/src/output.h
+++ b/src/output.h
@@ -47,7 +47,7 @@ typedef struct OutputModule_ {
     TxLogger TxLogFunc;
     FileLogger FileLogFunc;
     FiledataLogger FiledataLogFunc;
-    uint16_t alproto;
+    AppProto alproto;
 
     TAILQ_ENTRY(OutputModule_) entries;
 } OutputModule;
@@ -62,11 +62,11 @@ void OutputRegisterPacketSubModule(const char *parent_name, const char *name,
     PacketLogger LogFunc, PacketLogCondition ConditionFunc);
 
 void OutputRegisterTxModule(const char *name, const char *conf_name,
-    OutputCtx *(*InitFunc)(ConfNode *), uint16_t alproto,
+    OutputCtx *(*InitFunc)(ConfNode *), AppProto alproto,
     TxLogger TxLogFunc);
 void OutputRegisterTxSubModule(const char *parent_name, const char *name,
     const char *conf_name, OutputCtx *(*InitFunc)(ConfNode *, OutputCtx *parent_ctx),
-    uint16_t alproto, TxLogger TxLogFunc);
+    AppProto alproto, TxLogger TxLogFunc);
 
 void OutputRegisterFileModule(const char *name, const char *conf_name,
     OutputCtx *(*InitFunc)(ConfNode *), FileLogger FileLogFunc);