Skip to content

Commit 84ef526

Browse files
authored
[+] Feat: Add retry interop test and fix interop error in quic-interop-runner (#508)
1 parent 1e17f49 commit 84ef526

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

demo/demo_server.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,6 +1411,16 @@ xqc_demo_svr_parse_args(int argc, char *argv[], xqc_demo_svr_args_t *args)
14111411
}
14121412
}
14131413

1414+
int
1415+
xqc_demo_svr_retry_packet_condition_check(xqc_engine_t *engine, xqc_connection_t *conn,
1416+
const xqc_cid_t *cid, void *user_data)
1417+
{
1418+
if (svr_ctx.args && svr_ctx.args->quic_cfg.retry_on) {
1419+
return XQC_TRUE;
1420+
}
1421+
return XQC_FALSE;
1422+
}
1423+
14141424
void
14151425
xqc_demo_svr_init_callback(xqc_engine_callback_t *cb, xqc_transport_callbacks_t *transport_cbs,
14161426
xqc_demo_svr_args_t* args)
@@ -1431,6 +1441,8 @@ xqc_demo_svr_init_callback(xqc_engine_callback_t *cb, xqc_transport_callbacks_t
14311441
.write_socket = xqc_demo_svr_write_socket,
14321442
.write_socket_ex = xqc_demo_svr_write_socket_ex,
14331443
.conn_update_cid_notify = xqc_demo_svr_conn_update_cid_notify,
1444+
.conn_send_packet_before_accept = xqc_demo_svr_write_socket,
1445+
.conn_retry_packet_condition_check = xqc_demo_svr_retry_packet_condition_check,
14341446
};
14351447

14361448
*cb = callback;

interop/run_endpoint.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,16 @@ if [ "$ROLE" == "client" ]; then
8686

8787

8888
elif [ "$ROLE" == "server" ]; then
89-
90-
if [ "$TESTCASE" == "retry" ]; then
91-
exit 127
92-
fi
93-
9489
cp /certs/priv.key server.key
9590
cp /certs/cert.pem server.crt
96-
cp server.* /logs/
97-
98-
#cp -r /www /logs
9991

10092
ARGS="-l d -L "$LOG_DIR/server.log" -p 443 -D "/www" -k $SSLKEYLOGFILE -i -M"
93+
94+
if [ "$TESTCASE" = "retry" ]; then
95+
ARGS="$ARGS -r"
96+
echo "Retry test: adding -r flag"
97+
fi
98+
10199
echo "./demo_server $ARGS"
102100
./demo_server $ARGS
103101
fi

0 commit comments

Comments
 (0)