@ -267,12 +267,12 @@ int FileMagicSize(void)
}
/**
* \ brief get the size of the file
* \ brief get the size of the file data
*
* This doesn ' t reflect how much of the file we have in memory , just the
* total size tracked so far .
* total size of filedata so far .
*/
uint64_t File Size( const File * file )
uint64_t File Data Size( const File * file )
{
if ( file ! = NULL & & file - > sb ! = NULL ) {
SCLogDebug ( " returning % " PRIu64 ,
@ -283,6 +283,20 @@ uint64_t FileSize(const File *file)
return 0 ;
}
/**
* \ brief get the size of the file
*
* This doesn ' t reflect how much of the file we have in memory , just the
* total size of file so far .
*/
uint64_t FileTrackedSize ( const File * file )
{
if ( file ! = NULL ) {
return file - > size ;
}
return 0 ;
}
static int FilePruneFile ( File * file )
{
SCEnter ( ) ;
@ -299,7 +313,7 @@ static int FilePruneFile(File *file)
# endif
uint64_t left_edge = file - > content_stored ;
if ( file - > flags & FILE_NOSTORE ) {
left_edge = File Size( file ) ;
left_edge = File Data Size( file ) ;
}
if ( file - > flags & FILE_USE_DETECT ) {
left_edge = MIN ( left_edge , file - > content_inspected ) ;
@ -309,7 +323,7 @@ static int FilePruneFile(File *file)
StreamingBufferSlideToOffset ( file - > sb , left_edge ) ;
}
if ( left_edge ! = File Size( file ) ) {
if ( left_edge ! = File Data Size( file ) ) {
SCReturnInt ( 0 ) ;
}
@ -516,7 +530,7 @@ static int FileStoreNoStoreCheck(File *ff)
if ( ff - > flags & FILE_NOSTORE ) {
if ( ff - > state = = FILE_STATE_OPENED & &
File Size( ff ) > = ( uint64_t ) FileMagicSize ( ) )
File Data Size( ff ) > = ( uint64_t ) FileMagicSize ( ) )
{
SCReturnInt ( 1 ) ;
}
@ -706,7 +720,7 @@ File *FileOpenFile(FileContainer *ffc, const StreamingBufferConfig *sbcfg,
ff - > state = FILE_STATE_ERROR ;
SCReturnPtr ( NULL , " File " ) ;
}
SCLogDebug ( " file size is now % " PRIu64 , File Size( ff ) ) ;
SCLogDebug ( " file size is now % " PRIu64 , File Tracked Size( ff ) ) ;
}
SCReturnPtr ( ff , " File " ) ;
@ -1034,7 +1048,7 @@ void FileDisableStoringForFile(File *ff)
SCLogDebug ( " not storing this file " ) ;
ff - > flags | = FILE_NOSTORE ;
if ( ff - > state = = FILE_STATE_OPENED & & File Size( ff ) > = ( uint64_t ) FileMagicSize ( ) ) {
if ( ff - > state = = FILE_STATE_OPENED & & File Data Size( ff ) > = ( uint64_t ) FileMagicSize ( ) ) {
if ( g_file_force_md5 = = 0 & & g_file_force_sha1 = = 0 & & g_file_force_sha256 = = 0
& & g_file_force_tracking = = 0 ) {
( void ) FileCloseFilePtr ( ff , NULL , 0 ,