cli: add peers update_ip command

Author: pymq

application_test.go

@@ -426,7 +426,7 @@ func TestUpdatePeerSettingsIPAddr(t *testing.T) {
 					AllowUsingAsExitNode: peer2Config.WeAllowUsingAsExitNode,
 				})
 				ts.Error(err)
-				ts.ErrorContains(err, "IP "+tc.ip+" not found in")
+				ts.ErrorContains(err, "IP "+tc.ip+" does not belong to subnet 10.66.0.0/24")
 			})
 		}
 	})

cli/cli.go

@@ -270,6 +270,31 @@ func (a *Application) init() {
 							return changePeerDomain(a.api, c.String("pid"), c.String("domain"))
 						},
 					},
+					{
+						Name:  "update_ip",
+						Usage: "Change known peer IP address",
+						Flags: []cli.Flag{
+							&cli.StringFlag{
+								Name:     "pid",
+								Usage:    "peer id",
+								Required: false,
+							},
+							&cli.StringFlag{
+								Name:     "name",
+								Usage:    "peer name",
+								Required: false,
+							},
+							&cli.StringFlag{
+								Name:     "ip",
+								Usage:    "peer IP address",
+								Required: true,
+							},
+						},
+						Before: a.initApiAndPeerIdRequired,
+						Action: func(c *cli.Context) error {
+							return changePeerIP(a.api, c.String("pid"), c.String("ip"))
+						},
+					},
 					{
 						Name:  "allow_exit_node",
 						Usage: "Allow known peer to use this device as exit node (as socks5 proxy)",

cli/peers.go

@@ -250,6 +250,27 @@ func changePeerDomain(api *apiclient.Client, peerID, newDomain string) error {
 	return nil
 }
 
+func changePeerIP(api *apiclient.Client, peerID, newIP string) error {
+	pcfg, err := api.KnownPeerConfig(peerID)
+	if err != nil {
+		return err
+	}
+
+	err = api.UpdatePeerSettings(entity.UpdatePeerSettingsRequest{
+		PeerID:               peerID,
+		Alias:                pcfg.Alias,
+		DomainName:           pcfg.DomainName,
+		IPAddr:               newIP,
+		AllowUsingAsExitNode: pcfg.WeAllowUsingAsExitNode,
+	})
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("peer IP address updated successfully")
+	return nil
+}
+
 func setAllowUsingAsExitNode(api *apiclient.Client, peerID string, allow bool) error {
 	pcfg, err := api.KnownPeerConfig(peerID)
 	if err != nil {

config/network_addr.go

@@ -32,7 +32,7 @@ func (c *Config) VPNLocalIPMaskUnlocked() (net.IP, net.IPMask) {
 // GenerateNextIpAddr is not thread safe.
 func (c *Config) GenerateNextIpAddr() string {
 	localIP, netMask := c.VPNLocalIPMaskUnlocked()
-	ipNet := net.IPNet{
+	ipNet := &net.IPNet{
 		IP:   localIP.Mask(netMask),
 		Mask: netMask,
 	}
@@ -59,7 +59,7 @@ func (c *Config) GenerateNextIpAddr() string {
 // Checks IP for: valid ip, unique across peers, in vpn net mask
 func (c *Config) CheckIPUnique(checkIP string, exceptPeerID string) error {
 	localIP, netMask := c.VPNLocalIPMaskUnlocked()
-	ipNet := net.IPNet{
+	ipNet := &net.IPNet{
 		IP:   localIP.Mask(netMask),
 		Mask: netMask,
 	}
@@ -74,7 +74,7 @@ func (c *Config) CheckIPUnique(checkIP string, exceptPeerID string) error {
 
 	contains := ipNet.Contains(ip)
 	if !contains {
-		return fmt.Errorf("IP %s not found in %s", checkIP, ipNet)
+		return fmt.Errorf("IP %s does not belong to subnet %s", checkIP, ipNet)
 	}
 
 	for _, peer := range c.KnownPeers {