From 9a418e8dbf0a6274e874b195278d7bdef1f7e048 Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Tue, 1 Aug 2023 10:31:03 +0200
Subject: [PATCH] Fix build without import C

---
 client/internal/dns/forwarder/bpf_bpfeb.go    |   1 +
 client/internal/dns/forwarder/bpf_bpfeb.o     | Bin 6312 -> 6296 bytes
 client/internal/dns/forwarder/bpf_bpfel.go    |   1 +
 client/internal/dns/forwarder/bpf_bpfel.o     | Bin 6312 -> 6296 bytes
 .../dns/forwarder/{ => src}/port_fwd.c        |   0
 .../dns/forwarder/traffic_forwarder.go        |   4 ++--
 6 files changed, 4 insertions(+), 2 deletions(-)
 rename client/internal/dns/forwarder/{ => src}/port_fwd.c (100%)

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 fe59e6aa21b9175130840933fa2cb91329232b04..5c31177e5050ba9926233d087d6744ac927fc237 100644
GIT binary patch
delta 1187
zcmZ9KPiPZC6vp4%-K4QiYoe`9^^nzQ>CINe1d28{_fiZVB$r^MP!w-fQ1H*@ptL6m
zjE4vof&~fUA+`s55DW-5M};18=phF|4}u;=J@~!sTi80VGv9B%H#6_eY-_GDS3k|=
zH?ylYzct%-{@PWCC{9EfB3{NQ8jWwF6YWCZR$YXCsJaUMM0E{%U3C-sbpn7k1ifiW
z&N2Tz2nX>89vI|cbiq4GbeI|}7!Ev~YWK$iJ%Rzg{bN5nvRMq?IJU(Wa*{MBjZU-+
zeN=Uk$ahXDRAJ1iu0hZ1#xmd_$J5l2gmX!~lzLaxI}ER)S`t{23eYTkh;>$U-662-
zd5_JF*!1z5h9PxwG5u7-CN*r`v|~AbVRmD=saFSsdx1q$(xG9UvuRTCbM~#3C37+U
zd+YMhGuwP0&U4S49Lf2p>;5PLXYslC@N6|nv!MK#s4lg55tbaP${R!t@z<2U5<Qpo
zb>%-qEs1X+H(V~~iF)#8&A|6b0^~J1!30-`+9;ZP;1l?yx!^sbccNu;u!R@vsNTmj
zflpy!CFQWNvT{%u{@Cl03CXmk99Gs+4l8Rbhm~#rS6L_GOJV(ht*mJ$v*|3+rvq3~
z(Ah=PPiFl^qFtHQTeI#EeVGO~H0mX`5pF7fCi;6GthrdivL3m}W!PtkQ>bNdi6M*M
zSHD8+;??<Ez`iXL67W+49uc2Cf?G~R7z?aagb{CLlsAYy9B8=_7Jo+hBXKzmE=Cx?
ztK|*YCa!Fb?Zo+k>5lvC8E?Yp)>e07m3iKjCi7e{Ym*DSXS(PcCXrd-yT;30uttBG
HwT$}@4=aiF

delta 1203
zcmZ9KPiPZS5XNVAH)-wPR9l<ULstu>9-6ig(p=Q&L1It6nM2WfkhU0lC<KBC8xd>~
ziiLLxqLAVxhaOUc5Ya<>(VG;hQt;A)QbEBURYd$|cLG}<+4sKR`)1yo*-d$}I=Md1
z3tJN_Hoq|qd+O$rLlh;VI1v}HipJnOm_)nK_f==0*Hq6zKUH0V-c((Ie$@)VXo21_
zGtQv*4up&NJ^KbZSY7bP4oukc6WRg~x7t6t0^N=UzWw(&JKZ=e0<Rax4r0YkG8`9^
zXspgT)fpnsNh-|2z=j`Gf}YlcWx++xH7y-QIM>ySsdr1gQ}FVtrGRDW0K>wASm&PR
zodnC757{h6M$SCaFqBR%wx4NOzlLp^T4b2F%wA-8;AOX;3WsRGpOJvyj)_H6oG@3T
zzhlL8>P9L#mS0>d6vyV53iZn^k8Sg*EzO6fw|&?fC%W5-+zC7`o@JtvRGn7FS6!FZ
zvLTj|=9D*x%Hppoe<6Az`RmHRh^i7_Myc}exk9urpRf}69!UVcFKq`KoF}T`9q=Le
zEFKvy_#4q{(Q-K0I*k<7$9OdGsoB_!a<j3Va?sdqqJ_|gR9aHr(9WvL&CY7d&CVMC
zb+#SyrLlv6t%Rv`4D}?4c26K9t-G^kw`0hgCEAl+eQVYOqR%7XvPQkYF~Sw)1EN3Y
z!CH$YEcvKKUWR>%IEG$$Kg8lA&iC`gF1|W{4cN0~LjsO8zz`?#hOO2RBf*M=81YtI
z`8jbG7g}zJ#UEAvK%DCVXF`mBua))LCeGK7I^RZl%`|#F&Y5(d$BlZUZ-sf<WcsH#
bYl{6B`MYUgu9}~iS4}#8!Rl%?#kl(q{jQR$

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 a6a53611c8a39a342449247f5adb40b26a0e87e3..c45d49af70334ac17931ddc7b8c8d9e188f023b7 100644
GIT binary patch
delta 1169
zcmZ9KO=uHA6vy8*Uz;|&O|&&hJ!EUJ#+#8sDn*i>jEAUrkX(Y1q6od!f`T8LilQJ$
zVLU{z5G+U#3$;P)K`^19R|_6;sE~u82SJbG2l#*47g!v4GymWFznPskY%^QWu4GjC
z<>3cD^;*C3<u068L_s2df`~4;8j5H^v<<x^x&VDkbQSuc=o<8@=mzu)XbdBSX;YW{
z`;%{x@q@NqN3phv)O)?`k2^gdkjNUr#0B5~W8NCT0b}qY(0neBm}nb%LUaN8py(=e
zR&)(|78=8{F!6VaE}t^+0CZZ+sF>$mHui!mqWJ>zu2w_PT)Qay_CWKY*Y(A~p~;$5
z@nRz$NmU%0t5)@TAg!M2oj^MI93FC`NK=w03@+c)X7HHr%Hq5}5&YFU8+z>1--f4E
zS5J<loh%B>8$?I2+K45DQ6rkcY9sC<qATdp!xp$IyvBZ==)Uk5ti}@}l=S!i#%eW*
zP(l;9T@EqaC2F|7LtGF+LEBAG1qEt@sEhRgay)FrE|}inaN!Uh&S<-yjog4U;tv`-
zBRpuVEbKP6Ky=xY;Ld8ogU)cb{sjh|;ck5%bhZWdcGmXz+*nUIrPm{=SPIt;f57{q
z9UD$be~P4>5@$c+)g*frJoOo`Cj5*U2Q`Fuz{md(ZFo2g-V#2FKi`U~{v+~Nn8V<n
z_!Y2eEBflPL!1aB@k0vkfcH%+GVmcjfY}5`JsbungxBC(MMbuU!{ChYJNU7(qJoD<
z!NoqqthD}`+d*|xcg7r5)N|vGYPLG#_mrB|C*wIaqnG1(wW~Xr>slr9>YAQQ<cEHm
I`gUUKA7uE8egFUf

delta 1184
zcmZ9LPiRv?5XNVlKYeMFmqgnpp@*&pYI<li5c}sKjUFTx6mRBGY&;YzhJb-U5#gm2
zv?#^GUW!;q@sdM@#!!gpAw}?}sHhaY^q^EwQICp<-{wu=;lk{Ezxn2Eb{4Xhs-;#F
zV!l3d$0eStZP)mvq9F1TxuZl>wlx&db=DGkiFF2gg>@c!opl9zlXVsP2{e|`jcrGr
zbq~f~qT&X<u^pkcBogn{qB~-JcL9maUTnJI?|&Rby9WpK!5f6u=jtU{OXv~S8R#_Y
zJamS21$r79%QUg+-??D(IRg(s7ugK4IcKwR5L{rbFHo|z=z`Y0i~QXIXnp8yHRm~U
z=q`8ZBoPm|D*~;%Hq}E<T-4QTPdxS*9%@09DW*3p-M*s&-bs;EXS}~d3ln3rW9iYt
zm122e^m4J>IMsd6r9Si=7yByQ8@G<4KX8NS7_vl^5JrV)0$C!K5TR9~tb<K(o_Rz2
zYedV;pOB6FL}+P${|niy5ut^mg6K4&XP2mI`xfa2KN?zgfeL64TSWWFhf&i@BEEp>
zDGp~Iz&jc(+monuIKh5ru=C8F!E(&@U{{Ie9R)pEg?R&6Plmg-FVL9`cWZNJvL@I$
zS<B(;!S<MwYTZ8+PU70WS9o8HBjL=b7ycn@MpxhB)wp^SJp2)_#=NZ=2UVH(z$g9?
zZ8_KnZZe<5AHfU>+I6rGyvJOCACQ7R+ia08_)z%44GKJv7G&Uu^ffgHz##|wz)|K$
z@Xf3s>0lo?!Tb(>I43CM;2=2LW|)P>x4<*6SW)#pOXO6l-xAG6z5kXF(`qs@F0$%c
ZWJ-Khb?i0u6Z^7CMW?z9Q<b8_{{WkolQaMT

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