core
/
mobile_nebula
mirror of https://github.com/DefinedNet/mobile_nebula.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Update nebula control for netip

This commit is contained in:
Ian VanSchooten 2024-10-16 09:40:03 -04:00
parent 2d74360bc2
commit be7fe4f88d
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nebula/control.go
View File

@ -4,7 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
"net"
"net/netip"
"os"
"runtime"
"runtime/debug"
@ -12,9 +12,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/slackhq/nebula"
nc "github.com/slackhq/nebula/config"
"github.com/slackhq/nebula/iputil"
"github.com/slackhq/nebula/overlay"
"github.com/slackhq/nebula/udp"
"github.com/slackhq/nebula/util"
)
@ -108,8 +106,8 @@ func (n *Nebula) ListHostmap(pending bool) (string, error) {
return string(b), nil
}
func (n *Nebula) GetHostInfoByVpnIp(vpnIp string, pending bool) (string, error) {
b, err := json.Marshal(n.c.GetHostInfoByVpnIp(stringIpToInt(vpnIp), pending))
func (n *Nebula) GetHostInfoByVpnIp(vpnIp netip.Addr, pending bool) (string, error) {
b, err := json.Marshal(n.c.GetHostInfoByVpnIp(vpnIp, pending))
if err != nil {
return "", err
}
@ -117,17 +115,17 @@ func (n *Nebula) GetHostInfoByVpnIp(vpnIp string, pending bool) (string, error)
return string(b), nil
}
func (n *Nebula) CloseTunnel(vpnIp string) bool {
return n.c.CloseTunnel(stringIpToInt(vpnIp), false)
func (n *Nebula) CloseTunnel(vpnIp netip.Addr) bool {
return n.c.CloseTunnel(vpnIp, false)
}
func (n *Nebula) SetRemoteForTunnel(vpnIp string, addr string) (string, error) {
udpAddr := udp.NewAddrFromString(addr)
if udpAddr == nil {
func (n *Nebula) SetRemoteForTunnel(vpnIp netip.Addr, addr string) (string, error) {
udpAddr, err := netip.ParseAddrPort(addr)
if err != nil {
return "", errors.New("could not parse udp address")
}
b, err := json.Marshal(n.c.SetRemoteForTunnel(stringIpToInt(vpnIp), *udpAddr))
b, err := json.Marshal(n.c.SetRemoteForTunnel(vpnIp, udpAddr))
if err != nil {
return "", err
}
@ -140,7 +138,3 @@ func (n *Nebula) Sleep() {
n.l.WithField("tunnels", closed).Info("Sleep called, closed non lighthouse tunnels")
}
}
func stringIpToInt(ip string) iputil.VpnIp {
return iputil.Ip2VpnIp(net.ParseIP(ip))
}