Merge pull request #74 from OpenCloudOS/dev

fix some compiling error in compat mode
OpenCloudOS · Oct 8, 2023 · cea53aa · cea53aa
2 parents 1e2c0ff + 98d1836
commit cea53aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/shared/bpf/skb_macro.h b/shared/bpf/skb_macro.h
@@ -48,7 +48,7 @@
 #define bpf_core_type_exists(type) false
 
 #undef bpf_core_field_exists
-#define bpf_core_field_exists(field) false
+#define bpf_core_field_exists(field...) false
 
 #undef bpf_core_enum_value_exists
 #define bpf_core_enum_value_exists(value) false

diff --git a/shared/bpf/skb_parse.h b/shared/bpf/skb_parse.h
@@ -332,6 +332,7 @@ static try_inline int probe_parse_ip(void *ip, parse_ctx_t *ctx)
 	return -1;
 }
 
+#if !defined(COMPAT_MODE) || defined(BPF_FEAT_SK_PRPTOCOL_LEGACY)
 static __always_inline u8 sk_get_protocol(struct sock *sk)
 {
 	u32 flags = _(((u32 *)(&sk->__sk_flags_offset))[0]);
@@ -344,6 +345,7 @@ static __always_inline u8 sk_get_protocol(struct sock *sk)
 #endif
 	return l4_proto;
 }
+#endif
 
 static try_inline int __probe_parse_sk(parse_ctx_t *ctx)
 {