summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliumengyan <[email protected]>2020-05-20 11:01:38 +0800
committerliumengyan <[email protected]>2020-05-20 11:01:38 +0800
commit5a62410ade31e68e27c184db7a122359162952fe (patch)
tree85bb01b3d67bed755c11dbd987e2c739f44433dd
parentc0ed0eb78f3e05bc1a30d314169ae296720196c6 (diff)
modify gquic.h
-rw-r--r--src/gquic.h36
-rw-r--r--test/gquic.h4
2 files changed, 16 insertions, 24 deletions
diff --git a/src/gquic.h b/src/gquic.h
index c03aeb0..1ec79fd 100644
--- a/src/gquic.h
+++ b/src/gquic.h
@@ -10,7 +10,6 @@
-//#include <stream.h>
#include <MESA/stream.h>
#define MAX_EXTENSION_NUM 128
#define MAX_TAG_VALUE_LEN 257
@@ -61,16 +60,13 @@ struct quic_client_hello {
int user_agent_len;
char user_agent[USER_AGENT_LEN];
uint16_t ext_tag_num; //number of extensions or tags
- quic_tlv_t** ext_tags; //extensions or tags
+ quic_tlv_t** ext_tags; //extensions or tags
};
struct quic_server_hello {
-// char random[RANDOM_LEN];
-// struct quic_tlv_t session;
-// uint16_t ciphersuit;
-// uint8_t com_method; //compress method
- uint16_t ext_tag_num; //number of extensions or tags
- quic_tlv_t** ext_tags; //extensions or tags
+ /*include random,session,ciphersuit,compress_method...*/
+ uint16_t ext_tag_num; //number of extensions or tags
+ quic_tlv_t** ext_tags; //extensions or tags
};
@@ -79,29 +75,25 @@ struct quic_stream {
uint8_t version_cfm;
uint32_t version;
uint8_t fin_flag;
-// uint8_t is_0rtt;
uint8_t is_quic_stream;
-
uint64_t gquic_cID;
-
-// struct quic_tlv_t* p_output_buffer;
struct quic_client_hello st_client_hello;
struct quic_server_hello st_server_hello;
- struct quic_tlv cert_chain; //only gquic
- struct quic_tlv cached_cert; //only gquic
- struct quic_tlv common_cert; //only gquic
+ struct quic_tlv cert_chain;
+ struct quic_tlv cached_cert;
+ struct quic_tlv common_cert;
struct quic_business_info* business;
enum quic_interested_region output_region_mask;
uint64_t output_region_flag;
};
-struct st_quic_client_hello* quic_get_clienthello(void* app_info);
-struct st_quic_server_hello* quic_get_serverhello(void* app_info);
-uint32_t quic_get_version(void* app_info);
-struct quic_tlv_t* quic_get_cert_chain(void* app_info);
-struct quic_tlv_t* quic_get_cached_cert(void* app_info);
-struct quic_tlv_t* quic_get_common_cert(void* app_info);
-void* quic_get_application_data(void* app_info);
+//struct st_quic_client_hello* quic_get_clienthello(void* app_info);
+//struct st_quic_server_hello* quic_get_serverhello(void* app_info);
+//uint32_t quic_get_version(void* app_info);
+//quic_tlv_t* quic_get_cert_chain(void* app_info);
+//quic_tlv_t* quic_get_cached_cert(void* app_info);
+//quic_tlv_t* quic_get_common_cert(void* app_info);
+//void* quic_get_application_data(void* app_info);
#endif /* SRC_GQUIC_H_ */
diff --git a/test/gquic.h b/test/gquic.h
index bb50c77..1ec79fd 100644
--- a/test/gquic.h
+++ b/test/gquic.h
@@ -13,9 +13,9 @@
#include <MESA/stream.h>
#define MAX_EXTENSION_NUM 128
#define MAX_TAG_VALUE_LEN 257
-#define SERVER_NAME_LEN 64
+#define SERVER_NAME_LEN 128
//add in 20191207
-#define USER_AGENT_LEN 256
+#define USER_AGENT_LEN 512
#define RANDOM_LEN 32
#define QUIC_VERSION_LEN 4