From 1dc2b91ac80b2728dfba1ddb47698c57d8b75d33 Mon Sep 17 00:00:00 2001 From: Alberto Zambrano Date: Mon, 15 Apr 2024 17:20:31 +0200 Subject: [PATCH 1/7] blockwise newWriteRequestResponse fix --- net/blockwise/blockwise.go | 1 + 1 file changed, 1 insertion(+) diff --git a/net/blockwise/blockwise.go b/net/blockwise/blockwise.go index a8dd4968..decab143 100644 --- a/net/blockwise/blockwise.go +++ b/net/blockwise/blockwise.go @@ -270,6 +270,7 @@ func newWriteRequestResponse[C Client](cc C, request *pool.Message) *responsewri req.SetToken(request.Token()) req.ResetOptionsTo(request.Options()) req.SetBody(request.Body()) + req.SetType(request.Type()) return responsewriter.New(req, cc, request.Options()...) } From fad4697adcc9c13dcb3e066ce613b1b81a90044a Mon Sep 17 00:00:00 2001 From: Alberto Zambrano Date: Mon, 15 Apr 2024 17:20:31 +0200 Subject: [PATCH 2/7] blockwise newWriteRequestResponse fix --- net/blockwise/blockwise.go | 1 + 1 file changed, 1 insertion(+) diff --git a/net/blockwise/blockwise.go b/net/blockwise/blockwise.go index a8dd4968..decab143 100644 --- a/net/blockwise/blockwise.go +++ b/net/blockwise/blockwise.go @@ -270,6 +270,7 @@ func newWriteRequestResponse[C Client](cc C, request *pool.Message) *responsewri req.SetToken(request.Token()) req.ResetOptionsTo(request.Options()) req.SetBody(request.Body()) + req.SetType(request.Type()) return responsewriter.New(req, cc, request.Options()...) } From dd0660cee1863ebdad52821c2999cbffa71a6458 Mon Sep 17 00:00:00 2001 From: Jozef Kralik Date: Tue, 30 Apr 2024 08:05:04 +0200 Subject: [PATCH 3/7] Update net/blockwise/blockwise.go --- net/blockwise/blockwise.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/blockwise/blockwise.go b/net/blockwise/blockwise.go index decab143..7f7a9293 100644 --- a/net/blockwise/blockwise.go +++ b/net/blockwise/blockwise.go @@ -270,7 +270,9 @@ func newWriteRequestResponse[C Client](cc C, request *pool.Message) *responsewri req.SetToken(request.Token()) req.ResetOptionsTo(request.Options()) req.SetBody(request.Body()) - req.SetType(request.Type()) + if (request.Type() == message.Confirmable || request.Type() == message.NonConfirmable) { + req.SetType(request.Type()) + } return responsewriter.New(req, cc, request.Options()...) } From 921ef0781b6680bd38f21de03db32235e9342285 Mon Sep 17 00:00:00 2001 From: Jozef Kralik Date: Thu, 2 May 2024 08:53:04 +0200 Subject: [PATCH 4/7] Update net/blockwise/blockwise.go --- net/blockwise/blockwise.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/blockwise/blockwise.go b/net/blockwise/blockwise.go index 7f7a9293..3f903940 100644 --- a/net/blockwise/blockwise.go +++ b/net/blockwise/blockwise.go @@ -270,7 +270,7 @@ func newWriteRequestResponse[C Client](cc C, request *pool.Message) *responsewri req.SetToken(request.Token()) req.ResetOptionsTo(request.Options()) req.SetBody(request.Body()) - if (request.Type() == message.Confirmable || request.Type() == message.NonConfirmable) { + if request.Type() == message.Confirmable || request.Type() == message.NonConfirmable { req.SetType(request.Type()) } return responsewriter.New(req, cc, request.Options()...) From f39d5817a2493627bef6bdab7bca8e834c856956 Mon Sep 17 00:00:00 2001 From: Jozef Kralik Date: Thu, 2 May 2024 08:58:52 +0200 Subject: [PATCH 5/7] Update net/blockwise/blockwise.go --- net/blockwise/blockwise.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/blockwise/blockwise.go b/net/blockwise/blockwise.go index 3f903940..3c795e33 100644 --- a/net/blockwise/blockwise.go +++ b/net/blockwise/blockwise.go @@ -270,9 +270,9 @@ func newWriteRequestResponse[C Client](cc C, request *pool.Message) *responsewri req.SetToken(request.Token()) req.ResetOptionsTo(request.Options()) req.SetBody(request.Body()) - if request.Type() == message.Confirmable || request.Type() == message.NonConfirmable { - req.SetType(request.Type()) - } + if request.Type() == message.Confirmable || request.Type() == message.NonConfirmable { + req.SetType(request.Type()) + } return responsewriter.New(req, cc, request.Options()...) } From 803896354427bd87ddcc5cc21972a98166cd81d3 Mon Sep 17 00:00:00 2001 From: Alberto Zambrano Date: Thu, 29 Aug 2024 14:03:20 +0200 Subject: [PATCH 6/7] Fix blockwise +observe combination --- net/blockwise/blockwise.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/blockwise/blockwise.go b/net/blockwise/blockwise.go index e199d6cc..c93d3b61 100644 --- a/net/blockwise/blockwise.go +++ b/net/blockwise/blockwise.go @@ -540,11 +540,6 @@ func (b *BlockWise[C]) startSendingMessage(w *responsewriter.ResponseWriter[C], return fmt.Errorf("handleSendingMessage: cannot create sending message: %w", err) } originalSendingMessage := w.Swap(sendingMessage) - if isObserveResponse(w.Message()) { - b.cc.ReleaseMessage(originalSendingMessage) - // https://tools.ietf.org/html/rfc7959#section-2.6 - we don't need store it because client will be get values via GET. - return nil - } expire, ok := sendingMessage.Context().Deadline() if !ok { expire = time.Now().Add(b.expiration) From a48ccf4c0ff5ab9513eda69c42ce6a09e288da53 Mon Sep 17 00:00:00 2001 From: Alberto Zambrano Date: Thu, 29 Aug 2024 14:43:22 +0200 Subject: [PATCH 7/7] .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8d21c950..65d64ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ v3/ # Output of the go coverage tool, specifically when used with LiteIDE *.out +.scannerwork/