From b60d2c43453e526b13c407819fdba395c43ec720 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sat, 12 Jun 2010 12:57:50 +0200 Subject: [PATCH] Fix flags mixup issue in the app layer. --- src/flow.h | 11 ++++++----- src/stream.h | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/flow.h b/src/flow.h index 03af11edd5..264d1165e8 100644 --- a/src/flow.h +++ b/src/flow.h @@ -202,11 +202,12 @@ typedef struct Flow_ /** Flow Application Level flags */ #define FLOW_AL_PROTO_UNKNOWN 0x01 #define FLOW_AL_PROTO_DETECT_DONE 0x02 -#define FLOW_AL_STREAM_TOSERVER 0x04 -#define FLOW_AL_STREAM_TOCLIENT 0x08 -#define FLOW_AL_STREAM_GAP 0x10 -#define FLOW_AL_STREAM_EOF 0x20 -#define FLOW_AL_NO_APPLAYER_INSPECTION 0x40 /** \todo move to flow flags later */ +#define FLOW_AL_NO_APPLAYER_INSPECTION 0x04 /** \todo move to flow flags later */ +#define FLOW_AL_STREAM_START 0x08 +#define FLOW_AL_STREAM_EOF 0x10 +#define FLOW_AL_STREAM_TOSERVER 0x20 +#define FLOW_AL_STREAM_TOCLIENT 0x40 +#define FLOW_AL_STREAM_GAP 0x80 enum { FLOW_STATE_NEW = 0, diff --git a/src/stream.h b/src/stream.h index 4b5a779022..5798c1cf11 100644 --- a/src/stream.h +++ b/src/stream.h @@ -26,11 +26,11 @@ #include "flow.h" -#define STREAM_START 0x01 -#define STREAM_EOF 0x02 -#define STREAM_TOSERVER 0x04 -#define STREAM_TOCLIENT 0x08 -#define STREAM_GAP 0x10 +#define STREAM_START FLOW_AL_STREAM_START +#define STREAM_EOF FLOW_AL_STREAM_EOF +#define STREAM_TOSERVER FLOW_AL_STREAM_TOSERVER +#define STREAM_TOCLIENT FLOW_AL_STREAM_TOCLIENT +#define STREAM_GAP FLOW_AL_STREAM_GAP /** size of the data chunks sent to the app layer parser. */ #define MSG_DATA_SIZE 2048