Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lwm2m: upstream updates #1489

Merged
merged 4 commits into from
Feb 13, 2024
Merged

Conversation

SeppoTakalo
Copy link
Contributor

@SeppoTakalo SeppoTakalo commented Feb 12, 2024

  • 9929363 - net: lwm2m: Use CID_SUPPORTED instead of CID_ENABLED (2 weeks ago)
  • bf87287 - net: lwm2m: Fix segfault on failed bootstrap (3 weeks ago)
  • 9eee8d2 - net: lwm2m: Allow send operations when sleeping (3 weeks ago)

One critical fix (segfault) needed for the 2.6.0 release, so I'll pull in few other changes to keep in synch.
ZCBOR changes are in separate PR #1471 so I'll skip those.

@SeppoTakalo
Copy link
Contributor Author

Compliance check failing for changes that are already in Zephyr.
Who can re-configure that?

@SeppoTakalo SeppoTakalo force-pushed the lwm2m_upstream_updates branch from c0e1a52 to 4bd7eef Compare February 12, 2024 11:51
@SeppoTakalo
Copy link
Contributor Author

Dropped the commit that caused failure in compliance check. We can fix this in next upmerge.

@SeppoTakalo SeppoTakalo force-pushed the lwm2m_upstream_updates branch from 4bd7eef to 79bd6f6 Compare February 12, 2024 11:58
juhaylinen and others added 3 commits February 12, 2024 15:50
Add new kconfig CONFIG_LWM2M_QUEUE_MODE_NO_MSG_BUFFERING.

When enabled and device is sleeping, Reqistration Update
message is skipped and messages from send operation and
notifications are sent right away.

Reqistration update message is also skipped when
lwm2m_engine resumes from pause state.

Signed-off-by: Juha Ylinen <[email protected]>
(cherry picked from commit 9eee8d2)
If bootstrap fails, RD client will call lwm2m_engine_stop()
which will close the context.
The socket loop, however still contains a call to
hint_socket_state(context, NULL) which has a null pointer now.

Fix the segfault by allowing nullpointer on hint_socket_state().

Signed-off-by: Seppo Takalo <[email protected]>
(cherry picked from commit bf87287)
When ENABLED flag is used, we generate 32 byte DTLS
Connection Identifier and include that in our
DTLS Client HELO. This has no benefit as client only
has one connection toward the server, it does not need
any identification.

When SUPPORTED flag is used, we just include
zero length Connection Identifier in the handshake,
which tell server that we support Connection Identifier
and server can generate one for it.
We then use the CID in the packets that we send towards
server, but response packets don't contain any CID.
This gives all the benefit of CID as server is able to
identify us even when NAT mapping have changed.

Signed-off-by: Seppo Takalo <[email protected]>
(cherry picked from commit 9929363)
@SeppoTakalo SeppoTakalo force-pushed the lwm2m_upstream_updates branch from f87b42f to abfd948 Compare February 12, 2024 13:50
@SeppoTakalo
Copy link
Contributor Author

BLE/Ant samples break on a new CONCAT() macro, so I'll drop the LWM2M_ON_INIT(). That is not mandatory for the release.

Fix lwm2m_message initialization. Pending struct was NULL.

Signed-off-by: Juha Ylinen <[email protected]>
(cherry picked from commit c84dc7e)
@rlubos rlubos merged commit acb2e8c into nrfconnect:main Feb 13, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants