* NEW [conf] Support to read ms.

Signed-off-by: wangha <wanghamax@gmail.com>

Author: wanghaEMQ

include/nng/supplemental/nanolib/conf.h

@@ -683,6 +683,7 @@ webhook_event get_webhook_event(const char *hook_type, const char *hook_name);
 
 NNG_DECL int  get_size(const char *str, uint64_t *size);
 NNG_DECL int  get_time(const char *str, uint64_t *second);
+NNG_DECL int  get_time_ms(const char *str, uint64_t *second);
 NNG_DECL void conf_parse(conf *nanomq_conf);
 NNG_DECL void conf_parse_ver2(conf *nanomq_conf);
 NNG_DECL void conf_parse_cipher(conf *nanomq_conf, const char *key, const char *key2);

src/supplemental/nanolib/conf.c

@@ -4095,6 +4095,27 @@ get_size(const char *str, uint64_t *size)
 	return 0;
 }
 
+int
+get_time_ms(const char *str, uint64_t *msec)
+{
+	char     unit[3] = { 0 };
+	uint64_t ms   = 0;
+	if (2 == sscanf(str, "%lu%02s", &ms, unit)) {
+		if (0 == strncmp(unit, "ms", 2)) {
+			*msec = ms;
+			return 0;
+		} else if (unit[0] == ' ') {
+			*msec = ms;
+			return 0;
+		} else if (unit[0] == 's') {
+			*msec = 1000 * ms;
+			return 0;
+		}
+		return -2;
+	}
+	return -1;
+}
+
 int
 get_time(const char *str, uint64_t *second)
 {

src/supplemental/nanolib/conf_ver2.c

@@ -127,6 +127,22 @@ compose_url(char *head, char *address)
 		}                                                             \
 	} while (0);
 
+#define hocon_read_time_ms(structure, field, key, jso)                      \
+	do {                                                                  \
+		cJSON *jso_key = cJSON_GetObjectItem(jso, key);               \
+		if (NULL == jso_key) {                                        \
+			log_debug("Config %s is not set, use default!", key); \
+			break;                                                \
+		}                                                             \
+		if (cJSON_IsString(jso_key)) {                                \
+			if (NULL != jso_key->valuestring) {                   \
+				uint64_t msec = 0;                         \
+				get_time_ms(jso_key->valuestring, &msec);     \
+				(structure)->field = msec;                 \
+			}                                                     \
+		}                                                             \
+	} while (0);
+
 #define hocon_read_size_base(structure, field, key, jso)                      \
 	do {                                                                  \
 		cJSON *jso_key = cJSON_GetObjectItem(jso, key);               \
@@ -1201,9 +1217,9 @@ conf_bridge_quic_parse_ver2(conf_bridge_node *node, cJSON *jso_bridge_node)
 	    node, qdiscon_timeout, "quic_discon_timeout", jso_bridge_node);
 	hocon_read_time_base(node, qsend_idle_timeout,
 	    "quic_send_idle_timeout", jso_bridge_node);
-	hocon_read_time_base(
+	hocon_read_time_ms(
 	    node, qinitial_rtt_ms, "quic_initial_rtt_ms", jso_bridge_node);
-	hocon_read_time_base(
+	hocon_read_time_ms(
 	    node, qmax_ack_delay_ms, "quic_max_ack_delay_ms", jso_bridge_node);
 	hocon_read_time_base(
 	    node, qconnect_timeout, "quic_handshake_timeout", jso_bridge_node);