chore(deps): upgrade vishvananda/netlink from v1.2.1-beta.2 to v1.2.1

This commit is contained in:
Quentin McGaw
2024-08-23 06:46:29 +00:00
parent 703a546c1d
commit 540acc915d
10 changed files with 24 additions and 22 deletions

View File

@@ -50,7 +50,7 @@ func makeDeviceConfig(settings Settings) (config wgtypes.Config, err error) {
*persistentKeepaliveInterval = settings.PersistentKeepaliveInterval
}
firewallMark := settings.FirewallMark
firewallMark := int(settings.FirewallMark)
config = wgtypes.Config{
PrivateKey: &privateKey,

View File

@@ -9,7 +9,7 @@ import (
)
func (w *Wireguard) addRoutes(link netlink.Link, destinations []netip.Prefix,
firewallMark int) (err error) {
firewallMark uint32) (err error) {
for _, dst := range destinations {
err = w.addRoute(link, dst, firewallMark)
if err == nil {
@@ -29,11 +29,11 @@ func (w *Wireguard) addRoutes(link netlink.Link, destinations []netip.Prefix,
}
func (w *Wireguard) addRoute(link netlink.Link, dst netip.Prefix,
firewallMark int) (err error) {
firewallMark uint32) (err error) {
route := netlink.Route{
LinkIndex: link.Index,
Dst: dst,
Table: firewallMark,
Table: int(firewallMark),
}
err = w.netlink.RouteAdd(route)

View File

@@ -6,13 +6,13 @@ import (
"github.com/qdm12/gluetun/internal/netlink"
)
func (w *Wireguard) addRule(rulePriority, firewallMark, family int) (
cleanup func() error, err error) {
func (w *Wireguard) addRule(rulePriority int, firewallMark uint32,
family int) (cleanup func() error, err error) {
rule := netlink.NewRule()
rule.Invert = true
rule.Priority = rulePriority
rule.Mark = firewallMark
rule.Table = firewallMark
rule.Table = int(firewallMark)
rule.Family = family
if err := w.netlink.RuleAdd(rule); err != nil {
return nil, fmt.Errorf("adding rule %s: %w", rule, err)

View File

@@ -35,7 +35,7 @@ type Settings struct {
PersistentKeepaliveInterval time.Duration
// FirewallMark to be used in routing tables and IP rules.
// It defaults to 51820 if left to 0.
FirewallMark int
FirewallMark uint32
// Maximum Transmission Unit (MTU) setting for the network interface.
// It defaults to device.DefaultMTU from wireguard-go which is 1420
MTU uint16