Added trim [] for IPv6 address in getDeviceByIP method

Tomas Kubovic · kuby · commit 6a2a1f3c6867 · 2025-03-25T15:25:33.000+01:00
diff --git a/client/getDevice.go b/client/getDevice.go
@@ -21,6 +21,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/plgd-dev/device/v2/client/core"
 	"github.com/plgd-dev/device/v2/schema"
@@ -81,7 +82,7 @@ func (c *Client) GetDeviceByMulticast(ctx context.Context, deviceID string, opts
 }
 
 func (c *Client) getDeviceByIP(ctx context.Context, ip string, expectedDeviceID string) (*core.Device, schema.ResourceLinks, error) {
-	dev, err := c.getDeviceByIPWithUpdateCache(ctx, ip, expectedDeviceID)
+	dev, err := c.getDeviceByIPWithUpdateCache(ctx, strings.Trim(ip, "[]"), expectedDeviceID)
 	if err != nil {
 		return nil, nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"crypto/x509"`
`22`	`22`	`"errors"`
`23`	`23`	`"fmt"`
	`24`	`+ "strings"`
`24`	`25`
`25`	`26`	`"github.com/plgd-dev/device/v2/client/core"`
`26`	`27`	`"github.com/plgd-dev/device/v2/schema"`
`@@ -81,7 +82,7 @@ func (c *Client) GetDeviceByMulticast(ctx context.Context, deviceID string, opts`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`func (c Client) getDeviceByIP(ctx context.Context, ip string, expectedDeviceID string) (core.Device, schema.ResourceLinks, error) {`
`84`		`- dev, err := c.getDeviceByIPWithUpdateCache(ctx, ip, expectedDeviceID)`
	`85`	`+ dev, err := c.getDeviceByIPWithUpdateCache(ctx, strings.Trim(ip, "[]"), expectedDeviceID)`
`85`	`86`	`if err != nil {`
`86`	`87`	`return nil, nil, err`
`87`	`88`	`}`