optimize and fix rebase

Signed-off-by: lec-bit <glfhzmy@126.com>

Author: lec-bit

bpf/include/bpf_kfunc.h

@@ -19,6 +19,8 @@ struct bpf_mem_ptr {
     __u32 size;
 };
 
+#define KMESH_MODULE_ULP_NAME "kmesh_defer"
+
 extern int bpf_parse_header_msg_func(void *src, int src__sz) __ksym;
 extern int bpf_km_header_strnstr_func(void *ctx, int ctx__sz, const char *key, int key__sz, const char *subptr) __ksym;
 extern int bpf_km_header_strncmp_func(const char *key, int key__sz, const char *target, int target__sz, int opt) __ksym;
@@ -43,13 +45,13 @@ static int bpf_parse_header_msg(struct bpf_sock_addr *ctx)
 // The strnlen function cannot be used here, so the string is redefined.
 static int bpf_km_setsockopt(struct bpf_sock_addr *ctx, int level, int optname, const char *optval, int optval__sz)
 {
-    const char kmesh_module_name[] = "kmesh_defer";
-    if (level != IPPROTO_TCP || optval__sz != sizeof(kmesh_module_name))
+    const char kmesh_module_ulp_name[] = KMESH_MODULE_ULP_NAME;
+    if (level != IPPROTO_TCP || optval__sz != sizeof(kmesh_module_ulp_name))
         return -1;
 
     struct bpf_mem_ptr msg_tmp = {.ptr = ctx, .size = sizeof(struct bpf_sock_addr)};
     return bpf_setsockopt_func(
-        &msg_tmp, sizeof(struct bpf_mem_ptr), optname, (void *)kmesh_module_name, sizeof(kmesh_module_name));
+        &msg_tmp, sizeof(struct bpf_mem_ptr), optname, (void *)kmesh_module_ulp_name, sizeof(kmesh_module_ulp_name));
 }
 
 static int bpf_km_getsockopt(struct bpf_sock_addr *ctx, int level, int optname, char *optval, int optval__sz)

bpf/kmesh/ads/cgroup_sock.c

@@ -14,15 +14,15 @@
 
 #if ENHANCED_KERNEL
 #include "route_config.h"
+static const char kmesh_module_ulp_name[] = KMESH_MODULE_ULP_NAME;
 #endif
 #if KMESH_ENABLE_IPV4
 #if KMESH_ENABLE_HTTP
 
-static const char kmesh_module_name[] = "kmesh_defer";
 static inline int sock4_traffic_control(struct bpf_sock_addr *ctx)
 {
     int ret;
-    char kmesh_module_name_get[KMESH_MODULE_NAME_LEN] = "";
+    char kmesh_module_ulp_name_get[KMESH_MODULE_NAME_LEN] = "";
     Listener__Listener *listener = NULL;
 
     if (ctx->protocol != IPPROTO_TCP)
@@ -41,9 +41,9 @@ static inline int sock4_traffic_control(struct bpf_sock_addr *ctx)
     BPF_LOG(DEBUG, KMESH, "bpf find listener addr=[%s:%u]\n", ip2str(&ip, 1), bpf_ntohs(ctx->user_port));
 
 #if ENHANCED_KERNEL
-    ret = bpf_km_getsockopt(ctx, IPPROTO_TCP, TCP_ULP, kmesh_module_name_get, KMESH_MODULE_NAME_LEN);
-    if (CHECK_MODULE_NAME_NULL(ret) || bpf__strncmp(kmesh_module_name_get, KMESH_MODULE_NAME_LEN, kmesh_module_name)) {
-        ret = bpf_km_setsockopt(ctx, IPPROTO_TCP, TCP_ULP, kmesh_module_name, sizeof(kmesh_module_name));
+    ret = bpf_km_getsockopt(ctx, IPPROTO_TCP, TCP_ULP, kmesh_module_ulp_name_get, KMESH_MODULE_NAME_LEN);
+    if (CHECK_MODULE_NAME_NULL(ret) || bpf__strncmp(kmesh_module_ulp_name_get, KMESH_MODULE_NAME_LEN, kmesh_module_ulp_name)) {
+        ret = bpf_km_setsockopt(ctx, IPPROTO_TCP, TCP_ULP, kmesh_module_ulp_name, sizeof(kmesh_module_ulp_name));
         if (ret)
             BPF_LOG(ERR, KMESH, "bpf set sockopt failed! ret %d\n", ret);
         return 0;