1 files changed, 41 insertions, 57 deletions

diff --git a/src/SSL_Analyze.h b/src/SSL_Analyze.h
index a8fab7c..955aff8 100644
--- a/src/SSL_Analyze.h
+++ b/src/SSL_Analyze.h
@@ -1,20 +1,6 @@
-/*
- * SSL_Analyze.h
- *
- *  Created on: 2013-5-2
- *      Author: lis
- */
+#pragma once
 
-#ifndef SSL_ANALYZE_H_
-#define SSL_ANALYZE_H_
-
-#define	MESA_INCLUDE				1
-
-#if MESA_INCLUDE
 #include <MESA/stream.h>
-#else
-#include "stream.h"
-#endif
 
 #include "ssl.h"
 
@@ -40,61 +26,59 @@ typedef long atomic_t;
 
 #define SSL_RETURN_NORM 				0x53
 #define SSL_RETURN_UNNORM 				0x54
-#define SSL_RETURN_RESET_BUFFER			0x55
 #define SSL_RETURN_GIVEME 				0x56
 #define SSL_RETURN_DROPME 				0x57
 
 #define MAX_REGION_NUM 					15
 #define REGION_NAME_LEN 				32
 
-#define SSL_STAT_PKTS_C2S				0
-#define SSL_STAT_PKTS_S2C				1
-#define SSL_STAT_BITS_C2S				2
-#define SSL_STAT_BITS_S2C				3
-#define SSL_MAX_STAT_FIELD				4
+#define SSL_KEY 								3
+#define SSL_TRUE 								1
+#define SSL_FLASE 								0
+struct ssl_proto_tag
+{
+	char buf[8];
+};
 
-typedef struct ssl_prog_runtime_parameter_t
+struct ssl_runtime_para
 { 	
 	unsigned long long 	ssl_interested_region_flag;
 	unsigned long long 	ssl_region_cnt;
-	char 				ssl_conf_filename[256];	
-	unsigned short 		ssl_plugid;
-	char 				ssl_conf_regionname[MAX_REGION_NUM][REGION_NAME_LEN];		
-	void*				stat_handler;
-	int 				stat_screen_print_trigger;
-	int 				stat_cycle;		
-	int 				ssl_switch_no_biz;
-	
-	int					stat_field[SSL_MAX_STAT_FIELD];	
-	int                 stat_dst_port;
-	uint64_t			stat_value[SSL_MAX_STAT_FIELD];	
-	char 				stat_filename[256];
-	char                stat_dst_ip[64];
-	char                stat_appname[16];
-	
-	int					proto_tag_id ;
-}ssl_prog_runtime_parameter_t;
+	unsigned short ssl_plugid;
+	char ssl_conf_regionname[MAX_REGION_NUM][REGION_NAME_LEN];
+	char stat_filename[256];
+	char stat_dst_ip[64];
+	char stat_appname[16];
+	int proto_tag_id ;
+	int max_cache_len;
+};
 
-struct ssl_proto_tag_t
-{    
-	char buf[8];
+struct ssl_business_info
+{
+	void* param;
+	unsigned char return_value;
+};
+
+struct ssl_record_trunk
+{
+	int cache_len;
+	char* cache_buff;
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+struct ssl_runtime_context
+{
+	unsigned char 				link_state;
+	unsigned char 				over_flag;
+	unsigned char 				is_ssl_stream;	
+	unsigned short 				version; //SSL versions, definition like TLSV1_2_VERSION in ssl.h
+
+	unsigned char first_pkt_flag;
+	struct ssl_stream stream;
+	struct ssl_record_trunk record;
+	struct ssl_business_info business;
+};
 
-int 				SSL_INIT(void);
-char 			SSL_ENTRY(struct streaminfo *a_tcp, void**pme, int thread_seq, void *a_pcaket);
-void 			SSL_DESTROY(void);
-void 			SSL_GETPLUGID(unsigned short plugid);
-void 			SSL_PROT_FUNSTAT(unsigned long long protflag);
-long long 		SSL_FLAG_CHANGE(char* flag_str);
-void ssl_initStructClientHello(st_client_hello_t* pstClientHello);
-void ssl_initStructServerHello(st_server_hello_t* pstServerHello);
+extern struct ssl_runtime_para g_ssl_runtime_para;
 
+int ssl_ja3_init(void);
 
-#ifdef __cplusplus
-}
-#endif
-#endif /* SSL_ANALYZE_H_ */