.. | .. |
---|
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> |
---|
.. | .. |
---|
17 | 17 | int main(int ac, char **argv) |
---|
18 | 18 | { |
---|
19 | 19 | struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; |
---|
| 20 | + struct bpf_object *obj; |
---|
| 21 | + int map_fd, prog_fd; |
---|
20 | 22 | char filename[256]; |
---|
21 | | - FILE *f; |
---|
22 | 23 | int i, sock; |
---|
| 24 | + FILE *f; |
---|
23 | 25 | |
---|
24 | 26 | snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); |
---|
25 | 27 | setrlimit(RLIMIT_MEMLOCK, &r); |
---|
26 | 28 | |
---|
27 | | - if (load_bpf_file(filename)) { |
---|
28 | | - printf("%s", bpf_log_buf); |
---|
| 29 | + if (bpf_prog_load(filename, BPF_PROG_TYPE_SOCKET_FILTER, |
---|
| 30 | + &obj, &prog_fd)) |
---|
29 | 31 | return 1; |
---|
30 | | - } |
---|
| 32 | + |
---|
| 33 | + map_fd = bpf_object__find_map_fd_by_name(obj, "hash_map"); |
---|
31 | 34 | |
---|
32 | 35 | sock = open_raw_sock("lo"); |
---|
33 | 36 | |
---|
34 | | - assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, prog_fd, |
---|
35 | | - sizeof(prog_fd[0])) == 0); |
---|
| 37 | + assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, &prog_fd, |
---|
| 38 | + sizeof(prog_fd)) == 0); |
---|
36 | 39 | |
---|
37 | | - f = popen("ping -c5 localhost", "r"); |
---|
| 40 | + f = popen("ping -4 -c5 localhost", "r"); |
---|
38 | 41 | (void) f; |
---|
39 | 42 | |
---|
40 | 43 | for (i = 0; i < 5; i++) { |
---|
41 | 44 | int key = 0, next_key; |
---|
42 | 45 | struct pair value; |
---|
43 | 46 | |
---|
44 | | - while (bpf_map_get_next_key(map_fd[0], &key, &next_key) == 0) { |
---|
45 | | - bpf_map_lookup_elem(map_fd[0], &next_key, &value); |
---|
| 47 | + while (bpf_map_get_next_key(map_fd, &key, &next_key) == 0) { |
---|
| 48 | + bpf_map_lookup_elem(map_fd, &next_key, &value); |
---|
46 | 49 | printf("ip %s bytes %lld packets %lld\n", |
---|
47 | 50 | inet_ntoa((struct in_addr){htonl(next_key)}), |
---|
48 | 51 | value.bytes, value.packets); |
---|