coap: update keepalive

Author: jkralik

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/panjf2000/ants/v2 v2.4.3
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pion/dtls/v2 v2.0.1-0.20200503085337-8e86b3a7d585
-	github.com/plgd-dev/go-coap/v2 v2.1.4-0.20201201213140-b8c428d8fccf
+	github.com/plgd-dev/go-coap/v2 v2.3.1-0.20210203214927-8dcfd2da7e6f
 	github.com/stretchr/testify v1.5.1
 	github.com/ugorji/go/codec v1.1.7
 	github.com/valyala/fasthttp v1.12.0

go.sum

@@ -100,6 +100,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/plgd-dev/go-coap/v2 v2.0.4-0.20200819112225-8eb712b901bc/go.mod h1:+tCi9Q78H/orWRtpVWyBgrr4vKFo2zYtbbxUllerBp4=
 github.com/plgd-dev/go-coap/v2 v2.1.4-0.20201201213140-b8c428d8fccf h1:am6M4meMUVVNItVjtrCZSOVUwHNz95MkkmUn8TjS4Js=
 github.com/plgd-dev/go-coap/v2 v2.1.4-0.20201201213140-b8c428d8fccf/go.mod h1:DccQmYY6swDlNlOCQOAX+SXTI9laSfGytskmeeNWmms=
+github.com/plgd-dev/go-coap/v2 v2.3.1-0.20210203214927-8dcfd2da7e6f h1:cCOPIuKfBHRM0BYtYjXws+98uWH4Zo16SHY05+E4deA=
+github.com/plgd-dev/go-coap/v2 v2.3.1-0.20210203214927-8dcfd2da7e6f/go.mod h1:0lg7sgOTxlHtfyGhPiak214vQ7CuBRD99LbdBCpDRW8=
 github.com/plgd-dev/kit v0.0.0-20200819113605-d5fcf3e94f63/go.mod h1:Yl9zisyXfPdtP9hTWlJqjJYXmgU/jtSDKttz9/CeD90=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

net/coap/client.go

@@ -17,7 +17,7 @@ import (
 	uuid "github.com/gofrs/uuid"
 	piondtls "github.com/pion/dtls/v2"
 	"github.com/plgd-dev/go-coap/v2/dtls"
-	"github.com/plgd-dev/go-coap/v2/net/keepalive"
+	"github.com/plgd-dev/go-coap/v2/net/monitor/inactivity"
 	"github.com/plgd-dev/go-coap/v2/tcp"
 	"github.com/plgd-dev/go-coap/v2/udp"
 
@@ -429,7 +429,7 @@ func newClientCloseHandler(conn ClientConn, onClose *OnCloseHandler) *ClientClos
 type dialOptions struct {
 	DisableTCPSignalMessageCSM      bool
 	DisablePeerTCPSignalMessageCSMs bool
-	KeepAlive                       *keepalive.KeepAlive
+	KeepaliveTimeout                time.Duration
 	errors                          func(err error)
 	maxMessageSize                  int
 	dialer                          *net.Dialer
@@ -458,7 +458,7 @@ func WithDialDisablePeerTCPSignalMessageCSMs() DialOptionFunc {
 // while attempting to make 3 pings during that period.
 func WithKeepAlive(connectionTimeout time.Duration) DialOptionFunc {
 	return func(c dialOptions) dialOptions {
-		c.KeepAlive = keepalive.New(keepalive.WithConfig(keepalive.MakeConfig(connectionTimeout)))
+		c.KeepaliveTimeout = connectionTimeout
 		return c
 	}
 }
@@ -491,8 +491,11 @@ func DialUDP(ctx context.Context, addr string, opts ...DialOptionFunc) (*ClientC
 		cfg = o(cfg)
 	}
 	dopts := make([]udp.DialOption, 0, 4)
-	if cfg.KeepAlive != nil {
-		dopts = append(dopts, udp.WithKeepAlive(cfg.KeepAlive))
+	if cfg.KeepaliveTimeout != 0 {
+		dopts = append(dopts, udp.WithKeepAlive(3, cfg.KeepaliveTimeout/3, func(cc inactivity.ClientConn) {
+			cc.Close()
+			cfg.errors(fmt.Errorf("keep alive was reached fail limit:: closing connection"))
+		}))
 	}
 	if cfg.errors != nil {
 		dopts = append(dopts, udp.WithErrors(cfg.errors))
@@ -527,8 +530,11 @@ func DialTCP(ctx context.Context, addr string, opts ...DialOptionFunc) (*ClientC
 		cfg = o(cfg)
 	}
 	dopts := make([]tcp.DialOption, 0, 4)
-	if cfg.KeepAlive != nil {
-		dopts = append(dopts, tcp.WithKeepAlive(cfg.KeepAlive))
+	if cfg.KeepaliveTimeout != 0 {
+		dopts = append(dopts, tcp.WithKeepAlive(3, cfg.KeepaliveTimeout/3, func(cc inactivity.ClientConn) {
+			cc.Close()
+			cfg.errors(fmt.Errorf("keep alive was reached fail limit:: closing connection"))
+		}))
 	}
 	if cfg.DisablePeerTCPSignalMessageCSMs {
 		dopts = append(dopts, tcp.WithDisablePeerTCPSignalMessageCSMs())
@@ -606,8 +612,11 @@ func DialTCPSecure(ctx context.Context, addr string, tlsCfg *tls.Config, opts ..
 	}
 	dopts := make([]tcp.DialOption, 0, 4)
 	dopts = append(dopts, tcp.WithTLS(tlsCfg))
-	if cfg.KeepAlive != nil {
-		dopts = append(dopts, tcp.WithKeepAlive(cfg.KeepAlive))
+	if cfg.KeepaliveTimeout != 0 {
+		dopts = append(dopts, tcp.WithKeepAlive(3, cfg.KeepaliveTimeout/3, func(cc inactivity.ClientConn) {
+			cc.Close()
+			cfg.errors(fmt.Errorf("keep alive was reached fail limit:: closing connection"))
+		}))
 	}
 	if cfg.DisablePeerTCPSignalMessageCSMs {
 		dopts = append(dopts, tcp.WithDisablePeerTCPSignalMessageCSMs())
@@ -655,8 +664,11 @@ func DialUDPSecure(ctx context.Context, addr string, dtlsCfg *piondtls.Config, o
 		cfg = o(cfg)
 	}
 	dopts := make([]dtls.DialOption, 0, 4)
-	if cfg.KeepAlive != nil {
-		dopts = append(dopts, dtls.WithKeepAlive(cfg.KeepAlive))
+	if cfg.KeepaliveTimeout != 0 {
+		dopts = append(dopts, dtls.WithKeepAlive(3, cfg.KeepaliveTimeout/3, func(cc inactivity.ClientConn) {
+			cc.Close()
+			cfg.errors(fmt.Errorf("keep alive was reached fail limit:: closing connection"))
+		}))
 	}
 	if cfg.errors != nil {
 		dopts = append(dopts, dtls.WithErrors(cfg.errors))