fixup! Upgrade to github.com/pion/dtls/v3

dtls/client.go

@@ -98,7 +98,7 @@ func Client(conn *dtls.Conn, opts ...udp.Option) *udpClient.Conn {
 	}
 
 	monitor := cfg.CreateInactivityMonitor()
-	l := coapNet.NewDTLSConn(conn)
+	l := coapNet.NewConn(conn)
 	session := server.NewSession(cfg.Ctx,
 		l,
 		cfg.MaxMessageSize,

dtls/server/config.go

@@ -65,4 +65,5 @@ type Config struct {
 	TransmissionAcknowledgeTimeout time.Duration
 	TransmissionMaxRetransmit      uint32
 	MTU                            uint16
+	ForceHandshakeOnConnect        bool
 }

dtls/server/server.go

@@ -166,7 +166,14 @@ func (s *Server) Serve(l Listener) error {
 		wg.Add(1)
 		inactivityMonitor := s.cfg.CreateInactivityMonitor()
 		requestMonitor := s.cfg.RequestMonitor
-		cc := s.createConn(coapNet.NewDTLSConn(rw), inactivityMonitor, requestMonitor)
+		dtlsConn := coapNet.NewConn(rw)
+		cc := s.createConn(dtlsConn, inactivityMonitor, requestMonitor)
+		if s.cfg.ForceHandshakeOnConnect {
+			err = dtlsConn.HandshakeContext(s.ctx)
+			if err != nil {
+				return err
+			}
+		}
 		if s.cfg.OnNewConn != nil {
 			s.cfg.OnNewConn(cc)
 		}

dtls/server_test.go

@@ -151,29 +151,27 @@ func TestServerSetContextValueWithPKI(t *testing.T) {
 		require.NoError(t, errC)
 	}()
 
+	onNewConn := func(cc *client.Conn) {
+		dtlsConn, ok := cc.NetConn().(*piondtls.Conn)
+		assert.True(t, ok)
+		// set connection context certificate
+		state, ok := dtlsConn.ConnectionState()
+		assert.True(t, ok)
+		clientCert, errP := x509.ParseCertificate(state.PeerCertificates[0])
+		assert.NoError(t, errP) //nolint:testifylint
+		cc.SetContextValue("client-cert", clientCert)
+	}
 	handle := func(w *responsewriter.ResponseWriter[*client.Conn], r *pool.Message) {
 		// get certificate from connection context
-		var clientCert *x509.Certificate
-		value := r.Context().Value("client-cert")
-		if value == nil {
-			dtlsConn, ok := w.Conn().NetConn().(*piondtls.Conn)
-			assert.True(t, ok)
-			state, ok := dtlsConn.ConnectionState()
-			assert.True(t, ok)
-			var errP error
-			clientCert, errP = x509.ParseCertificate(state.PeerCertificates[0])
-			assert.NoError(t, errP) //nolint:testifylint
-			w.Conn().SetContextValue("client-cert", clientCert)
-		} else {
-			clientCert = r.Context().Value("client-cert").(*x509.Certificate)
-		}
+		clientCert := r.Context().Value("client-cert").(*x509.Certificate)
 		assert.Equal(t, clientCert.SerialNumber, clientSerial)
 		assert.NotNil(t, clientCert)
 		errH := w.SetResponse(codes.Content, message.TextPlain, bytes.NewReader([]byte("done")))
 		assert.NoError(t, errH)
 	}
 
-	sd := dtls.NewServer(options.WithHandlerFunc(handle))
+	sd := dtls.NewServer(options.WithHandlerFunc(handle), options.WithOnNewConn(onNewConn),
+		options.WithForceHandshakeOnConnect())
 	var wg sync.WaitGroup
 	defer func() {
 		sd.Stop()

net/conn.go

@@ -2,6 +2,7 @@ package net
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 	"sync"
@@ -34,10 +35,6 @@ func NewConn(c net.Conn) *Conn {
 	return &connection
 }
 
-func NewDTLSConn(c net.Conn) *Conn {
-	return NewConn(c)
-}
-
 // LocalAddr returns the local network address. The Addr returned is shared by all invocations of LocalAddr, so do not modify it.
 func (c *Conn) LocalAddr() net.Addr {
 	return c.connection.LocalAddr()
@@ -61,6 +58,13 @@ func (c *Conn) Close() error {
 	return c.connection.Close()
 }
 
+func (c *Conn) HandshakeContext(ctx context.Context) error {
+	if c.handshakeContext == nil {
+		return errors.New("handshake not supported")
+	}
+	return c.handshakeContext(ctx)
+}
+
 func (c *Conn) handshake(ctx context.Context) error {
 	if c.handshakeContext != nil {
 		err := c.handshakeContext(ctx)

options/dtlsOptions.go

@@ -0,0 +1,13 @@
+package options
+
+import dtlsServer "github.com/plgd-dev/go-coap/v3/dtls/server"
+
+type ForceHandshakeOnConnectOpt struct{}
+
+func (o ForceHandshakeOnConnectOpt) DTLSServerApply(cfg *dtlsServer.Config) {
+	cfg.ForceHandshakeOnConnect = true
+}
+
+func WithForceHandshakeOnConnect() ForceHandshakeOnConnectOpt {
+	return ForceHandshakeOnConnectOpt{}
+}

udp/client/conn.go

@@ -268,7 +268,7 @@ func NewConnWithOpts(session Session, cfg *Config, opts ...Option) *Conn {
 		messagePool:               cfg.MessagePool,
 		numOutstandingInteraction: semaphore.NewWeighted(math.MaxInt64),
 	}
-	cc.msgID.Store(uint32(cfg.GetMID() - 0xffff/2))
+	cc.msgID.Store(pkgMath.CastTo[uint32](cfg.GetMID() - 0xffff/2))
 	cc.blockWise = cfgOpts.createBlockWise(&cc)
 	limitParallelRequests := limitparallelrequests.New(cfg.LimitClientParallelRequests, cfg.LimitClientEndpointParallelRequests, cc.do, cc.doObserve)
 	cc.observationHandler = observation.NewHandler(&cc, cfg.Handler, limitParallelRequests.Do)