net: lwm2m: RD Client update registration timeout

Renamed LWM2M_RD_CLIENT_EVENT_REG_UPDATE_FAILURE to
LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT.

Changed reported event type for registration timeout to
LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT from
LWM2M_RD_CLIENT_EVENT_REGISTRATION_FAILURE.
LWM2M_RD_CLIENT_EVENT_REGISTRATION_FAILURE should be only
reported case when server reject by response registration.

Signed-off-by: Juha Heiskanen <[email protected]>

Author: Juha Heiskanen

doc/connectivity/networking/api/lwm2m.rst

@@ -302,8 +302,8 @@ events, setup a callback function:
 			LOG_DBG("Registration complete");
 			break;
 
-		case LWM2M_RD_CLIENT_EVENT_REG_UPDATE_FAILURE:
-			LOG_DBG("Registration update failure!");
+		case LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT:
+			LOG_DBG("Registration timeout!");
 			break;
 
 		case LWM2M_RD_CLIENT_EVENT_REG_UPDATE_COMPLETE:
@@ -472,7 +472,7 @@ The events are prefixed with ``LWM2M_RD_CLIENT_EVENT_``.
    * - 4
      - REGISTRATION_FAILURE
      - Registration to LwM2M server failed.
-       Occurs if there is a timeout or failure in the registration.
+       Occurs if there is a failure in the registration.
      - Retry registration
    * - 5
      - REGISTRATION_COMPLETE
@@ -481,10 +481,10 @@ The events are prefixed with ``LWM2M_RD_CLIENT_EVENT_``.
        or when session resumption is used.
      - No actions needed
    * - 6
-     - REG_UPDATE_FAILURE
-     - Registration update failed.
-       Occurs if there is a timeout during registration update.
-       NOTE: If registration update fails without a timeout,
+     - REG_TIMEOUT
+     - Registration or registration update timeout.
+       Occurs if there is a timeout during registration.
+       NOTE: If registration fails without a timeout,
        a full registration is triggered automatically and
        no registration update failure event is generated.
      - No actions needed, client proceeds to re-registration automatically.

include/zephyr/net/lwm2m.h

@@ -1252,7 +1252,7 @@ enum lwm2m_rd_client_event {
 	LWM2M_RD_CLIENT_EVENT_BOOTSTRAP_TRANSFER_COMPLETE,
 	LWM2M_RD_CLIENT_EVENT_REGISTRATION_FAILURE,
 	LWM2M_RD_CLIENT_EVENT_REGISTRATION_COMPLETE,
-	LWM2M_RD_CLIENT_EVENT_REG_UPDATE_FAILURE,
+	LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT,
 	LWM2M_RD_CLIENT_EVENT_REG_UPDATE_COMPLETE,
 	LWM2M_RD_CLIENT_EVENT_DEREGISTER_FAILURE,
 	LWM2M_RD_CLIENT_EVENT_DISCONNECT,
@@ -1261,6 +1261,12 @@ enum lwm2m_rd_client_event {
 	LWM2M_RD_CLIENT_EVENT_NETWORK_ERROR,
 };
 
+/**
+ *	Define for old event name keeping backward compatibility.
+ */
+#define LWM2M_RD_CLIENT_EVENT_REG_UPDATE_FAILURE                                                   \
+	LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT __DEPRECATED_MACRO
+
 /*
  * LwM2M RD client flags, used to configure LwM2M session.
  */

samples/net/lwm2m_client/src/lwm2m-client.c

@@ -446,8 +446,8 @@ static void rd_client_event(struct lwm2m_ctx *client,
 		LOG_DBG("Registration complete");
 		break;
 
-	case LWM2M_RD_CLIENT_EVENT_REG_UPDATE_FAILURE:
-		LOG_DBG("Registration update failure!");
+	case LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT:
+		LOG_DBG("Registration timeout!");
 		break;
 
 	case LWM2M_RD_CLIENT_EVENT_REG_UPDATE_COMPLETE:

subsys/net/lib/lwm2m/lwm2m_rd_client.c

@@ -259,9 +259,9 @@ static void sm_handle_timeout_state(struct lwm2m_message *msg,
 #endif
 	{
 		if (client.engine_state == ENGINE_REGISTRATION_SENT) {
-			event = LWM2M_RD_CLIENT_EVENT_REGISTRATION_FAILURE;
+			event = LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT;
 		} else if (client.engine_state == ENGINE_UPDATE_SENT) {
-			event = LWM2M_RD_CLIENT_EVENT_REG_UPDATE_FAILURE;
+			event = LWM2M_RD_CLIENT_EVENT_REG_TIMEOUT;
 		} else if (client.engine_state == ENGINE_DEREGISTER_SENT) {
 			event = LWM2M_RD_CLIENT_EVENT_DEREGISTER_FAILURE;
 		} else {