Merge branch 'development'

stronnag · Dec 1, 2024 · d6120ff · d6120ff
2 parents 1bb5147 + db5a270
commit d6120ff
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -34,9 +34,9 @@ require (
 	github.com/mattn/go-tty v0.0.7 // indirect
 	github.com/mazznoer/csscolorparser v0.1.5 // indirect
 	github.com/twpayne/go-kmz v0.0.0-20160614194227-165281381e72 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
 	inav v1.0.0 // indirect
 	styles v1.0.0 // indirect
 )

diff --git a/go.sum b/go.sum
@@ -40,15 +40,15 @@ github.com/yookoala/realpath v1.0.0/go.mod h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Y
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
+golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

diff --git a/pkg/ltmgen/msgdev.go b/pkg/ltmgen/msgdev.go
@@ -70,18 +70,29 @@ func NewMSPSerial(device string, baud int) *MSPSerial {
 	var reader *bufio.Reader
 	var conn net.Conn
 	var err error
+	usefam := "udp6"
 	dd := check_device(device, baud)
 	if dd.name == "" {
-		laddr, err = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", dd.name, dd.param))
+		laddr, err = net.ResolveUDPAddr(usefam, fmt.Sprintf("%s:%d", dd.name, dd.param))
+		if err != nil {
+			usefam := "udp"
+			laddr, err = net.ResolveUDPAddr(usefam, fmt.Sprintf("%s:%d", dd.name, dd.param))
+		}
 	} else {
-		raddr, err = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", dd.name, dd.param))
+		raddr, err = net.ResolveUDPAddr("udp6", fmt.Sprintf("%s:%d", dd.name, dd.param))
+		if err != nil {
+			usefam := "udp"
+			raddr, err = net.ResolveUDPAddr(usefam, fmt.Sprintf("%s:%d", dd.name, dd.param))
+		}
 	}
 	if err == nil {
-		conn, err = net.DialUDP("udp", laddr, raddr)
+		conn, err = net.DialUDP(usefam, laddr, raddr)
 		if err == nil {
 			reader = bufio.NewReader(conn)
 		}
 	}
+	fmt.Printf("UDP connection %+v\n", conn.LocalAddr())
+
 	if err != nil {
 		log.Fatalf("msgdev: %+v\n", err)
 	}