File _service:obs_scm:0007-cosmetic-changes.patch of Package gazelle

From 52e6a745e4b5bf27de66b55283c0e0f474213258 Mon Sep 17 00:00:00 2001
From: Honggang LI <honggangli@163.com>
Date: Mon, 21 Aug 2023 08:48:00 +0800
Subject: [PATCH] cosmetic changes

Signed-off-by: Honggang LI <honggangli@163.com>
---
 src/lstack/core/lstack_init.c   | 2 +-
 src/lstack/core/lstack_lwip.c   | 1 -
 src/lstack/include/lstack_cfg.h | 2 +-
 src/ltran/ltran_dfx.c           | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lstack/core/lstack_init.c b/src/lstack/core/lstack_init.c
index 406a0b8..db203d2 100644
--- a/src/lstack/core/lstack_init.c
+++ b/src/lstack/core/lstack_init.c
@@ -256,7 +256,7 @@ __attribute__((constructor)) void gazelle_network_init(void)
         return;
     }
 
-    /* check lstack num, and get process idx */
+    /* check lstack num */
     if (check_params_from_primary() < 0) {
         LSTACK_PRE_LOG(LSTACK_ERR, "lstack num error, not same to primary process!\n");
         LSTACK_EXIT(1, "lstack num error, not same to primary process!\n");
diff --git a/src/lstack/core/lstack_lwip.c b/src/lstack/core/lstack_lwip.c
index c1346f6..bcdbac0 100644
--- a/src/lstack/core/lstack_lwip.c
+++ b/src/lstack/core/lstack_lwip.c
@@ -1239,7 +1239,6 @@ static inline void clone_lwip_socket_opt(struct lwip_sock *dst_sock, struct lwip
         dst_sock->conn->pcb.tcp->netif_idx = src_sock->conn->pcb.tcp->netif_idx;
         dst_sock->conn->pcb.tcp->flags = src_sock->conn->pcb.tcp->flags;
         dst_sock->conn->pcb.tcp->keep_idle = src_sock->conn->pcb.tcp->keep_idle;
-        dst_sock->conn->pcb.tcp->keep_idle = src_sock->conn->pcb.tcp->keep_idle;
         dst_sock->conn->pcb.tcp->keep_intvl = src_sock->conn->pcb.tcp->keep_intvl;
         dst_sock->conn->pcb.tcp->keep_cnt = src_sock->conn->pcb.tcp->keep_cnt;
     }
diff --git a/src/lstack/include/lstack_cfg.h b/src/lstack/include/lstack_cfg.h
index 9102fee..52a1abd 100644
--- a/src/lstack/include/lstack_cfg.h
+++ b/src/lstack/include/lstack_cfg.h
@@ -82,7 +82,7 @@ struct cfg_params {
     uint32_t read_connect_number;
     uint32_t rpc_number;
     uint32_t nic_read_number;
-    uint8_t use_ltran; // ture:lstack read from nic false:read form ltran
+    uint8_t use_ltran; // false:lstack read from nic. true:lstack read form ltran process.
 
     uint16_t num_process;
     uint16_t num_listen_port;
diff --git a/src/ltran/ltran_dfx.c b/src/ltran/ltran_dfx.c
index b8d9c99..e5fd0c8 100644
--- a/src/ltran/ltran_dfx.c
+++ b/src/ltran/ltran_dfx.c
@@ -836,7 +836,7 @@ static void gazelle_print_lstack_stat_snmp_core(const struct gazelle_stack_dfx_d
     printf("ip_in_deliver: %u\n",    snmp->ip_in_deliver);
     printf("ip_out_req: %u\n",       snmp->ip_out_req);
     printf("ip_out_discard: %u\n",   snmp->ip_out_discard);
-    printf("ip_outnort: %u\n",       snmp->ip_out_discard);
+    printf("ip_outnort: %u\n",       snmp->ip_outnort);
     printf("ip_reasm_ok: %u\n",      snmp->ip_reasm_ok);
     printf("ip_reasm_fail: %u\n",    snmp->ip_reasm_fail);
     printf("ip_frag_ok: %u\n",       snmp->ip_frag_ok);
-- 
2.27.0