diff --git a/client/internal/dns/forwarder/bpf_bpfeb.go b/client/internal/dns/forwarder/bpf_bpfeb.go index 9ae89aa99..1fe1fd6e0 100644 --- a/client/internal/dns/forwarder/bpf_bpfeb.go +++ b/client/internal/dns/forwarder/bpf_bpfeb.go @@ -115,5 +115,6 @@ func _BpfClose(closers ...io.Closer) error { } // Do not access this directly. +// //go:embed bpf_bpfeb.o var _BpfBytes []byte diff --git a/client/internal/dns/forwarder/bpf_bpfeb.o b/client/internal/dns/forwarder/bpf_bpfeb.o index fe59e6aa2..5c31177e5 100644 Binary files a/client/internal/dns/forwarder/bpf_bpfeb.o and b/client/internal/dns/forwarder/bpf_bpfeb.o differ diff --git a/client/internal/dns/forwarder/bpf_bpfel.go b/client/internal/dns/forwarder/bpf_bpfel.go index ef4a6ace6..c98028ef6 100644 --- a/client/internal/dns/forwarder/bpf_bpfel.go +++ b/client/internal/dns/forwarder/bpf_bpfel.go @@ -115,5 +115,6 @@ func _BpfClose(closers ...io.Closer) error { } // Do not access this directly. +// //go:embed bpf_bpfel.o var _BpfBytes []byte diff --git a/client/internal/dns/forwarder/bpf_bpfel.o b/client/internal/dns/forwarder/bpf_bpfel.o index a6a53611c..c45d49af7 100644 Binary files a/client/internal/dns/forwarder/bpf_bpfel.o and b/client/internal/dns/forwarder/bpf_bpfel.o differ diff --git a/client/internal/dns/forwarder/port_fwd.c b/client/internal/dns/forwarder/src/port_fwd.c similarity index 100% rename from client/internal/dns/forwarder/port_fwd.c rename to client/internal/dns/forwarder/src/port_fwd.c diff --git a/client/internal/dns/forwarder/traffic_forwarder.go b/client/internal/dns/forwarder/traffic_forwarder.go index 3270b3124..05155241f 100644 --- a/client/internal/dns/forwarder/traffic_forwarder.go +++ b/client/internal/dns/forwarder/traffic_forwarder.go @@ -3,11 +3,11 @@ package forwarder import ( _ "embed" "encoding/binary" - log "github.com/sirupsen/logrus" "net" "github.com/cilium/ebpf/link" "github.com/cilium/ebpf/rlimit" + log "github.com/sirupsen/logrus" ) const ( @@ -17,7 +17,7 @@ const ( // libbpf-dev, libc6-dev-i386-amd64-cross // -//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang-14 bpf port_fwd.c -- -I /usr/x86_64-linux-gnu/include +//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang-14 bpf src/port_fwd.c -- -I /usr/x86_64-linux-gnu/include type TrafficForwarder struct { link link.Link iFaceName string