sf_dynamic_preprocessor.h (snort-2.9.16.1) | : | sf_dynamic_preprocessor.h (snort-2.9.17) | ||
---|---|---|---|---|
skipping to change at line 58 | skipping to change at line 58 | |||
#ifdef PERF_PROFILING | #ifdef PERF_PROFILING | |||
#ifndef PROFILE_PREPROCS_NOREDEF /* Don't redefine this from the main area */ | #ifndef PROFILE_PREPROCS_NOREDEF /* Don't redefine this from the main area */ | |||
#ifdef PROFILING_PREPROCS | #ifdef PROFILING_PREPROCS | |||
#undef PROFILING_PREPROCS | #undef PROFILING_PREPROCS | |||
#endif | #endif | |||
#define PROFILING_PREPROCS _dpd.profilingPreprocsFunc() | #define PROFILING_PREPROCS _dpd.profilingPreprocsFunc() | |||
#endif | #endif | |||
#endif | #endif | |||
#define PREPROCESSOR_DATA_VERSION 26 | #define PREPROCESSOR_DATA_VERSION 28 | |||
#include "sf_dynamic_common.h" | #include "sf_dynamic_common.h" | |||
#include "sf_dynamic_engine.h" | #include "sf_dynamic_engine.h" | |||
#include "session_api.h" | #include "session_api.h" | |||
#include "stream_api.h" | #include "stream_api.h" | |||
#include "str_search.h" | #include "str_search.h" | |||
#include "obfuscation.h" | #include "obfuscation.h" | |||
/*#include "sfportobject.h" */ | /*#include "sfportobject.h" */ | |||
#include "sfcontrol.h" | #include "sfcontrol.h" | |||
#ifdef SIDE_CHANNEL | #ifdef SIDE_CHANNEL | |||
skipping to change at line 281 | skipping to change at line 281 | |||
typedef void (*EndSSLSSnLogDataFunc)(void *ssnptr, uint32_t ssl_flow_messages, u int64_t ssl_flow_flags) ; | typedef void (*EndSSLSSnLogDataFunc)(void *ssnptr, uint32_t ssl_flow_messages, u int64_t ssl_flow_flags) ; | |||
typedef void (*RegisterEndSSLSSnLogDataFunc)(EndSSLSSnLogDataFunc); | typedef void (*RegisterEndSSLSSnLogDataFunc)(EndSSLSSnLogDataFunc); | |||
typedef int (*GetSSLActualActionFunc)(void *ssnptr, uint16_t *action); | typedef int (*GetSSLActualActionFunc)(void *ssnptr, uint16_t *action); | |||
typedef void (*RegisterGetSSLActualActionFunc)(GetSSLActualActionFunc); | typedef void (*RegisterGetSSLActualActionFunc)(GetSSLActualActionFunc); | |||
typedef void (*GetIntfDataFunc)(void *ssnptr,int32_t *ingressIntfIndex, int32_t *egressIntfIndex, | typedef void (*GetIntfDataFunc)(void *ssnptr,int32_t *ingressIntfIndex, int32_t *egressIntfIndex, | |||
int32_t *ingressZoneIndex, int32_t *egressZoneIndex) ; | int32_t *ingressZoneIndex, int32_t *egressZoneIndex) ; | |||
typedef void (*RegisterGetIntfDataFunc)(GetIntfDataFunc); | typedef void (*RegisterGetIntfDataFunc)(GetIntfDataFunc); | |||
typedef void (*SetTlsHostAppIdFunc)(void *ssnptr, const char *serverName, const | ||||
char *commonName, | ||||
const char *orgName, const char *subjectAltName, bool isSniMismatch, | ||||
int32_t *serviceAppId, int32_t *clientAppId, int32_t *payloadAppId); | ||||
typedef void (*RegisterSetTlsHostAppIdFunc)(SetTlsHostAppIdFunc); | ||||
// | // | |||
// SSL Callbacks | // SSL Callbacks | |||
// | // | |||
typedef bool (*DynamicIsSSLPolicyEnabledFunc)(struct _SnortConfig *sc); | typedef bool (*DynamicIsSSLPolicyEnabledFunc)(struct _SnortConfig *sc); | |||
typedef void (*DynamicSetSSLPolicyEnabledFunc)(struct _SnortConfig *sc, tSfPolic yId policy, bool value); | typedef void (*DynamicSetSSLPolicyEnabledFunc)(struct _SnortConfig *sc, tSfPolic yId policy, bool value); | |||
typedef void (*SetSSLCallbackFunc)(void *); | typedef void (*SetSSLCallbackFunc)(void *); | |||
typedef void* (*GetSSLCallbackFunc)(void); | typedef void* (*GetSSLCallbackFunc)(void); | |||
typedef int (*_LoadLibraryFunc)(struct _SnortConfig *sc, const char * const path , int indent); | typedef int (*_LoadLibraryFunc)(struct _SnortConfig *sc, const char * const path , int indent); | |||
typedef void (*LoadAllLibsFunc)(struct _SnortConfig *sc, const char * const path , _LoadLibraryFunc loadFunc); | typedef void (*LoadAllLibsFunc)(struct _SnortConfig *sc, const char * const path , _LoadLibraryFunc loadFunc); | |||
skipping to change at line 344 | skipping to change at line 349 | |||
typedef void* (*SnortAllocFunc)(int num, unsigned long size, uint32_t preproc, b ool data); | typedef void* (*SnortAllocFunc)(int num, unsigned long size, uint32_t preproc, b ool data); | |||
typedef void (*SnortFreeFunc)(void * ptr, uint32_t size, uint32_t preproc, bool data); | typedef void (*SnortFreeFunc)(void * ptr, uint32_t size, uint32_t preproc, bool data); | |||
typedef bool (*ReputationProcessExternalIpFunc)(void *p, sfaddr_t* ip); | typedef bool (*ReputationProcessExternalIpFunc)(void *p, sfaddr_t* ip); | |||
typedef void (*RegisterReputationProcessExternalFunc)(ReputationProcessExternalI pFunc); | typedef void (*RegisterReputationProcessExternalFunc)(ReputationProcessExternalI pFunc); | |||
typedef int (*ReputationGetEntryCountFunc)(void); | typedef int (*ReputationGetEntryCountFunc)(void); | |||
typedef void (*RegisterReputationGetEntryCountFunc)(ReputationGetEntryCountFunc) ; | typedef void (*RegisterReputationGetEntryCountFunc)(ReputationGetEntryCountFunc) ; | |||
/* FTP data transfer mode */ | /* FTP data transfer mode */ | |||
typedef bool (*ftpGetModefunc)(void *ssnptr); | typedef bool (*ftpGetModefunc)(void *ssnptr); | |||
typedef void (*RegisterFtpQueryModefunc)(ftpGetModefunc); | typedef void (*RegisterFtpQueryModefunc)(ftpGetModefunc); | |||
typedef void (*LogMsgThrottled)(void*, const char *, ...); | ||||
#define ENC_DYN_FWD 0x80000000 | #define ENC_DYN_FWD 0x80000000 | |||
#define ENC_DYN_NET 0x10000000 | #define ENC_DYN_NET 0x10000000 | |||
/* Info Data passed to dynamic preprocessor plugin must include: | /* Info Data passed to dynamic preprocessor plugin must include: | |||
* version | * version | |||
* Pointer to AltDecodeBuffer | * Pointer to AltDecodeBuffer | |||
* Pointer to HTTP URI Buffers | * Pointer to HTTP URI Buffers | |||
* Pointer to functions to log Messages, Errors, Fatal Errors | * Pointer to functions to log Messages, Errors, Fatal Errors | |||
* Pointer to function to add preprocessor to list of configure Preprocs | * Pointer to function to add preprocessor to list of configure Preprocs | |||
* Pointer to function to regsiter preprocessor configuration keyword | * Pointer to function to regsiter preprocessor configuration keyword | |||
skipping to change at line 369 | skipping to change at line 376 | |||
int size; | int size; | |||
SFDataBuffer *altBuffer; | SFDataBuffer *altBuffer; | |||
SFDataPointer *altDetect; | SFDataPointer *altDetect; | |||
SFDataPointer *fileDataBuf; | SFDataPointer *fileDataBuf; | |||
LogMsgFunc logMsg; | LogMsgFunc logMsg; | |||
LogMsgFunc errMsg; | LogMsgFunc errMsg; | |||
LogMsgFunc fatalMsg; | LogMsgFunc fatalMsg; | |||
DebugMsgFunc debugMsg; | DebugMsgFunc debugMsg; | |||
LogMsgThrottled errMsgThrottled; | ||||
PreprocRegisterFunc registerPreproc; | PreprocRegisterFunc registerPreproc; | |||
#ifdef SNORT_RELOAD | #ifdef SNORT_RELOAD | |||
GetRelatedReloadDataFunc getRelatedReloadData; | GetRelatedReloadDataFunc getRelatedReloadData; | |||
#endif | #endif | |||
AddPreprocFunc addPreproc; | AddPreprocFunc addPreproc; | |||
AddPreprocFunc addPreprocAllPolicies; | AddPreprocFunc addPreprocAllPolicies; | |||
GetSnortInstance getSnortInstance; | GetSnortInstance getSnortInstance; | |||
AddPreprocExit addPreprocExit; | AddPreprocExit addPreprocExit; | |||
AddPreprocConfCheck addPreprocConfCheck; | AddPreprocConfCheck addPreprocConfCheck; | |||
skipping to change at line 628 | skipping to change at line 636 | |||
RegisterGetDaqCapaTimeoutFunc registerGetDaqCapaTimeout; | RegisterGetDaqCapaTimeoutFunc registerGetDaqCapaTimeout; | |||
#endif | #endif | |||
ReputationGetEntryCountFunc reputation_get_entry_count; | ReputationGetEntryCountFunc reputation_get_entry_count; | |||
RegisterReputationGetEntryCountFunc registerReputationGetEntryCount; | RegisterReputationGetEntryCountFunc registerReputationGetEntryCount; | |||
ReputationProcessExternalIpFunc reputation_process_external_ip; | ReputationProcessExternalIpFunc reputation_process_external_ip; | |||
RegisterReputationProcessExternalFunc registerReputationProcessExternal; | RegisterReputationProcessExternalFunc registerReputationProcessExternal; | |||
RegisterFtpQueryModefunc registerFtpmodeQuery; | RegisterFtpQueryModefunc registerFtpmodeQuery; | |||
ftpGetModefunc ftpGetMode; | ftpGetModefunc ftpGetMode; | |||
SetTlsHostAppIdFunc setTlsHostAppId; | ||||
RegisterSetTlsHostAppIdFunc registerSetTlsHostAppId; | ||||
} DynamicPreprocessorData; | } DynamicPreprocessorData; | |||
/* Function prototypes for Dynamic Preprocessor Plugins */ | /* Function prototypes for Dynamic Preprocessor Plugins */ | |||
void CloseDynamicPreprocessorLibs(void); | void CloseDynamicPreprocessorLibs(void); | |||
int LoadDynamicPreprocessor(struct _SnortConfig *sc, const char * const library_ name, int indent); | int LoadDynamicPreprocessor(struct _SnortConfig *sc, const char * const library_ name, int indent); | |||
void LoadAllDynamicPreprocessors(struct _SnortConfig *sc, const char * const pat h); | void LoadAllDynamicPreprocessors(struct _SnortConfig *sc, const char * const pat h); | |||
typedef int (*InitPreprocessorLibFunc)(DynamicPreprocessorData *); | typedef int (*InitPreprocessorLibFunc)(DynamicPreprocessorData *); | |||
int InitDynamicPreprocessors(void); | int InitDynamicPreprocessors(void); | |||
void RemoveDuplicatePreprocessorPlugins(void); | void RemoveDuplicatePreprocessorPlugins(void); | |||
End of changes. 5 change blocks. | ||||
1 lines changed or deleted | 12 lines changed or added |