From: Victor Julien <victor@inliniac.net>
Date: Sun, 24 Apr 2016 07:33:54 +0000 (+0200)
Subject: stream: make data pointer in StreamSegmentCallback const
X-Git-Tag: suricata-4.0.0-beta1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75129496707434bf3032fed586d47dc7e3619901;p=thirdparty%2Fsuricata.git

stream: make data pointer in StreamSegmentCallback const
---

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index 74ff011280..4ab39c97d0 100644
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -136,7 +136,7 @@ static void AlertDebugLogPktVars(AlertDebugLogThread *aft, const Packet *p)
 
 /** \todo doc
  * assume we have aft lock */
-static int AlertDebugPrintStreamSegmentCallback(const Packet *p, void *data, uint8_t *buf, uint32_t buflen)
+static int AlertDebugPrintStreamSegmentCallback(const Packet *p, void *data, const uint8_t *buf, uint32_t buflen)
 {
     AlertDebugLogThread *aft = (AlertDebugLogThread *)data;
 
diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index 8e0dc8de62..e29549160d 100644
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -433,7 +433,7 @@ static int Unified2ForgeFakeIPv6Header(FakeIPv6Hdr *fakehdr, const Packet *p, in
 /**
  * \brief Write a faked Packet in unified2 file for each stream segment.
  */
-static int Unified2PrintStreamSegmentCallback(const Packet *p, void *data, uint8_t *buf, uint32_t buflen)
+static int Unified2PrintStreamSegmentCallback(const Packet *p, void *data, const uint8_t *buf, uint32_t buflen)
 {
     int ret = 1;
     Unified2AlertThread *aun = (Unified2AlertThread *)data;
diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 135ee618ed..89a582cf50 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -102,7 +102,7 @@ typedef struct JsonAlertLogThread_ {
 
 /* Callback function to pack payload contents from a stream into a buffer
  * so we can report them in JSON output. */
-static int AlertJsonDumpStreamSegmentCallback(const Packet *p, void *data, uint8_t *buf, uint32_t buflen)
+static int AlertJsonDumpStreamSegmentCallback(const Packet *p, void *data, const uint8_t *buf, uint32_t buflen)
 {
     MemBuffer *payload = (MemBuffer *)data;
     MemBufferWriteRaw(payload, buf, buflen);
diff --git a/src/stream.h b/src/stream.h
index dfe5c342e8..72674f803d 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -70,7 +70,7 @@ uint16_t StreamMsgQueueGetMinChunkLen(uint8_t);
 
 void StreamMsgReturnListToPool(void *);
 
-typedef int (*StreamSegmentCallback)(const Packet *, void *, uint8_t *, uint32_t);
+typedef int (*StreamSegmentCallback)(const Packet *, void *, const uint8_t *, uint32_t);
 int StreamSegmentForEach(const Packet *p, uint8_t flag,
                          StreamSegmentCallback CallbackFunc,
                          void *data);
diff --git a/src/util-print.c b/src/util-print.c
index 5882b1865e..13f19d4978 100644
--- a/src/util-print.c
+++ b/src/util-print.c
@@ -168,7 +168,7 @@ void PrintRawDataFp(FILE *fp, const uint8_t *buf, uint32_t buflen)
 }
 
 void PrintRawDataToBuffer(uint8_t *dst_buf, uint32_t *dst_buf_offset_ptr, uint32_t dst_buf_size,
-                          uint8_t *src_buf, uint32_t src_buf_len)
+                          const uint8_t *src_buf, uint32_t src_buf_len)
 {
     int ch = 0;
     uint32_t u = 0;
diff --git a/src/util-print.h b/src/util-print.h
index a696a98aa3..674e3d32c4 100644
--- a/src/util-print.h
+++ b/src/util-print.h
@@ -48,7 +48,7 @@ void PrintRawUriBuf(char *, uint32_t *, uint32_t,
 void PrintRawJsonFp(FILE *, uint8_t *, uint32_t);
 void PrintRawDataFp(FILE *, const uint8_t *, uint32_t);
 void PrintRawDataToBuffer(uint8_t *dst_buf, uint32_t *dst_buf_offset_ptr, uint32_t dst_buf_size,
-                          uint8_t *src_buf, uint32_t src_buf_len);
+                          const uint8_t *src_buf, uint32_t src_buf_len);
 void PrintStringsToBuffer(uint8_t *dst_buf, uint32_t *dst_buf_offset_ptr, uint32_t dst_buf_size,
                           uint8_t *src_buf, uint32_t src_buf_len);
 void PrintRawLineHexBuf(char *, uint32_t, uint8_t *, uint32_t );