update, optimize funcname

lec-bit · lec-bit · commit 4b98e4407130 · 2025-03-14T18:11:18.000+08:00
Signed-off-by: lec-bit &lt;glfhzmy@126.com&gt;
diff --git a/bpf/include/bpf_common.h b/bpf/include/bpf_common.h
@@ -235,7 +235,7 @@ static inline void record_kmesh_managed_ip(__u32 family, __u32 ip4, __u32 *ip6)
 
     err = bpf_map_update_elem(&map_of_manager, &key, &value, BPF_ANY);
     if (err)
-        BPF_LOG(ERR, KMESH, "record ip failed!, err is %d\n", err);
+        BPF_LOG(ERR, KMESH, "record ip failed, err is %d\n", err);
 }
 
 static inline void remove_kmesh_managed_ip(__u32 family, __u32 ip4, __u32 *ip6)
@@ -248,7 +248,7 @@ static inline void remove_kmesh_managed_ip(__u32 family, __u32 ip4, __u32 *ip6)
 
     int err = bpf_map_delete_elem(&map_of_manager, &key);
     if (err && err != -ENOENT)
-        BPF_LOG(ERR, KMESH, "remove ip failed!, err is %d\n", err);
+        BPF_LOG(ERR, KMESH, "remove ip failed, err is %d\n", err);
 }
 
 static inline bool conn_from_sim(struct bpf_sock_ops *skops, __u32 ip, __u16 port)
diff --git a/pkg/bpf/ads/loader.go b/pkg/bpf/ads/loader.go
@@ -58,7 +58,7 @@ type BpfSockOps struct {
 	bpf2go.KmeshSockopsObjects
 }
 
-func Bpf2goLoadKmeshCgroupSock() (*ebpf.CollectionSpec, error) {
+func loadKmeshCgroupSock() (*ebpf.CollectionSpec, error) {
 	var spec *ebpf.CollectionSpec
 	var err error
 	if helper.KernelVersionLowerThan5_13() {
@@ -69,7 +69,7 @@ func Bpf2goLoadKmeshCgroupSock() (*ebpf.CollectionSpec, error) {
 	return spec, err
 }
 
-func Bpf2goLoadKmeshSockOps() (*ebpf.CollectionSpec, error) {
+func loadKmeshSockOps() (*ebpf.CollectionSpec, error) {
 	var spec *ebpf.CollectionSpec
 	var err error
 	if helper.KernelVersionLowerThan5_13() {
diff --git a/pkg/bpf/ads/loader_enhanced.go b/pkg/bpf/ads/loader_enhanced.go
@@ -57,7 +57,7 @@ type BpfSockOps struct {
 	bpf2go.KmeshSockopsObjects
 }
 
-func Bpf2goLoadKmeshCgroupSock() (*ebpf.CollectionSpec, error) {
+func loadKmeshCgroupSock() (*ebpf.CollectionSpec, error) {
 	var spec *ebpf.CollectionSpec
 	var err error
 	if helper.KernelVersionLowerThan5_13() {
@@ -68,7 +68,7 @@ func Bpf2goLoadKmeshCgroupSock() (*ebpf.CollectionSpec, error) {
 	return spec, err
 }
 
-func Bpf2goLoadKmeshSockOps() (*ebpf.CollectionSpec, error) {
+func loadKmeshSockOps() (*ebpf.CollectionSpec, error) {
 	var spec *ebpf.CollectionSpec
 	var err error
 	if helper.KernelVersionLowerThan5_13() {
diff --git a/pkg/bpf/ads/sock_connection.go b/pkg/bpf/ads/sock_connection.go
@@ -71,7 +71,7 @@ func (sc *BpfSockConn) loadKmeshSockConnObjects() (*ebpf.CollectionSpec, error)
 	)
 	opts.Maps.PinPath = sc.Info.MapPath
 
-	spec, err = Bpf2goLoadKmeshCgroupSock()
+	spec, err = loadKmeshCgroupSock()
 	if err != nil || spec == nil {
 		return nil, err
 	}
diff --git a/pkg/bpf/ads/sock_ops.go b/pkg/bpf/ads/sock_ops.go
@@ -59,7 +59,7 @@ func (sc *BpfSockOps) loadKmeshSockopsObjects() (*ebpf.CollectionSpec, error) {
 	)
 
 	opts.Maps.PinPath = sc.Info.MapPath
-	spec, err = Bpf2goLoadKmeshSockOps()
+	spec, err = loadKmeshSockOps()
 	if err != nil || spec == nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ static inline void record_kmesh_managed_ip(__u32 family, __u32 ip4, __u32 *ip6)`
`235`	`235`
`236`	`236`	`err = bpf_map_update_elem(&map_of_manager, &key, &value, BPF_ANY);`
`237`	`237`	`if (err)`
`238`		`- BPF_LOG(ERR, KMESH, "record ip failed!, err is %d\n", err);`
	`238`	`+ BPF_LOG(ERR, KMESH, "record ip failed, err is %d\n", err);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`static inline void remove_kmesh_managed_ip(__u32 family, __u32 ip4, __u32 *ip6)`
`@@ -248,7 +248,7 @@ static inline void remove_kmesh_managed_ip(__u32 family, __u32 ip4, __u32 *ip6)`
`248`	`248`
`249`	`249`	`int err = bpf_map_delete_elem(&map_of_manager, &key);`
`250`	`250`	`if (err && err != -ENOENT)`
`251`		`- BPF_LOG(ERR, KMESH, "remove ip failed!, err is %d\n", err);`
	`251`	`+ BPF_LOG(ERR, KMESH, "remove ip failed, err is %d\n", err);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`static inline bool conn_from_sim(struct bpf_sock_ops *skops, __u32 ip, __u16 port)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (sc BpfSockConn) loadKmeshSockConnObjects() (ebpf.CollectionSpec, error)`
`71`	`71`	`)`
`72`	`72`	`opts.Maps.PinPath = sc.Info.MapPath`
`73`	`73`
`74`		`- spec, err = Bpf2goLoadKmeshCgroupSock()`
	`74`	`+ spec, err = loadKmeshCgroupSock()`
`75`	`75`	`if err != nil \|\| spec == nil {`
`76`	`76`	`return nil, err`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (sc BpfSockOps) loadKmeshSockopsObjects() (ebpf.CollectionSpec, error) {`
`59`	`59`	`)`
`60`	`60`
`61`	`61`	`opts.Maps.PinPath = sc.Info.MapPath`
`62`		`- spec, err = Bpf2goLoadKmeshSockOps()`
	`62`	`+ spec, err = loadKmeshSockOps()`
`63`	`63`	`if err != nil \|\| spec == nil {`
`64`	`64`	`return nil, err`
`65`	`65`	`}`