Feature/fix blockwise requires message

.github/workflows/test-for-fork.yml

@@ -22,6 +22,17 @@ jobs:
 
       - run: go version
 
+      - name: Install coap-client
+        run: |
+          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
+            sudo apt-get update
+            sudo apt-get install -y libcoap3-bin
+            sudo ln -s /usr/bin/coap-client-notls /usr/bin/coap-client 
+          elif [ "${{ matrix.os }}" == "macOS-latest" ]; then
+            brew install libcoap
+          fi
+        shell: bash
+
       # Checks-out repository under $GITHUB_WORKSPACE
       - name: Checkout
         uses: actions/checkout@v5

.github/workflows/test.yml

@@ -31,6 +31,17 @@ jobs:
 
       - run: go version
 
+      - name: Install coap-client
+        run: |
+          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
+            sudo apt-get update
+            sudo apt-get install -y libcoap3-bin
+            sudo ln -s /usr/bin/coap-client-notls /usr/bin/coap-client 
+          elif [ "${{ matrix.os }}" == "macOS-latest" ]; then
+            brew install libcoap
+          fi
+        shell: bash
+
       # Checks-out repository under $GITHUB_WORKSPACE with tags and history (needed by "SonarCloud Scan" step)
       - name: Full checkout
         uses: actions/checkout@v5
@@ -118,6 +129,13 @@ jobs:
 
       - run: go version
 
+      - name: Install coap-client
+        run: |
+            sudo apt-get update
+            sudo apt-get install -y libcoap3-bin
+            sudo ln -s /usr/bin/coap-client-notls /usr/bin/coap-client 
+        shell: bash
+
       - name: Checkout
         uses: actions/checkout@v5
 

.gitignore

@@ -11,7 +11,7 @@ client
 !client/
 vendor/
 v3/
-
+/.idea/
 # Test binary, build with `go test -c`
 *.test
 

dtls/server_test.go

@@ -89,21 +89,21 @@ func createDTLSConfig() (serverConfig *piondtls.Config, clientConfig *piondtls.C
 	// root cert
 	ca, rootBytes, _, caPriv, err := pki.GenerateCA()
 	if err != nil {
-		return
+		return serverConfig, clientConfig, clientSerial, err
 	}
 	// server cert
 	certBytes, keyBytes, err := pki.GenerateCertificate(ca, caPriv, "server@test.com")
 	if err != nil {
-		return
+		return serverConfig, clientConfig, clientSerial, err
 	}
 	certificate, err := pki.LoadKeyAndCertificate(keyBytes, certBytes)
 	if err != nil {
-		return
+		return serverConfig, clientConfig, clientSerial, err
 	}
 	// cert pool
 	certPool, err := pki.LoadCertPool(rootBytes)
 	if err != nil {
-		return
+		return serverConfig, clientConfig, clientSerial, err
 	}
 
 	serverConfig = &piondtls.Config{
@@ -116,15 +116,15 @@ func createDTLSConfig() (serverConfig *piondtls.Config, clientConfig *piondtls.C
 	// client cert
 	certBytes, keyBytes, err = pki.GenerateCertificate(ca, caPriv, "client@test.com")
 	if err != nil {
-		return
+		return serverConfig, clientConfig, clientSerial, err
 	}
 	certificate, err = pki.LoadKeyAndCertificate(keyBytes, certBytes)
 	if err != nil {
-		return
+		return serverConfig, clientConfig, clientSerial, err
 	}
 	clientInfo, err := x509.ParseCertificate(certificate.Certificate[0])
 	if err != nil {
-		return
+		return serverConfig, clientConfig, clientSerial, err
 	}
 	clientSerial = clientInfo.SerialNumber
 
@@ -135,7 +135,7 @@ func createDTLSConfig() (serverConfig *piondtls.Config, clientConfig *piondtls.C
 		InsecureSkipVerify:   true,
 	}
 
-	return
+	return serverConfig, clientConfig, clientSerial, err
 }
 
 func TestServerSetContextValueWithPKI(t *testing.T) {

examples/simple/client/main.go

@@ -10,7 +10,7 @@ import (
 )
 
 func main() {
-	co, err := udp.Dial("localhost:5688")
+	co, err := udp.Dial("localhost:5685")
 	if err != nil {
 		log.Fatalf("Error dialing: %v", err)
 	}

examples/simple/server/main.go

@@ -43,5 +43,5 @@ func main() {
 	r.Handle("/a", mux.HandlerFunc(handleA))
 	r.Handle("/b", mux.HandlerFunc(handleB))
 
-	log.Fatal(coap.ListenAndServe("udp", ":5688", r))
+	log.Fatal(coap.ListenAndServe("udp", ":5685", r))
 }

mux/router.go

@@ -123,7 +123,7 @@ func (r *Router) Match(path string, routeParams *RouteParams) (matchedRoute *Rou
 	r.m.RUnlock()
 
 	if matchedRoute == nil {
-		return
+		return matchedRoute, matchedPattern
 	}
 
 	routeParams.Path = path
@@ -133,7 +133,7 @@ func (r *Router) Match(path string, routeParams *RouteParams) (matchedRoute *Rou
 	routeParams.PathTemplate = matchedPattern
 	matchedRoute.regexMatcher.extractRouteParams(path, routeParams)
 
-	return
+	return matchedRoute, matchedPattern
 }
 
 // Handle adds a handler to the Router for pattern.