From 5bac338448c46dd40ba7baa18f6e34473baeeaf5 Mon Sep 17 00:00:00 2001
From: Yanmei Liu <miaoji.lym@alibaba-inc.com>
Date: Sun, 5 Nov 2023 17:54:26 +0800
Subject: [PATCH] [+] add key update threshold at demo server (#362)

* [+] add key update trigger at demo server side

* [+] add option for key update
---
 demo/demo_server.c       | 12 +++++++++++-
 src/transport/xqc_conn.c |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/demo/demo_server.c b/demo/demo_server.c
index f9fc3b995..2230bd544 100644
--- a/demo/demo_server.c
+++ b/demo/demo_server.c
@@ -98,6 +98,7 @@ typedef struct xqc_demo_svr_quic_config_s {
 
     uint32_t reinjection;
 
+    uint64_t keyupdate_pkt_threshold;
 } xqc_demo_svr_quic_config_t;
 
 
@@ -1181,6 +1182,7 @@ xqc_demo_svr_usage(int argc, char *argv[])
             "   -P    enable MPQUIC to return ACK_MPs on any paths.\n"
             "   -s    multipath scheduler (interop, minrtt, backup), default: interop\n"
             "   -R    Reinjection (1,2,4) \n"
+            "   -u    Keyupdate packet threshold\n"
             , prog);
 }
 
@@ -1216,13 +1218,15 @@ xqc_demo_svr_init_args(xqc_demo_svr_args_t *args)
     strncpy(args->env_cfg.key_out_path, KEY_PATH, PATH_LEN - 1);
     strncpy(args->env_cfg.priv_key_path, PRIV_KEY_PATH, PATH_LEN - 1);
     strncpy(args->env_cfg.cert_pem_path, CERT_PEM_PATH, PATH_LEN - 1);
+
+    args->quic_cfg.keyupdate_pkt_threshold = UINT64_MAX;
 }
 
 void
 xqc_demo_svr_parse_args(int argc, char *argv[], xqc_demo_svr_args_t *args)
 {
     int ch = 0;
-    while ((ch = getopt(argc, argv, "p:c:CD:l:L:6k:rdMPs:R:")) != -1) {
+    while ((ch = getopt(argc, argv, "p:c:CD:l:L:6k:rdMPs:R:u:")) != -1) {
         switch (ch) {
         /* listen port */
         case 'p':
@@ -1322,6 +1326,11 @@ xqc_demo_svr_parse_args(int argc, char *argv[], xqc_demo_svr_args_t *args)
             args->quic_cfg.reinjection = atoi(optarg);
             break;
 
+        case 'u': /* key update packet threshold */
+            printf("key update packet threshold: %s\n", optarg);
+            args->quic_cfg.keyupdate_pkt_threshold = atoi(optarg);
+            break;
+
         default:
             printf("other option :%c\n", ch);
             xqc_demo_svr_usage(argc, argv);
@@ -1435,6 +1444,7 @@ xqc_demo_svr_init_conn_settings(xqc_demo_svr_args_t *args)
         .reinj_ctl_callback = xqc_deadline_reinj_ctl_cb,
         .mp_enable_reinjection = args->quic_cfg.reinjection,
         .standby_path_probe_timeout = 1000,
+        .keyupdate_pkt_threshold = args->quic_cfg.keyupdate_pkt_threshold,
     };
 
     xqc_server_set_conn_settings(&conn_settings);
diff --git a/src/transport/xqc_conn.c b/src/transport/xqc_conn.c
index d98ee8f73..488d35d99 100644
--- a/src/transport/xqc_conn.c
+++ b/src/transport/xqc_conn.c
@@ -199,6 +199,9 @@ xqc_server_set_conn_settings(const xqc_conn_settings_t *settings)
         default_conn_settings.standby_path_probe_timeout = xqc_max(settings->standby_path_probe_timeout, XQC_MIN_STANDBY_RPOBE_TIMEOUT);
     }
 
+    if (settings->keyupdate_pkt_threshold != UINT64_MAX) {
+        default_conn_settings.keyupdate_pkt_threshold = settings->keyupdate_pkt_threshold;
+    }
 }
 
 static const char * const xqc_conn_flag_to_str[XQC_CONN_FLAG_SHIFT_NUM] = {