Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9899694a authored by Joe Stringer's avatar Joe Stringer Committed by Arnaldo Carvalho de Melo
Browse files

samples/bpf: Move open_raw_sock to separate header 



This function was declared in libbpf.c and was the only remaining
function in this library, but has nothing to do with BPF. Shift it out
into a new header, sock_example.h, and include it from the relevant
samples.

Signed-off-by: default avatarJoe Stringer <joe@ovn.org>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20161209024620.31660-8-joe@ovn.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 205c8ada

samples/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ hostprogs-y += lwt_len_hist 
hostprogs-y += xdp_tx_iptunnel



# Libbpf dependencies

LIBBPF := libbpf.o ../../tools/lib/bpf/bpf.o

LIBBPF := ../../tools/lib/bpf/bpf.o



test_lru_dist-objs := test_lru_dist.o $(LIBBPF)

sock_example-objs := sock_example.o $(LIBBPF)

samples/bpf/fds_example.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "bpf_load.h"

#include "libbpf.h"

#include "sock_example.h"



#define BPF_F_PIN	(1 << 0)

#define BPF_F_GET	(1 << 1)

samples/bpf/libbpf.h

+0 −3
Original line number Diff line number Diff line
@@ -185,7 +185,4 @@ struct bpf_insn; 
		.off   = 0,					\

		.imm   = 0 })



/* create RAW socket and bind to interface 'name' */

int open_raw_sock(const char *name);



#endif

samples/bpf/sock_example.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/ip.h>

#include <stddef.h>

#include "libbpf.h"

#include "sock_example.h"



char bpf_log_buf[BPF_LOG_BUF_SIZE];

samples/bpf/libbpf.c→samples/bpf/sock_example.h

+1 −2
Original line number Diff line number Diff line 
/* eBPF mini library */

#include <stdlib.h>

#include <stdio.h>

#include <linux/unistd.h>
@@ -11,7 +10,7 @@ 
#include <arpa/inet.h>

#include "libbpf.h"



int open_raw_sock(const char *name)

static inline int open_raw_sock(const char *name)

{

	struct sockaddr_ll sll;

	int sock;