mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-14 09:48:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

optimize: adapt to bpf legacy

Browse Source
This commit is contained in:
mzz2017
2023-01-30 23:21:00 +08:00
parent 52836fa6a8
commit 3602e2e26b
6 changed files with 421 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
component/control/control_plane.go
View File

@ -20,6 +20,7 @@ import (
"github.com/v2rayA/dae/component/routing"
"github.com/v2rayA/dae/config"
"github.com/v2rayA/dae/pkg/config_parser"
internal "github.com/v2rayA/dae/pkg/ebpf_internal"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
"net"
@ -221,7 +222,7 @@ retryLoadBpf:
dnsAddr16 := dnsAddrPort.Addr().As16()
if err = bpf.DnsUpstreamMap.Update(consts.ZeroKey, bpfIpPort{
Ip: common.Ipv6ByteSliceToUint32Array(dnsAddr16[:]),
Port: swap16(dnsAddrPort.Port()),
Port: internal.Htons(dnsAddrPort.Port()),
}, ebpf.UpdateAny); err != nil {
return nil, err
}
@ -367,7 +368,16 @@ func (c *ControlPlane) BindWan(ifname string) error {
return err
}
// Insert qdisc and filters.
//// Insert SrcPidMapper.
//sock, err := internal.OpenRawSock(link.Attrs().Index)
//if err != nil {
// return fmt.Errorf("failed to open raw sock: %v: %w", ifname, err)
//}
//if err = unix.SetsockoptInt(sock, unix.SOL_SOCKET, unix.SO_ATTACH_BPF, c.bpf.bpfPrograms.SrcPidMapper.FD()); err != nil {
// return fmt.Errorf("failed to attach SrcPidMapper")
//}
// Insert qdisc and tc filters.
qdisc := &netlink.GenericQdisc{
QdiscAttrs: netlink.QdiscAttrs{
LinkIndex: link.Attrs().Index,
@ -446,7 +456,8 @@ func (c *ControlPlane) ListenAndServe(port uint16) (err error) {
defer lConn.Close()
// Serve.
if err := c.bpf.ParamMap.Update(consts.BigEndianTproxyPortKey, uint32(swap16(port)), ebpf.UpdateAny); err != nil {
if err := c.bpf.ParamMap.Update(consts.BigEndianTproxyPortKey, uint32(internal.Htons(port)), ebpf.UpdateAny); err != nil {
return err
}