iovisor · lebauce · Sep 9, 2019
diff --git a/Documentation/pinning.md b/Documentation/pinning.md
@@ -15,7 +15,7 @@ where objects are shared via Unix domain sockets.
 ## Different pinning options
 
 `C.bpf_map_def.pinning` (defined in
-[bpf.h](https://github.com/iovisor/gobpf/blob/446e57e0e24e/elf/include/bpf.h#L616))
+[bpf.h](https://github.com/iovisor/gobpf/blob/81109c30cbe2/elf/bpf.h#L616))
 can be set to one the following pinning options.
 
 * `PIN_NONE` : object is not pinned

diff --git a/LICENSE-bpf.txt b/LICENSE-bpf.txt
@@ -1,4 +1,4 @@
-The file at /elf/include/bpf.h is a copy of the Linux kernel file
+The file at /elf/bpf.h is a copy of the Linux kernel file
 /include/uapi/linux/bpf.h, retrieved from version 4.17, Git commit
 36f9814, available at
 https://raw.githubusercontent.com/torvalds/linux/36f9814a494a874d5a0f44843544b4b2539022db/include/uapi/linux/bpf.h.

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ sections (`SEC("...")`). The following are currently supported:
 * `uretprobe/...`
 * `xdp/...`
 
-Map definitions must correspond to `bpf_map_def` from [the elf package](https://github.com/iovisor/gobpf/blob/master/elf/include/bpf_map.h).
+Map definitions must correspond to `bpf_map_def` from [the elf package](https://github.com/iovisor/gobpf/blob/master/elf/bpf_map.h).
 Otherwise, you will encounter an error like `only one map with size 280 bytes allowed per section (check bpf_map_def)`.
 
 The [Cilium](https://github.com/cilium/cilium) BPF docs contain helpful info

diff --git a/elf/include/bpf.h → elf/bpf.h b/elf/include/bpf.h → elf/bpf.h
diff --git a/elf/include/bpf_map.h → elf/bpf_map.h b/elf/include/bpf_map.h → elf/bpf_map.h
diff --git a/elf/elf.go b/elf/elf.go
@@ -49,8 +49,8 @@ import (
 #include <assert.h>
 #include <sys/socket.h>
 #include <linux/unistd.h>
-#include "include/bpf.h"
-#include "include/bpf_map.h"
+#include "bpf.h"
+#include "bpf_map.h"
 #include <poll.h>
 #include <linux/perf_event.h>
 #include <sys/resource.h>
@@ -265,7 +265,7 @@ const (
 
 	// Object pin settings should correspond to those of other projects, e.g.:
 	// https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git/tree/include/bpf_elf.h#n25
-	// Also it should be self-consistent with `elf/include/bpf.h` in the same repository.
+	// Also it should be self-consistent with `elf/bpf.h` in the same repository.
 	PIN_NONE      = 0
 	PIN_OBJECT_NS = 1
 	PIN_GLOBAL_NS = 2

diff --git a/elf/include/libbpf.h → elf/libbpf.h b/elf/include/libbpf.h → elf/libbpf.h
diff --git a/elf/module.go b/elf/module.go
@@ -38,8 +38,8 @@ import (
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include "include/bpf.h"
-#include "include/libbpf.h"
+#include "bpf.h"
+#include "libbpf.h"
 #include <linux/perf_event.h>
 #include <linux/unistd.h>
 #include <sys/socket.h>
@@ -51,8 +51,8 @@ import (
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
 
-#include "lib/nlattr.c"
-#include "lib/netlink.c"
+#include "netlink.h"
+#include "nlattr.h"
 
 static int perf_event_open_tracepoint(int tracepoint_id, int pid, int cpu,
                            int group_fd, unsigned long flags)

diff --git a/elf/lib/netlink.c → elf/netlink.c b/elf/lib/netlink.c → elf/netlink.c
@@ -1,17 +1,18 @@
 // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
 /* Copyright (c) 2018 Facebook */
 
+#include <stdbool.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <memory.h>
 #include <unistd.h>
 #include <linux/rtnetlink.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <time.h>
 
-#include "include/bpf.h"
-#include "include/libbpf.h"
-#include "include/nlattr.h"
+#include "libbpf.h"
+#include "nlattr.h"
 
 #ifndef SOL_NETLINK
 #define SOL_NETLINK 270

diff --git a/elf/netlink.h b/elf/netlink.h
@@ -0,0 +1,9 @@
+#ifndef __NETLINK_H
+#define __NETLINK_H
+
+#include "bpf.h"
+
+int libbpf_netlink_open(__u32 *nl_pid);
+int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags);
+
+#endif
diff --git a/elf/lib/nlattr.c → elf/nlattr.c b/elf/lib/nlattr.c → elf/nlattr.c
@@ -7,7 +7,8 @@
  */
 
 #include <errno.h>
-#include "include/nlattr.h"
+#include "nlattr.h"
+#include "libbpf.h"
 #include <linux/rtnetlink.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/elf/include/nlattr.h → elf/nlattr.h b/elf/include/nlattr.h → elf/nlattr.h
diff --git a/elf/table.go b/elf/table.go
@@ -25,7 +25,7 @@ import (
 )
 
 /*
-#include "include/bpf.h"
+#include "bpf.h"
 #include <linux/unistd.h>
 
 extern __u64 ptr_to_u64(void *);

diff --git a/tests/dummy.c b/tests/dummy.c
@@ -2,8 +2,8 @@
  * Compiled with './build'
  */
 
-#include "../elf/include/bpf.h"
-#include "../elf/include/bpf_map.h"
+#include "../elf/bpf.h"
+    #include "../elf/bpf_map.h"
 
 #define SEC(NAME) __attribute__((section(NAME), used))