changed ports as per issue #3

.github/workflows/test.yaml

@@ -1,6 +1,8 @@
 name: Tests
 
-on: [push]
+on:
+  - push
+  - pull_request
 
 env:
   IMAGE_TAGGED: coap:${{ github.sha }}
@@ -36,7 +38,7 @@ jobs:
           STORAGE_CONNECTION_STRING: ${{ secrets.STORAGE_CONNECTION_STRING }}
           STORAGE_CONTAINER_NAME: ${{ vars.STORAGE_CONTAINER_NAME }}
         run: |
-          docker run --cidfile container.cid --network=host -p 5688:5688/udp -p 5689:5689/udp -e STORAGE_CONNECTION_STRING -e STORAGE_CONTAINER_NAME -d ${{ env.IMAGE_TAGGED }}
+          docker run --cidfile container.cid --network=host -p 5683:5683/udp -p 5684:5684/udp -p 5688:5688/udp -p 5689:5689/udp -e STORAGE_CONNECTION_STRING -e STORAGE_CONTAINER_NAME -d ${{ env.IMAGE_TAGGED }}
           CID=`cat container.cid`
           echo "CID=${CID}" >> $GITHUB_ENV
 

Dockerfile

@@ -22,4 +22,7 @@ WORKDIR /home/coap
 EXPOSE 5688/udp
 EXPOSE 5689/udp
 
+EXPOSE 5683/udp
+EXPOSE 5684/udp
+
 CMD [ "/home/coap/start.sh" ]

client/client.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"github.com/google/uuid"
+	piondtls "github.com/pion/dtls/v2"
+	"github.com/plgd-dev/go-coap/v3/dtls"
 	"log"
 	"net"
 	"time"
@@ -12,11 +15,6 @@ import (
 	"github.com/plgd-dev/go-coap/v3/udp"
 	"github.com/plgd-dev/go-coap/v3/udp/client"
 
-	piondtls "github.com/pion/dtls/v2"
-	"github.com/plgd-dev/go-coap/v3/dtls"
-
-	"github.com/google/uuid"
-
 	"coap-client/internal"
 )
 
@@ -26,6 +24,12 @@ func check(e error) {
 	}
 }
 
+type flags struct {
+	address  string
+	password string
+	udp6     bool
+}
+
 func main() {
 	address := flag.String("address", "localhost",
 		"The UDP Server listen address, e.g. `localhost`.")
@@ -34,25 +38,39 @@ func main() {
 	udp6 := flag.Bool("udp6", false, "Whether to use IPv6")
 	flag.Parse()
 
+	var flagValues = flags{
+		address:  *address,
+		password: *password,
+		udp6:     *udp6,
+	}
+
+	// Testing with Old Config
+	testPorts(flagValues, 5688, 5689)
+
+	// Testing with New Config
+	testPorts(flagValues, 5683, 5684)
+
+}
+
+func testPorts(flagValues flags, udpPort int, dTLSPort int) {
+
 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(10)*time.Second)
 	defer cancel()
 
-	udpPort := 5688
-	dTLSPort := 5689
 	var udpAddr string
 	var dtlsAddr string
 	config := client.Config{}
 	var opt udp.Option
-	if *udp6 {
-		ip6, err := net.DefaultResolver.LookupIP(context.Background(), "ip6", *address)
+	if flagValues.udp6 {
+		ip6, err := net.DefaultResolver.LookupIP(context.Background(), "ip6", flagValues.address)
 		if err != nil {
 			log.Fatal("Failed to resolve IPv6 address: ", err)
 		}
 		udpAddr = fmt.Sprintf("[%s]:%d", ip6[0].String(), udpPort)
 		dtlsAddr = fmt.Sprintf("[%s]:%d", ip6[0].String(), dTLSPort)
 		opt = options.WithNetwork("udp6")
 	} else {
-		ip4, err := net.DefaultResolver.LookupIP(context.Background(), "ip4", *address)
+		ip4, err := net.DefaultResolver.LookupIP(context.Background(), "ip4", flagValues.address)
 		if err != nil {
 			log.Fatal("Failed to resolve IPv4 address: ", err)
 		}
@@ -78,11 +96,11 @@ func main() {
 	}
 
 	log.Printf("dTLS Server listening on: %s\n", dtlsAddr)
-	log.Printf("dTLS PSK: %s\n", *password)
+	log.Printf("dTLS PSK: %s\n", flagValues.password)
 	codTLS, err := dtls.Dial(dtlsAddr, &piondtls.Config{
 		PSK: func(hint []byte) ([]byte, error) {
 			log.Printf("Server's hint: %s \n", hint)
-			return []byte(*password), nil
+			return []byte(flagValues.password), nil
 		},
 		PSKIdentityHint: []byte("Pion DTLS Client"),
 		CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},

client/internal/requests.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"log"
 
-	"github.com/plgd-dev/go-coap/v3/udp/client"
 	"github.com/plgd-dev/go-coap/v3/message"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
 )
 
 // Test Hello resource

server/launch/server.go

@@ -0,0 +1,44 @@
+package launch
+
+import (
+	"fmt"
+	piondtls "github.com/pion/dtls/v2"
+	"github.com/plgd-dev/go-coap/v3"
+	"github.com/plgd-dev/go-coap/v3/mux"
+	"log"
+)
+
+type ServerPorts struct {
+	OldUdpPort  int
+	NewUdpPort  int
+	OldDtlsPort int
+	NewDtlsPort int
+}
+
+type ServerFlags struct {
+	Address  string
+	Password string
+	Dtls     bool
+	Network  string
+}
+
+func Server(flagValues ServerFlags, udpPort int, dtlsPort int, r *mux.Router) {
+	udpAddr := fmt.Sprintf("%s:%d", flagValues.Address, udpPort)
+	dtlsAddr := fmt.Sprintf("%s:%d", flagValues.Address, dtlsPort)
+
+	if flagValues.Dtls {
+		log.Printf("dTLS %s Server listening on: %s\n", flagValues.Network, dtlsAddr)
+		log.Printf("dTLS PSK: %s\n", flagValues.Password)
+		log.Fatal(coap.ListenAndServeDTLS(flagValues.Network, dtlsAddr, &piondtls.Config{
+			PSK: func(hint []byte) ([]byte, error) {
+				log.Printf("Client's hint: %s \n", hint)
+				return []byte(flagValues.Password), nil
+			},
+			PSKIdentityHint: []byte("Pion DTLS Client"),
+			CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
+		}, r))
+	} else {
+		log.Printf("%s Server listening on: %s\n", flagValues.Network, udpAddr)
+		log.Fatal(coap.ListenAndServe(flagValues.Network, udpAddr, r))
+	}
+}

server/server.go

@@ -1,16 +1,13 @@
 package main
 
 import (
+	"coap-server/launch"
 	"flag"
-	"fmt"
 	"log"
 	"os"
 
 	"coap-server/internal"
 
-	piondtls "github.com/pion/dtls/v2"
-	coap "github.com/plgd-dev/go-coap/v3"
-
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
 )
 
@@ -30,6 +27,20 @@ func main() {
 		"The network to use, `udp4` or `udp6`.")
 	flag.Parse()
 
+	var flagValues = launch.ServerFlags{
+		Address:  *address,
+		Password: *password,
+		Dtls:     *dtls,
+		Network:  *network,
+	}
+
+	var ports = launch.ServerPorts{
+		OldUdpPort:  5688,
+		NewUdpPort:  5683,
+		OldDtlsPort: 5689,
+		NewDtlsPort: 5684,
+	}
+
 	storageConnectionString, ok := os.LookupEnv("STORAGE_CONNECTION_STRING")
 	if !ok {
 		log.Fatal("the environment variable 'STORAGE_CONNECTION_STRING' could not be found")
@@ -46,24 +57,10 @@ func main() {
 
 	r := internal.NewServer(storageClient, containerName)
 
-	udpPort := 5688
-	dTLSPort := 5689
-	udpAddr := fmt.Sprintf("%s:%d", *address, udpPort)
-	dtlsAddr := fmt.Sprintf("%s:%d", *address, dTLSPort)
+	// old ports
+	go launch.Server(flagValues, ports.OldUdpPort, ports.OldDtlsPort, r)
+
+	// new ports
+	launch.Server(flagValues, ports.NewUdpPort, ports.NewDtlsPort, r)
 
-	if *dtls {
-		log.Printf("dTLS %s Server listening on: %s\n", *network, dtlsAddr)
-		log.Printf("dTLS PSK: %s\n", *password)
-		log.Fatal(coap.ListenAndServeDTLS(*network, dtlsAddr, &piondtls.Config{
-			PSK: func(hint []byte) ([]byte, error) {
-				log.Printf("Client's hint: %s \n", hint)
-				return []byte(*password), nil
-			},
-			PSKIdentityHint: []byte("Pion DTLS Client"),
-			CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
-		}, r))
-	} else {
-		log.Printf("%s Server listening on: %s\n", *network, udpAddr)
-		log.Fatal(coap.ListenAndServe(*network, udpAddr, r))
-	}
 }