ftpp_si.h (snort-2.9.16.1) | : | ftpp_si.h (snort-2.9.17) | ||
---|---|---|---|---|
skipping to change at line 140 | skipping to change at line 140 | |||
/* | /* | |||
* The FTP_SESSION structure contains the complete FTP session, both the | * The FTP_SESSION structure contains the complete FTP session, both the | |||
* client and the server constructs. This structure is the structure that | * client and the server constructs. This structure is the structure that | |||
* is saved per session in the Stream Interface Module. This structure | * is saved per session in the Stream Interface Module. This structure | |||
* gets sent through the detection engine process (Normalization, | * gets sent through the detection engine process (Normalization, | |||
* Detection). | * Detection). | |||
*/ | */ | |||
typedef struct s_FTP_SESSION | typedef struct s_FTP_SESSION | |||
{ | { | |||
FTP_TELNET_SESSION ft_ssn; | FTP_TELNET_SESSION ft_ssn; | |||
tSfPolicyId policy_id; | ||||
/* The client construct contains all the info associated with a | /* The client construct contains all the info associated with a | |||
* client request. */ | * client request. */ | |||
FTP_CLIENT client; | FTP_CLIENT client; | |||
/* The server construct contains all the info associated with a | /* The server construct contains all the info associated with a | |||
* server response. */ | * server response. */ | |||
FTP_SERVER server; | FTP_SERVER server; | |||
/* The client configuration for this session if its FTP */ | /* The client configuration for this session if its FTP */ | |||
FTP_CLIENT_PROTO_CONF *client_conf; | FTP_CLIENT_PROTO_CONF *client_conf; | |||
/* The server configuration for this session if its FTP */ | /* The server configuration for this session if its FTP */ | |||
FTP_SERVER_PROTO_CONF *server_conf; | FTP_SERVER_PROTO_CONF *server_conf; | |||
/* The global configuration for this session */ | /* The global configuration for this session */ | |||
tSfPolicyId policy_id; | ||||
tSfPolicyUserContextId global_conf; | tSfPolicyUserContextId global_conf; | |||
/* The data channel info */ | /* The data channel info */ | |||
int data_chan_state; | int data_chan_state; | |||
uint32_t data_chan_index; | uint32_t data_chan_index; | |||
uint32_t data_xfer_index; | uint32_t data_xfer_index; | |||
sfaddr_t clientIP; | sfaddr_t clientIP; | |||
uint16_t clientPort; | uint16_t clientPort; | |||
sfaddr_t serverIP; | sfaddr_t serverIP; | |||
uint16_t serverPort; | uint16_t serverPort; | |||
uint32_t ftp_cmd_pipe_index; | uint32_t ftp_cmd_pipe_index; | |||
uint32_t rest_cmd_offset; | uint32_t rest_cmd_offset; | |||
uint16_t control_clientPort; | ||||
uint16_t control_serverPort; | ||||
/* A file is being transfered on ftp-data channel */ | /* A file is being transfered on ftp-data channel */ | |||
char *filename; | char *filename; | |||
int file_xfer_info; /* -1: ignore, 0: unknown, >0: filename length */ | int file_xfer_info; /* -1: ignore, 0: unknown, >0: filename length */ | |||
bool data_xfer_dir; | bool data_xfer_dir; | |||
/* Command/data channel encryption */ | /* Command/data channel encryption */ | |||
bool encr_state_chello; | bool encr_state_chello; | |||
unsigned char flags; | ||||
int encr_state; | int encr_state; | |||
uint32_t flow_id; | uint32_t flow_id; | |||
/* Alertable event list */ | /* Alertable event list */ | |||
FTP_EVENTS event_list; | FTP_EVENTS event_list; | |||
void *datassn; | void *datassn; | |||
sfaddr_t control_clientIP; | sfaddr_t control_clientIP; | |||
sfaddr_t control_serverIP; | sfaddr_t control_serverIP; | |||
uint16_t control_clientPort; | ||||
uint16_t control_serverPort; | ||||
unsigned char flags; | ||||
} FTP_SESSION; | } FTP_SESSION; | |||
#define FTP_FLG_MALWARE_ENABLED (1<<1) | #define FTP_FLG_MALWARE_ENABLED (1<<1) | |||
#ifdef TARGET_BASED | #ifdef TARGET_BASED | |||
/* FTP-Data Transfer Modes */ | /* FTP-Data Transfer Modes */ | |||
enum { | enum { | |||
FTPP_XFER_PASSIVE = 0, | FTPP_XFER_PASSIVE = 0, | |||
End of changes. 5 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |