chore: bump deps and tidy up

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   build:
     docker: 
-      - image: cimg/go:1.20
+      - image: cimg/go:1.22
     steps:
       - run:
           name: Install upx

cmd/gowake/gowake.go

@@ -40,7 +40,7 @@ var gowakeCmd = &cobra.Command{
 		}
 
 		// Send packet
-		err = gowake.SendMagicPacket(*mp, ip, port)
+		err = gowake.SendMagicPacket(mp, ip, port)
 		if err != nil {
 			fmt.Println(err.Error())
 		}

cmd/listen/listen.go

@@ -15,7 +15,7 @@ var ListenCmd = &cobra.Command{
 		cont, _ := cmd.Flags().GetBool("continuous")
 		fmt.Printf("Listening for magic packets on port %d:\n", port)
 		for {
-			remote, macaddr, err := gowake.Listen(port)
+			remote, mac, err := gowake.Listen(port)
 			if err != nil {
 				if err.Error() == fmt.Sprintf("listen udp 0.0.0.0:%d: bind: permission denied", port) {
 					fmt.Println("Please run as elevated user")
@@ -25,7 +25,7 @@ var ListenCmd = &cobra.Command{
 					return
 				}
 			}
-			fmt.Printf("%v from %v\n", macaddr, remote.String())
+			fmt.Printf("%v from %v\n", mac, remote.String())
 			if !cont {
 				break
 			}

go.mod

@@ -1,8 +1,8 @@
 module github.com/lupinelab/gowake
 
-go 1.20
+go 1.22
 
-require github.com/spf13/cobra v1.7.0
+require github.com/spf13/cobra v1.8.0
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect

go.sum

@@ -1,9 +1,9 @@
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

magicpacket.go

@@ -7,26 +7,25 @@ import (
 
 type MagicPacket [102]byte
 
-func NewMagicPacket(mac string) (mp *MagicPacket, err error) {
+func NewMagicPacket(mac string) (MagicPacket, error) {
 	// Parse mac address
 	hwAddr, err := net.ParseMAC(mac)
 	if err != nil {
-		return nil, err
+		return MagicPacket{}, err
 	}
 
 	if len(hwAddr) != 6 {
-		return nil, fmt.Errorf("invalid EUI-48 MAC address")
+		return MagicPacket{}, fmt.Errorf("invalid EUI-48 MAC address")
 	}
 
 	// Build magicpacket
-	magicPacket := MagicPacket{}
-	copy(magicPacket[:], []byte{255, 255, 255, 255, 255, 255})
+	magicPacket := MagicPacket{255, 255, 255, 255, 255, 255}
 
 	offset := 6
 	for i := 0; i < 16; i++ {
 		copy(magicPacket[offset:], hwAddr[:])
 		offset += 6
 	}
 
-	return &magicPacket, err
+	return magicPacket, err
 }

send.go

@@ -3,16 +3,15 @@ package gowake
 import (
 	"fmt"
 	"net"
-
 )
 
-func SendMagicPacket(packet MagicPacket, ip string, port int)  error{
+func SendMagicPacket(packet MagicPacket, ip string, port int) error {
 	conn, err := net.Dial("udp", fmt.Sprintf("%s:%d", ip, port))
 	if err != nil {
 		return err
 	}
 	defer conn.Close()
-	
+
 	_, err = conn.Write(packet[:])
 	if err != nil {
 		return err