[=] fix diff

alibaba · Nov 21, 2024 · 229bde2 · 229bde2
1 parent 8cdda71
commit 229bde2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/include/xquic/xqc_errno.h b/include/xquic/xqc_errno.h
@@ -138,8 +138,6 @@ typedef enum {
     XQC_EFEC_SYMBOL_ERROR               = 662,      /**< FEC - symbol value error */
     XQC_EFEC_TOLERABLE_ERROR            = 663,      /**< FEC - tolerable error */
 
-    XQC_EENCRYPT_LB_CID                 = 670,      /**< load balance connection ID encryption error */
-    XQC_EENCRYPT_AES_128_ECB            = 671,      /**< aes_128_ecb algorithm error */
     XQC_EENCRYPT_LB_CID                 = 670,      /**< load balance connection ID encryption error */
     XQC_EENCRYPT_AES_128_ECB            = 671,      /**< aes_128_ecb algorithm error */
 

diff --git a/include/xquic/xquic.h b/include/xquic/xquic.h
@@ -911,8 +911,8 @@ typedef struct xqc_fec_params_s {
     uint64_t                fec_protected_frames;
     /** maximum number of block that current host can store */
     uint64_t                fec_max_window_size;
-    /** (E) maximum symbol size of each symbol */
-    uint64_t                fec_max_symbol_size;
+    /** fec specific mp mode */
+    xqc_fec_mp_mode_e       fec_mp_mode;
     /** (B) maximum symbol number of each block */
     uint64_t                fec_max_symbol_num_per_block;
 

diff --git a/src/transport/xqc_conn.h b/src/transport/xqc_conn.h
@@ -120,25 +120,23 @@ typedef enum {
     XQC_CONN_FLAG_HANDSHAKE_CONFIRMED_SHIFT = 22,
     XQC_CONN_FLAG_HANDSHAKE_DONE_ACKED_SHIFT = 23,
     XQC_CONN_FLAG_ADDR_VALIDATED_SHIFT = 24,
-    XQC_CONN_FLAG_NEW_CID_ACKED_SHIFT = 25,
-    XQC_CONN_FLAG_LINGER_CLOSING_SHIFT = 26,
-    XQC_CONN_FLAG_RETRY_RECVD_SHIFT = 27,
-    XQC_CONN_FLAG_TLS_CH_SHIFT = 28,
-    XQC_CONN_FLAG_TLS_HSK_COMPLETED_SHIFT = 29,
-    XQC_CONN_FLAG_RECV_NEW_PATH_SHIFT = 30,
-    XQC_CONN_FLAG_VALIDATE_REBINDING_SHIFT = 31,
-    XQC_CONN_FLAG_CONN_CLOSING_NOTIFY_SHIFT = 32,
-    XQC_CONN_FLAG_CONN_CLOSING_NOTIFIED_SHIFT = 33,
-    XQC_CONN_FLAG_DGRAM_WAIT_FOR_1RTT_SHIFT= 34,
-    XQC_CONN_FLAG_LOCAL_TP_UPDATED_SHIFT = 35,
-    XQC_CONN_FLAG_PMTUD_PROBING_SHIFT = 36,
-    XQC_CONN_FLAG_NO_DGRAM_NOTIFIED_SHIFT = 37,
-    XQC_CONN_FLAG_DGRAM_MSS_NOTIFY_SHIFT = 38,
-    XQC_CONN_FLAG_MP_WAIT_SCID_SHIFT = 39,
-    XQC_CONN_FLAG_MP_WAIT_DCID_SHIFT= 40,
-    XQC_CONN_FLAG_MP_READY_NOTIFY_SHIFT = 41,
-    XQC_CONN_FLAG_HANDSHAKE_DONE_SENT_SHIFT = 42,
-    XQC_CONN_FLAG_SHIFT_NUM = 43,
+    XQC_CONN_FLAG_LINGER_CLOSING_SHIFT = 25,
+    XQC_CONN_FLAG_RETRY_RECVD_SHIFT = 26,
+    XQC_CONN_FLAG_TLS_CH_SHIFT = 27,
+    XQC_CONN_FLAG_TLS_HSK_COMPLETED_SHIFT = 28,
+    XQC_CONN_FLAG_RECV_NEW_PATH_SHIFT = 29,
+    XQC_CONN_FLAG_VALIDATE_REBINDING_SHIFT = 30,
+    XQC_CONN_FLAG_CONN_CLOSING_NOTIFY_SHIFT = 31,
+    XQC_CONN_FLAG_CONN_CLOSING_NOTIFIED_SHIFT = 32,
+    XQC_CONN_FLAG_DGRAM_WAIT_FOR_1RTT_SHIFT = 33,
+    XQC_CONN_FLAG_LOCAL_TP_UPDATED_SHIFT = 34,
+    XQC_CONN_FLAG_PMTUD_PROBING_SHIFT = 35,
+    XQC_CONN_FLAG_NO_DGRAM_NOTIFIED_SHIFT = 36,
+    XQC_CONN_FLAG_DGRAM_MSS_NOTIFY_SHIFT = 37,
+    XQC_CONN_FLAG_MP_WAIT_MP_READY_SHIFT = 38,
+    XQC_CONN_FLAG_MP_READY_NOTIFY_SHIFT = 39,
+    XQC_CONN_FLAG_HANDSHAKE_DONE_SENT_SHIFT = 40,
+    XQC_CONN_FLAG_SHIFT_NUM = 41,
 } xqc_conn_flag_shift_t;
 
 typedef enum {