[!] Fix problems caused by interface coupling (#229)

Author: ruiqizhou

CMakeLists.txt

@@ -132,7 +132,6 @@ include_directories(
 # http3/qpack source
 set(
     HTTP3_SOURCES
-    "src/http3/xqc_var_buf.c"
     "src/http3/xqc_h3_conn.c"
     "src/http3/xqc_h3_stream.c"
     "src/http3/xqc_h3_request.c"
@@ -212,11 +211,13 @@ set(
     "src/common/xqc_time.c"
     "src/common/utils/huffman/xqc_huffman_code.c"
     "src/common/utils/huffman/xqc_huffman.c"
-    "src/common/utils/vint/xqc_discrete_vint_parser.c"
+    "src/common/utils/vint/xqc_discrete_int_parser.c"
     "src/common/utils/vint/xqc_variable_len_int.c"
     "src/common/utils/ringarray/xqc_ring_array.c"
     "src/common/utils/ringmem/xqc_ring_mem.c"
     "src/common/utils/2d_hash/xqc_2d_hash_table.c"
+    "src/common/utils/var_buf/xqc_var_buf.c"
+
 )
 
 # congestion control

cmake/CMakeLists.txt

@@ -133,7 +133,6 @@ include_directories(
 # http3/qpack source
 set(
     HTTP3_SOURCES
-    "src/http3/xqc_var_buf.c"
     "src/http3/xqc_h3_conn.c"
     "src/http3/xqc_h3_stream.c"
     "src/http3/xqc_h3_request.c"
@@ -213,11 +212,13 @@ set(
     "src/common/xqc_time.c"
     "src/common/utils/huffman/xqc_huffman_code.c"
     "src/common/utils/huffman/xqc_huffman.c"
-    "src/common/utils/vint/xqc_discrete_vint_parser.c"
+    "src/common/utils/vint/xqc_discrete_int_parser.c"
     "src/common/utils/vint/xqc_variable_len_int.c"
     "src/common/utils/ringarray/xqc_ring_array.c"
     "src/common/utils/ringmem/xqc_ring_mem.c"
     "src/common/utils/2d_hash/xqc_2d_hash_table.c"
+    "src/common/utils/var_buf/xqc_var_buf.c"
+
 )
 
 # congestion control

include/xquic/xqc_errno.h

@@ -109,6 +109,7 @@ typedef enum {
     XQC_EALPN_NOT_SUPPORTED             = 639,      /* alpn is not supported by server */
     XQC_EALPN_NOT_REGISTERED            = 640,      /* alpn is not registered */
     XQC_ESTATELESS_RESET                = 641,      /* connection is reset by peer */
+    XQC_EPACKET_FILETER_CALLBACK        = 642,      /* error with packet filter callback function */
 
     XQC_EMP_NOT_SUPPORT_MP              = 650,      /* Multipath - don't support multipath */
     XQC_EMP_NO_AVAIL_PATH_ID            = 651,      /* Multipath - no available path id */

include/xquic/xquic.h

@@ -162,7 +162,9 @@ typedef void (*xqc_server_refuse_pt)(xqc_engine_t *engine, xqc_connection_t *con
  * xqc_engine_packet_process
  */
 typedef ssize_t (*xqc_stateless_reset_pt)(const unsigned char *buf, size_t size,
-    const struct sockaddr *peer_addr, socklen_t peer_addrlen, void *user_data);
+    const struct sockaddr *peer_addr, socklen_t peer_addrlen,
+    const struct sockaddr *local_addr, socklen_t local_addrlen,
+    void *user_data);
 
 /**
  * @brief connection closing notify callback function. will be triggered when a
@@ -326,6 +328,22 @@ typedef ssize_t (*xqc_send_mmsg_pt)(const struct iovec *msg_iov, unsigned int vl
     const struct sockaddr *peer_addr, socklen_t peer_addrlen, void *conn_user_data);
 
 
+/**
+ * @brief set data callback mode for a transport connection. this mode differs 
+ * from write_socket, which has a different user_data, once this callback
+ * function is set, write_socket will be not functional until it is unset.
+ * 
+ * @param buf packet buffer
+ * @param size packet size
+ * @param peer_addr peer address
+ * @param peer_addrlen peer address length
+ * @param cb_user_data user_data of xqc_conn_pkt_filter_callback_pt
+ */
+typedef ssize_t (*xqc_conn_pkt_filter_callback_pt)(const unsigned char *buf,
+    size_t size, const struct sockaddr *peer_addr, socklen_t peer_addrlen,
+    void *cb_user_data);
+
+
 /**
  * @brief multi-path ready callback function
  *
@@ -826,6 +844,7 @@ typedef struct xqc_conn_settings_s {
     int32_t                     spurious_loss_detect_on;
     uint32_t                    anti_amplification_limit;   /* limit of anti-amplification, default 3 */
     uint64_t                    keyupdate_pkt_threshold;    /* packet limit of a single 1-rtt key, 0 for unlimited */
+    size_t                      max_pkt_out_size;
 } xqc_conn_settings_t;
 
 
@@ -976,6 +995,9 @@ void xqc_engine_finish_recv(xqc_engine_t *engine);
 XQC_EXPORT_PUBLIC_API
 void xqc_engine_recv_batch(xqc_engine_t *engine, xqc_connection_t *conn);
 
+XQC_EXPORT_PUBLIC_API
+xqc_connection_t *xqc_engine_get_conn_by_scid(xqc_engine_t *engine,
+    const xqc_cid_t *cid);
 
 /*************************************************************
  *  QUIC layer APIs
@@ -1013,6 +1035,12 @@ const xqc_cid_t *xqc_connect(xqc_engine_t *engine,
 XQC_EXPORT_PUBLIC_API
 xqc_int_t xqc_conn_close(xqc_engine_t *engine, const xqc_cid_t *cid);
 
+/**
+ * @brief close connection with error code
+ */
+XQC_EXPORT_PUBLIC_API
+xqc_int_t xqc_conn_close_with_error(xqc_connection_t *conn, uint64_t err_code);
+
 /**
  * Get errno when conn_close_notify, 0 For no-error
  */
@@ -1065,13 +1093,35 @@ xqc_int_t xqc_conn_send_ping(xqc_engine_t *engine, const xqc_cid_t *cid, void *p
 XQC_EXPORT_PUBLIC_API
 xqc_bool_t xqc_conn_is_ready_to_send_early_data(xqc_connection_t *conn);
 
+/**
+ * @brief set the packet filter callback function, and replace write_socket.
+ * NOTICE: this function is not conflict with send_mmsg.
+ */
+XQC_EXPORT_PUBLIC_API
+void xqc_conn_set_pkt_filter_callback(xqc_connection_t *conn,
+    xqc_conn_pkt_filter_callback_pt pf_cb, void *pf_cb_user_data);
+
+/**
+ * @brief unset the packet filter callback function, and restore write_socket
+ */
+XQC_EXPORT_PUBLIC_API
+void xqc_conn_unset_pkt_filter_callback(xqc_connection_t *conn);
+
+
 /**
  * Create new stream in quic connection.
  * @param user_data  user_data for this stream
  */
 XQC_EXPORT_PUBLIC_API
 xqc_stream_t *xqc_stream_create(xqc_engine_t *engine, const xqc_cid_t *cid, void *user_data);
 
+XQC_EXPORT_PUBLIC_API
+xqc_stream_t *xqc_stream_create_with_direction(xqc_connection_t *conn,
+    xqc_stream_direction_t dir, void *user_data);
+
+XQC_EXPORT_PUBLIC_API
+xqc_stream_direction_t xqc_stream_get_direction(xqc_stream_t *strm);
+
 /**
  * Server should set user_data when stream_create_notify callbacks
  */
@@ -1084,6 +1134,13 @@ void xqc_stream_set_user_data(xqc_stream_t *stream, void *user_data);
 XQC_EXPORT_PUBLIC_API
 void *xqc_get_conn_user_data_by_stream(xqc_stream_t *stream);
 
+/**
+ * Get connection's app_proto_user_data by stream
+ */
+XQC_EXPORT_PUBLIC_API
+void *xqc_get_conn_alp_user_data_by_stream(xqc_stream_t *stream);
+
+
 /**
  * Get stream ID
  */
@@ -1163,6 +1220,9 @@ xqc_int_t xqc_conn_continue_send(xqc_engine_t *engine, const xqc_cid_t *cid);
 XQC_EXPORT_PUBLIC_API
 xqc_conn_stats_t xqc_conn_get_stats(xqc_engine_t *engine, const xqc_cid_t *cid);
 
+XQC_EXPORT_PUBLIC_API
+xqc_conn_type_t xqc_conn_get_type(xqc_connection_t *conn);
+
 /**
  * @brief load balance cid encryption.
  * According to Draft : https://datatracker.ietf.org/doc/html/draft-ietf-quic-load-balancers-13#section-4.3.2

include/xquic/xquic_typedef.h

@@ -160,5 +160,16 @@ struct iovec {
 
 #endif
 
+typedef enum {
+    XQC_CONN_TYPE_CLIENT,
+    XQC_CONN_TYPE_SERVER,
+} xqc_conn_type_t;
+
+
+typedef enum {
+    XQC_STREAM_BIDI,
+    XQC_STREAM_UNI
+} xqc_stream_direction_t;
+
 
 #endif /*_XQUIC_TYPEDEF_H_INCLUDED_*/

scripts/case_test.sh

@@ -35,7 +35,6 @@ function case_print_result() {
 }
 
 
-
 clear_log
 echo -e "stream read notify fail ...\c"
 ./test_client -s 1024000 -l d -t 1 -E -x 12 >> clog
@@ -502,6 +501,7 @@ else
 fi
 rm -f test_session
 
+
 clear_log
 echo -e "no crypto without 0RTT ...\c"
 rm -f test_session
@@ -518,8 +518,8 @@ fi
 
 clear_log
 echo -e "no crypto with 0RTT ...\c"
-./test_client -s 1024000 -l d -N -t 1 -E >> clog
-if grep "early_data_flag:1" clog >/dev/null && grep ">>>>>>>> pass:1" clog >/dev/null; then
+./test_client -s 1024000 -l d -N -t 1 -E > stdlog
+if grep "early_data_flag:1" stdlog >/dev/null && grep ">>>>>>>> pass:1" stdlog >/dev/null; then
     echo ">>>>>>>> pass:1"
     case_print_result "no_crypto_with_0RTT" "pass"
 else
@@ -531,8 +531,8 @@ grep_err_log
 
 clear_log
 echo -e "no crypto with 0RTT twice ...\c"
-./test_client -s 1024000 -l d -N -t 1 -E >> clog
-if grep "early_data_flag:1" clog >/dev/null && grep ">>>>>>>> pass:1" clog >/dev/null; then
+./test_client -s 1024000 -l d -N -t 1 -E > stdlog
+if grep "early_data_flag:1" stdlog >/dev/null && grep ">>>>>>>> pass:1" stdlog >/dev/null; then
     echo ">>>>>>>> pass:1"
     case_print_result "no_crypto_with_0RTT_twice" "pass"
 else
@@ -1051,6 +1051,22 @@ else
     case_print_result "load_balancer_cid_generate_with_encryption" "fail"
 fi
 
+clear_log
+killall test_server 2> /dev/null
+echo -e "load balancer cid generate ...\c"
+./test_server -l d -e -S "server_id_0" > /dev/null &
+sleep 1
+./test_client -s 1024000 -l d -t 1 >> clog
+result=`grep "|xqc_conn_confirm_cid|dcid change|" clog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ "$result" != "" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "load_balancer_cid_generate" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "load_balancer_cid_generate" "fail"
+fi
+
 clear_log
 echo -e "set cipher suites ...\c"
 ./test_client -s 1024 -l d -t 1 -x 27 >> clog
@@ -1200,9 +1216,19 @@ else
 fi
 grep_err_log
 
-killall test_server
 
+echo -e "max pkt out size...\c"
+result=`./test_client -l d -x 42 -1 -E | grep ">>>>>>>> pass"`
+if [ -n "$result" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "max_pkt_out_size" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "max_pkt_out_size" "fail"
+fi
 
+
+killall test_server
 ./test_server -l d -x 13 > /dev/null &
 sleep 1
 clear_log
@@ -1218,6 +1244,7 @@ else
     case_print_result "stateless_reset" "fail"
 fi
 
+
 killall test_server
 
 

scripts/xquic.lds

@@ -65,6 +65,7 @@ XQUIC_VERS_1.0 {
         xqc_engine_unregister_alpn;
         xqc_conn_set_alp_user_data;
         xqc_h3_request_finish;
+	xqc_conn_close_with_error;
         xqc_now;
         xqc_h3_engine_set_qpack_compat_duplicate;
         xqc_lb_cid_encryption;