fosrl/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2025-05-13 13:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle port correctly and delete interface

Browse source
This commit is contained in:
Owen 2025-03-27 22:12:54 -04:00
parent f08378b67e
commit c5978d9c4e
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
2 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
main.go
View file

@ -490,7 +490,7 @@ persistent_keepalive_interval=5`, fixKey(fmt.Sprintf("%s", privateKey)), fixKey(
if wgService != nil { if wgService != nil {
// add a udp proxy for localost and the wgService port // add a udp proxy for localost and the wgService port
// TODO: make sure this port is not used in a target // TODO: make sure this port is not used in a target
pm.AddTarget("udp", wgData.TunnelIP, int(wgService.Port), fmt.Sprintf("localhost:%d", wgService.Port)) pm.AddTarget("udp", wgData.TunnelIP, int(wgService.Port), fmt.Sprintf("127.0.0.1:%d", wgService.Port))
} }
err = pm.Start() err = pm.Start()
@ -616,8 +616,21 @@ persistent_keepalive_interval=5`, fixKey(fmt.Sprintf("%s", privateKey)), fixKey(
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM) signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
<-sigCh <-sigCh
// Cleanup
dev.Close() dev.Close()
if wgService != nil {
wgService.Close()
}
if pm != nil {
pm.Stop()
}
if client != nil {
client.Close()
}
logger.Info("Exiting...")
os.Exit(0)
} }
func parseTargetData(data interface{}) (TargetData, error) { func parseTargetData(data interface{}) (TargetData, error) {

36
wg/wg.go
View file

@ -23,9 +23,8 @@ import (
) )
type WgConfig struct { type WgConfig struct {
ListenPort int `json:"listenPort"` IpAddress string `json:"ipAddress"`
IpAddress string `json:"ipAddress"` Peers []Peer `json:"peers"`
Peers []Peer `json:"peers"`
} }
type Peer struct { type Peer struct {
@ -176,6 +175,10 @@ func NewWireGuardService(interfaceName string, mtu int, generateAndSaveKeyTo str
func (s *WireGuardService) Close() { func (s *WireGuardService) Close() {
s.wgClient.Close() s.wgClient.Close()
// Remove the WireGuard interface
if err := s.removeInterface(); err != nil {
logger.Error("Failed to remove WireGuard interface: %v", err)
}
} }
func (s *WireGuardService) SetServerPubKey(serverPubKey string) { func (s *WireGuardService) SetServerPubKey(serverPubKey string) {
@ -188,8 +191,16 @@ func (s *WireGuardService) SetToken(token string) {
func (s *WireGuardService) LoadRemoteConfig() error { func (s *WireGuardService) LoadRemoteConfig() error {
err := s.client.SendMessage("newt/wg/get-config", map[string]interface{}{ // get the exising wireguard port
device, err := s.wgClient.Device(s.interfaceName)
if err == nil {
s.Port = uint16(device.ListenPort)
logger.Info("WireGuard interface %s already exists with port %d\n", s.interfaceName, s.Port)
}
err = s.client.SendMessage("newt/wg/get-config", map[string]interface{}{
"publicKey": fmt.Sprintf("%s", s.key.PublicKey().String()), "publicKey": fmt.Sprintf("%s", s.key.PublicKey().String()),
"port": s.Port,
}) })
if err != nil { if err != nil {
logger.Error("Failed to send registration message: %v", err) logger.Error("Failed to send registration message: %v", err)
@ -771,3 +782,20 @@ func (s *WireGuardService) keepSendingUDPHolePunch(host string) {
} }
} }
} }
func (s *WireGuardService) removeInterface() error {
// Remove the WireGuard interface
link, err := netlink.LinkByName(s.interfaceName)
if err != nil {
return fmt.Errorf("failed to get interface: %v", err)
}
err = netlink.LinkDel(link)
if err != nil {
return fmt.Errorf("failed to delete interface: %v", err)
}
logger.Info("WireGuard interface %s removed successfully", s.interfaceName)
return nil
}