|
|
|
@ -374,9 +374,6 @@ typedef struct Flow_
|
|
|
|
|
|
|
|
|
|
|
|
uint32_t flags; /**< generic flags */
|
|
|
|
uint32_t flags; /**< generic flags */
|
|
|
|
|
|
|
|
|
|
|
|
/* Parent flow id for protocol like ftp */
|
|
|
|
|
|
|
|
int64_t parent_id;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uint16_t file_flags; /**< file tracking/extraction flags */
|
|
|
|
uint16_t file_flags; /**< file tracking/extraction flags */
|
|
|
|
/* coccinelle: Flow:file_flags:FLOWFILE_ */
|
|
|
|
/* coccinelle: Flow:file_flags:FLOWFILE_ */
|
|
|
|
|
|
|
|
|
|
|
|
@ -384,6 +381,9 @@ typedef struct Flow_
|
|
|
|
* for use with STARTTLS and HTTP CONNECT detection */
|
|
|
|
* for use with STARTTLS and HTTP CONNECT detection */
|
|
|
|
uint16_t protodetect_dp; /**< 0 if not used */
|
|
|
|
uint16_t protodetect_dp; /**< 0 if not used */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Parent flow id for protocol like ftp */
|
|
|
|
|
|
|
|
int64_t parent_id;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef FLOWLOCK_RWLOCK
|
|
|
|
#ifdef FLOWLOCK_RWLOCK
|
|
|
|
SCRWLock r;
|
|
|
|
SCRWLock r;
|
|
|
|
#elif defined FLOWLOCK_MUTEX
|
|
|
|
#elif defined FLOWLOCK_MUTEX
|
|
|
|
|