fix DTLS accept loop from exiting

dtls/client_test.go

@@ -100,7 +100,7 @@ func TestClientConn_Get(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		err := s.Serve(l)
-		t.Log(err)
+		require.NoError(t, err)
 	}()
 
 	cc, err := dtls.Dial(l.Addr().String(), dtlsCfg)
@@ -185,7 +185,7 @@ func TestClientConn_Get_SepareateMessage(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		err := s.Serve(l)
-		t.Log(err)
+		require.NoError(t, err)
 	}()
 
 	cc, err := dtls.Dial(l.Addr().String(), dtlsCfg, dtls.WithHandlerFunc(func(w *client.ResponseWriter, r *pool.Message) {
@@ -304,7 +304,7 @@ func TestClientConn_Post(t *testing.T) {
 			go func() {
 				defer wg.Done()
 				err := s.Serve(l)
-				t.Log(err)
+				require.NoError(t, err)
 			}()
 
 			cc, err := dtls.Dial(l.Addr().String(), dtlsCfg)
@@ -431,7 +431,7 @@ func TestClientConn_Put(t *testing.T) {
 			go func() {
 				defer wg.Done()
 				err := s.Serve(l)
-				t.Log(err)
+				require.NoError(t, err)
 			}()
 
 			cc, err := dtls.Dial(l.Addr().String(), dtlsCfg)
@@ -535,7 +535,7 @@ func TestClientConn_Delete(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		err := s.Serve(l)
-		t.Log(err)
+		require.NoError(t, err)
 	}()
 
 	cc, err := dtls.Dial(l.Addr().String(), dtlsCfg)
@@ -587,7 +587,8 @@ func TestClientConn_Ping(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		s.Serve(l)
+		err := s.Serve(l)
+		require.NoError(t, err)
 	}()
 
 	cc, err := dtls.Dial(l.Addr().String(), dtlsCfg)
@@ -604,3 +605,47 @@ func TestClientConn_Ping(t *testing.T) {
 	err = cc.Ping(ctx)
 	require.NoError(t, err)
 }
+
+func TestClientConn_HandeShakeFailure(t *testing.T) {
+	dtlsCfg := &piondtls.Config{
+		PSK: func(hint []byte) ([]byte, error) {
+			fmt.Printf("Hint: %s \n", hint)
+			return []byte{0xAB, 0xC1, 0x23}, nil
+		},
+		PSKIdentityHint: []byte("Pion DTLS Server"),
+		CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
+		ConnectContextMaker: func() (context.Context, func()) {
+			return context.WithTimeout(context.Background(), 1*time.Second)
+		},
+	}
+	l, err := coapNet.NewDTLSListener("udp", "", dtlsCfg)
+	require.NoError(t, err)
+	defer l.Close()
+	var wg sync.WaitGroup
+	defer wg.Wait()
+
+	s := dtls.NewServer()
+	defer s.Stop()
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		err := s.Serve(l)
+		require.NoError(t, err)
+	}()
+
+	dtlsCfgClient := &piondtls.Config{
+		PSK: func(hint []byte) ([]byte, error) {
+			fmt.Printf("Hint: %s \n", hint)
+			return []byte{0xAB, 0xC1, 0x24}, nil
+		},
+		PSKIdentityHint: []byte("Pion DTLS Client"),
+		CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
+		ConnectContextMaker: func() (context.Context, func()) {
+			return context.WithTimeout(context.Background(), 1*time.Second)
+		},
+	}
+	_, err = dtls.Dial(l.Addr().String(), dtlsCfgClient)
+	require.Error(t, err)
+	//time.Sleep(time.Second)
+}

dtls/example_test.go

@@ -1,59 +1,59 @@
-package dtls_test
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"time"
-
-	"github.com/go-ocf/go-coap/v2/dtls"
-	"github.com/go-ocf/go-coap/v2/net"
-	piondtls "github.com/pion/dtls/v2"
-)
-
-func ExampleGet() {
-	dtlsCfg := &piondtls.Config{
-		PSK: func(hint []byte) ([]byte, error) {
-			fmt.Printf("Hint: %s \n", hint)
-			return []byte{0xAB, 0xC1, 0x23}, nil
-		},
-		PSKIdentityHint: []byte("Pion DTLS Server"),
-		CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
-	}
-	conn, err := dtls.Dial("pluggedin.cloud:5684", dtlsCfg)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer conn.Close()
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	defer cancel()
-	res, err := conn.Get(ctx, "/oic/res")
-	if err != nil {
-		log.Fatal(err)
-	}
-	data, err := ioutil.ReadAll(res.Body())
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("%v", data)
-}
-
-func ExampleServe() {
-	dtlsCfg := &piondtls.Config{
-		PSK: func(hint []byte) ([]byte, error) {
-			fmt.Printf("Hint: %s \n", hint)
-			return []byte{0xAB, 0xC1, 0x23}, nil
-		},
-		PSKIdentityHint: []byte("Pion DTLS Server"),
-		CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
-	}
-	l, err := net.NewDTLSListener("udp", "0.0.0.0:5683", dtlsCfg)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer l.Close()
-	s := dtls.NewServer()
-	defer s.Stop()
-	log.Fatal(s.Serve(l))
-}
+package dtls_test
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"time"
+
+	"github.com/go-ocf/go-coap/v2/dtls"
+	"github.com/go-ocf/go-coap/v2/net"
+	piondtls "github.com/pion/dtls/v2"
+)
+
+func ExampleGet() {
+	dtlsCfg := &piondtls.Config{
+		PSK: func(hint []byte) ([]byte, error) {
+			fmt.Printf("Hint: %s \n", hint)
+			return []byte{0xAB, 0xC1, 0x23}, nil
+		},
+		PSKIdentityHint: []byte("Pion DTLS Server"),
+		CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
+	}
+	conn, err := dtls.Dial("pluggedin.cloud:5684", dtlsCfg)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer conn.Close()
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	res, err := conn.Get(ctx, "/oic/res")
+	if err != nil {
+		log.Fatal(err)
+	}
+	data, err := ioutil.ReadAll(res.Body())
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Printf("%v", data)
+}
+
+func ExampleServe() {
+	dtlsCfg := &piondtls.Config{
+		PSK: func(hint []byte) ([]byte, error) {
+			fmt.Printf("Hint: %s \n", hint)
+			return []byte{0xAB, 0xC1, 0x23}, nil
+		},
+		PSKIdentityHint: []byte("Pion DTLS Server"),
+		CipherSuites:    []piondtls.CipherSuiteID{piondtls.TLS_PSK_WITH_AES_128_CCM_8},
+	}
+	l, err := net.NewDTLSListener("udp", "0.0.0.0:5683", dtlsCfg)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer l.Close()
+	s := dtls.NewServer()
+	defer s.Stop()
+	log.Fatal(s.Serve(l))
+}

dtls/server.go

@@ -173,8 +173,14 @@ func (s *Server) Serve(l Listener) error {
 		if err != nil {
 			switch err {
 			case context.DeadlineExceeded, context.Canceled:
+				select {
+				case <-s.ctx.Done():
+				default:
+					s.errors(fmt.Errorf("cannot accept connection: %w", err))
+					continue
+				}
 				wg.Wait()
-				return fmt.Errorf("cannot accept: %w", err)
+				return nil
 			default:
 				continue
 			}

examples/mcast/client/main.go

@@ -21,7 +21,10 @@ func main() {
 	s := udp.NewServer()
 	defer s.Stop()
 	go func() {
-		s.Serve(l)
+		err := s.Serve(l)
+		if err != nil {
+			log.Println(err)
+		}
 	}()
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)

go.sum

@@ -3,6 +3,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dsnet/golib/memfile v0.0.0-20190531212259-571cdbcff553 h1:qd7Hp/zOU5vOHkyfqefAFop3O4ATL3F8vxrYmL2q8bI=
 github.com/dsnet/golib/memfile v0.0.0-20190531212259-571cdbcff553/go.mod h1:tXGNW9q3RwvWt1VV2qrRKlSSz0npnh12yftCSCy2T64=
 github.com/go-ocf/go-coap v0.0.0-20200503182930-509338af26c8 h1:ieuAqWZcqrEAowslHtq7VhF3iQVaw3wx0NrAKzOj2dc=
+github.com/go-ocf/go-coap v0.0.0-20200507195925-de47755e89b8 h1:8OFS9Z/RAvTnH72LdeRZK1TGTuQ+xcf9rajHoYXlxnk=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pion/dtls/v2 v2.0.1-0.20200503085337-8e86b3a7d585 h1:0v1k/bHrth28TctdEWnrCgLehYn3nOvFAwOwtwmyC34=

message/codes/codes.go

@@ -82,10 +82,10 @@ var strToCode = map[string]Code{
 	`"GatewayTimeout"`:                     GatewayTimeout,
 	`"ProxyingNotSupported"`:               ProxyingNotSupported,
 	`"Capabilities and Settings Messages"`: CSM,
-	`"Ping"`:    Ping,
-	`"Pong"`:    Pong,
-	`"Release"`: Release,
-	`"Abort"`:   Abort,
+	`"Ping"`:                               Ping,
+	`"Pong"`:                               Pong,
+	`"Release"`:                            Release,
+	`"Abort"`:                              Abort,
 }
 
 // UnmarshalJSON unmarshals b into the Code.

message/option.go

@@ -139,26 +139,26 @@ type OptionDef struct {
 }
 
 var CoapOptionDefs = map[OptionID]OptionDef{
-	IfMatch:       OptionDef{ValueFormat: ValueOpaque, MinLen: 0, MaxLen: 8},
-	URIHost:       OptionDef{ValueFormat: ValueString, MinLen: 1, MaxLen: 255},
-	ETag:          OptionDef{ValueFormat: ValueOpaque, MinLen: 1, MaxLen: 8},
-	IfNoneMatch:   OptionDef{ValueFormat: ValueEmpty, MinLen: 0, MaxLen: 0},
-	Observe:       OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 3},
-	URIPort:       OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 2},
-	LocationPath:  OptionDef{ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
-	URIPath:       OptionDef{ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
-	ContentFormat: OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 2},
-	MaxAge:        OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 4},
-	URIQuery:      OptionDef{ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
-	Accept:        OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 2},
-	LocationQuery: OptionDef{ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
-	Block2:        OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 3},
-	Block1:        OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 3},
-	Size2:         OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 4},
-	ProxyURI:      OptionDef{ValueFormat: ValueString, MinLen: 1, MaxLen: 1034},
-	ProxyScheme:   OptionDef{ValueFormat: ValueString, MinLen: 1, MaxLen: 255},
-	Size1:         OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 4},
-	NoResponse:    OptionDef{ValueFormat: ValueUint, MinLen: 0, MaxLen: 1},
+	IfMatch:       {ValueFormat: ValueOpaque, MinLen: 0, MaxLen: 8},
+	URIHost:       {ValueFormat: ValueString, MinLen: 1, MaxLen: 255},
+	ETag:          {ValueFormat: ValueOpaque, MinLen: 1, MaxLen: 8},
+	IfNoneMatch:   {ValueFormat: ValueEmpty, MinLen: 0, MaxLen: 0},
+	Observe:       {ValueFormat: ValueUint, MinLen: 0, MaxLen: 3},
+	URIPort:       {ValueFormat: ValueUint, MinLen: 0, MaxLen: 2},
+	LocationPath:  {ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
+	URIPath:       {ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
+	ContentFormat: {ValueFormat: ValueUint, MinLen: 0, MaxLen: 2},
+	MaxAge:        {ValueFormat: ValueUint, MinLen: 0, MaxLen: 4},
+	URIQuery:      {ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
+	Accept:        {ValueFormat: ValueUint, MinLen: 0, MaxLen: 2},
+	LocationQuery: {ValueFormat: ValueString, MinLen: 0, MaxLen: 255},
+	Block2:        {ValueFormat: ValueUint, MinLen: 0, MaxLen: 3},
+	Block1:        {ValueFormat: ValueUint, MinLen: 0, MaxLen: 3},
+	Size2:         {ValueFormat: ValueUint, MinLen: 0, MaxLen: 4},
+	ProxyURI:      {ValueFormat: ValueString, MinLen: 1, MaxLen: 1034},
+	ProxyScheme:   {ValueFormat: ValueString, MinLen: 1, MaxLen: 255},
+	Size1:         {ValueFormat: ValueUint, MinLen: 0, MaxLen: 4},
+	NoResponse:    {ValueFormat: ValueUint, MinLen: 0, MaxLen: 1},
 }
 
 // MediaType specifies the content format of a message.

message/options_test.go

@@ -189,7 +189,7 @@ func TestAddBytesOption(t *testing.T) {
 	n, err := options.GetBytess(0, v)
 	require.Equal(t, nil, err)
 	require.Equal(t, 2, n)
-	require.Equal(t, [][]byte{[]byte{0x30}, []byte{0x31}}, v)
+	require.Equal(t, [][]byte{{0x30}, {0x31}}, v)
 }
 
 func testRemoveBytesOption(t *testing.T, options Options, option OptionID, expectedLen int) Options {

net/dtlslistener.go

@@ -34,9 +34,6 @@ func (l *DTLSListener) acceptLoop() {
 		conn, err := l.listener.Accept()
 		select {
 		case l.connCh <- connData{conn: conn, err: err}:
-			if err != nil {
-				return
-			}
 		case <-l.doneCh:
 			return
 		}
@@ -98,14 +95,14 @@ func (l *DTLSListener) AcceptWithContext(ctx context.Context) (net.Conn, error)
 		}
 		err := l.SetDeadline(time.Now().Add(l.heartBeat))
 		if err != nil {
-			return nil, fmt.Errorf("cannot accept connections: %v", err)
+			return nil, fmt.Errorf("cannot set deadline to accept connection: %v", err)
 		}
 		rw, err := l.Accept()
 		if err != nil {
 			if isTemporary(err) {
 				continue
 			}
-			return nil, fmt.Errorf("cannot accept connections: %v", err)
+			return nil, fmt.Errorf("cannot accept connection: %v", err)
 		}
 		return rw, nil
 	}

net/tcplistener.go

@@ -68,14 +68,14 @@ func (l *TCPListener) AcceptWithContext(ctx context.Context) (net.Conn, error) {
 		}
 		err := l.SetDeadline(time.Now().Add(l.heartBeat))
 		if err != nil {
-			return nil, fmt.Errorf("cannot accept connections: %v", err)
+			return nil, fmt.Errorf("cannot set deadline to accept connection: %v", err)
 		}
 		rw, err := l.listener.Accept()
 		if err != nil {
 			if isTemporary(err) {
 				continue
 			}
-			return nil, fmt.Errorf("cannot accept connections: %v", err)
+			return nil, fmt.Errorf("cannot accept connection: %v", err)
 		}
 		return rw, nil
 	}

net/tlslistener.go

@@ -62,14 +62,14 @@ func (l *TLSListener) AcceptWithContext(ctx context.Context) (net.Conn, error) {
 		}
 		err := l.SetDeadline(time.Now().Add(l.heartBeat))
 		if err != nil {
-			return nil, fmt.Errorf("cannot accept connections: %v", err)
+			return nil, fmt.Errorf("cannot set deadline to accept connection: %v", err)
 		}
 		rw, err := l.listener.Accept()
 		if err != nil {
 			if isTemporary(err) {
 				continue
 			}
-			return nil, fmt.Errorf("cannot accept connections: %v", err)
+			return nil, fmt.Errorf("cannot accept connection: %v", err)
 		}
 		return rw, nil
 	}