selftests/bpf: Use constants for socket states in sock_fields test
authorJakub Sitnicki <jakub@cloudflare.com>
Thu, 17 Mar 2022 11:39:19 +0000 (12:39 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 18 Mar 2022 14:46:59 +0000 (15:46 +0100)
Replace magic numbers in BPF code with constants from bpf.h, so that they
don't require an explanation in the comments.

Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20220317113920.1068535-4-jakub@cloudflare.com
tools/testing/selftests/bpf/progs/test_sock_fields.c

index 43b31aa..43a17fd 100644 (file)
@@ -134,11 +134,11 @@ int egress_read_sock_fields(struct __sk_buff *skb)
        if (!sk)
                RET_LOG();
 
-       /* Not the testing egress traffic or
-        * TCP_LISTEN (10) socket will be copied at the ingress side.
+       /* Not testing the egress traffic or the listening socket,
+        * which are covered by the cgroup_skb/ingress test program.
         */
        if (sk->family != AF_INET6 || !is_loopback6(sk->src_ip6) ||
-           sk->state == 10)
+           sk->state == BPF_TCP_LISTEN)
                return CG_OK;
 
        if (sk->src_port == bpf_ntohs(srv_sa6.sin6_port)) {
@@ -232,8 +232,8 @@ int ingress_read_sock_fields(struct __sk_buff *skb)
            sk->src_port != bpf_ntohs(srv_sa6.sin6_port))
                return CG_OK;
 
-       /* Only interested in TCP_LISTEN */
-       if (sk->state != 10)
+       /* Only interested in the listening socket */
+       if (sk->state != BPF_TCP_LISTEN)
                return CG_OK;
 
        /* It must be a fullsock for cgroup_skb/ingress prog */