Skip to content

Commit 7a2cf8d

Browse files
committed
Merge branch 'main' into issue1322
2 parents 8d976d7 + 43c2a71 commit 7a2cf8d

File tree

12 files changed

+251
-367
lines changed

12 files changed

+251
-367
lines changed

bpf/include/bpf_helper_defs_ext.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
* By default, these IDs are in the 5.10 kernel with kmesh kernel patches.
1111
*/
1212

13+
#define bpf_km_header_strnstr_num 175
14+
#define bpf_km_header_strncmp_num 176
15+
#define bpf_parse_header_msg_num 177
16+
1317
/*
1418
* Description
1519
* Look for the string corresponding to the key in the results of the
@@ -19,7 +23,8 @@
1923
* If found, return 1; otherwise, return 0.
2024
*/
2125
static long (*bpf_km_header_strnstr)(
22-
struct bpf_sock_addr *ctx, const char *key, int key_sz, const char *subptr, int subptr_sz) = (void *)163;
26+
struct bpf_sock_addr *ctx, const char *key, int key_sz, const char *subptr, int subptr_sz) = (void *)
27+
bpf_km_header_strnstr_num;
2328

2429
/*
2530
* Description
@@ -30,8 +35,8 @@ static long (*bpf_km_header_strnstr)(
3035
* Return
3136
* If the strings are same, return 0.
3237
*/
33-
static long (*bpf_km_header_strncmp)(const char *key, int key_sz, const char *target, int target_sz, int opt) =
34-
(void *)164;
38+
static long (*bpf_km_header_strncmp)(const char *key, int key_sz, const char *target, int target_sz, int opt) = (void *)
39+
bpf_km_header_strncmp_num;
3540

3641
/*
3742
* Description
@@ -43,4 +48,4 @@ static long (*bpf_km_header_strncmp)(const char *key, int key_sz, const char *ta
4348
* A HTTP PROTO TYPE is returned on success.
4449
* **PROTO_UNKNOW** is returned if failure.
4550
*/
46-
static long (*bpf_parse_header_msg)(struct bpf_sock_addr *ctx) = (void *)165;
51+
static long (*bpf_parse_header_msg)(struct bpf_sock_addr *ctx) = (void *)bpf_parse_header_msg_num;

bpf/kmesh/bpf2go/kernelnative/enhanced/kmeshsockops_bpfeb.go

Lines changed: 54 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)