add REDIRECT

hc

2024-10-09 05e59e5fb0064c97a1c10921ecd549f2d4a58565

 kernel/samples/bpf/sockex1_user.c
..
..
@@ -3,30 +3,33 @@
3
3
 #include <assert.h>
4
4
 #include <linux/bpf.h>
5
5
 #include <bpf/bpf.h>
6
-#include "bpf_load.h"
6
+#include <bpf/libbpf.h>
7
7
 #include "sock_example.h"
8
8
 #include <unistd.h>
9
9
 #include <arpa/inet.h>
10
10
 
11
11
 int main(int ac, char **argv)
12
12
 {
13
+	struct bpf_object *obj;
14
+	int map_fd, prog_fd;
13
15
 	char filename[256];
14
-	FILE *f;
15
16
 	int i, sock;
17
+	FILE *f;
16
18
 
17
19
 	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
18
20
 
19
-	if (load_bpf_file(filename)) {
20
-		printf("%s", bpf_log_buf);
21
+	if (bpf_prog_load(filename, BPF_PROG_TYPE_SOCKET_FILTER,
22
+			  &obj, &prog_fd))
21
23
 		return 1;
22
-	}
24
+
25
+	map_fd = bpf_object__find_map_fd_by_name(obj, "my_map");
23
26
 
24
27
 	sock = open_raw_sock("lo");
25
28
 
26
-	assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, prog_fd,
27
-			  sizeof(prog_fd[0])) == 0);
29
+	assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, &prog_fd,
30
+			  sizeof(prog_fd)) == 0);
28
31
 
29
-	f = popen("ping -c5 localhost", "r");
32
+	f = popen("ping -4 -c5 localhost", "r");
30
33
 	(void) f;
31
34
 
32
35
 	for (i = 0; i < 5; i++) {
..
..
@@ -34,13 +37,13 @@
34
37
 		int key;
35
38
 
36
39
 		key = IPPROTO_TCP;
37
-		assert(bpf_map_lookup_elem(map_fd[0], &key, &tcp_cnt) == 0);
40
+		assert(bpf_map_lookup_elem(map_fd, &key, &tcp_cnt) == 0);
38
41
 
39
42
 		key = IPPROTO_UDP;
40
-		assert(bpf_map_lookup_elem(map_fd[0], &key, &udp_cnt) == 0);
43
+		assert(bpf_map_lookup_elem(map_fd, &key, &udp_cnt) == 0);
41
44
 
42
45
 		key = IPPROTO_ICMP;
43
-		assert(bpf_map_lookup_elem(map_fd[0], &key, &icmp_cnt) == 0);
46
+		assert(bpf_map_lookup_elem(map_fd, &key, &icmp_cnt) == 0);
44
47
 
45
48
 		printf("TCP %lld UDP %lld ICMP %lld bytes\n",
46
49
 		       tcp_cnt, udp_cnt, icmp_cnt);