Skip to content

Commit 279951e

Browse files
committed
fix
Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>
1 parent b67b286 commit 279951e

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

config/kmesh_marcos_def.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* and sidecar containers. The bpf_sk_original_addr auxiliary function is
1515
* used to obtain the original destination address.
1616
*/
17-
#define MDA_NAT_ACCEL 0
17+
#define MDA_NAT_ACCEL 1
1818

1919
/* supports acceleration function filtering based on GID and UID.
2020
* That is, the GID or UID corresponding to the process to be accelerated
2121
* is configured in the configuration file. The bpf_get_sockops_uid_gid
2222
* auxiliary function is used to obtain the GID and UID of the current
2323
* process.
2424
*/
25-
#define MDA_GID_UID_FILTER 0
25+
#define MDA_GID_UID_FILTER 1
2626

2727
/*
2828
* openEuler-23.03 is an innovative version of openEuler, in the early time, we
@@ -50,7 +50,7 @@
5050
* in kernel 6.x version, add the new iter type ITER_UBUF, and we need add code
5151
* for the corresponding scenarios.
5252
*/
53-
#define ITER_TYPE_IS_UBUF 1
53+
#define ITER_TYPE_IS_UBUF 0
5454

5555
/*
5656
* Kmesh’s Layer 7 acceleration proxy capability relies on kernel enhancements.
@@ -67,4 +67,4 @@
6767
* the libbpf version in the current environment, and the code in the project
6868
* is enabled accordingly.
6969
* */
70-
#define LIBBPF_HIGHER_0_6_0_VERSION 1
70+
#define LIBBPF_HIGHER_0_6_0_VERSION 0

config/linux-bpf.h

Whitespace-only changes.

mk/api-v2-c.pc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
prefix=/kmesh/
1+
prefix=
22

33
Name: api-v2-c
44
Description: api-v2-c

mk/bpf.pc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
prefix=/kmesh/
1+
prefix=
22
Name: bpf
33
Description: bpf
44
Version:

pkg/controller/workload/cache/waypoint_cache_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestBasic(t *testing.T) {
5959
assert.Equal(t, len(cache.waypointAssociatedObjects), 1)
6060

6161
if _, ok := cache.serviceToWaypoint[svc3.ResourceName()]; !ok {
62-
t.Fatalf("service %s should be inclued in waypoint cache", svc3.ResourceName())
62+
t.Fatalf("service %s should be included in waypoint cache", svc3.ResourceName())
6363
}
6464
if _, ok := cache.workloadToWaypoint[wl3.ResourceName()]; !ok {
6565
t.Fatalf("workload %s should be included in waypoint cache", wl3.ResourceName())
@@ -78,7 +78,7 @@ func TestBasic(t *testing.T) {
7878
assert.Equal(t, isHostnameTypeWaypoint(associated.services[svc3.ResourceName()].Waypoint), true)
7979
assert.Equal(t, isHostnameTypeWaypoint(associated.workloads[wl3.ResourceName()].Waypoint), true)
8080

81-
// Crate waypoint service and process.
81+
// Create waypoint service and process.
8282
waypointsvc := createFakeService("waypoint", "10.240.10.11", "")
8383
svcs, wls := cache.Refresh(waypointsvc)
8484
assert.Equal(t, len(svcs), 1)

0 commit comments

Comments
 (0)