URI updates

[sbertin-telular]

Expand lwm2m_uri_t to have resourceInstanceId. This will be needed for many of the commands in the LWM2M 1.1 Device Managenent and Service Enablement Interface and Information Reporting Interface.

Also makes uri_toString and lwm2m_stringToUri proper inverses.

[dnav]

You beat me to this one. I was writing something on my side.

There is one improvment in lwm2m_uri_t to do: Now in LwM2M (1.0 and 1.1), 65535 is a reserved value for every IDs. Thus lwm2m_uri_t::flags is now longer required. When an ID is not set, just put the value 0xFFFF. This translates as:

#define LWM2M_MAX_ID   ((uint16_t)0xFFFF)

#define LWM2M_URI_IS_SET_INSTANCE(uri) ((uri)->instanceId != LWM2M_MAX_ID)
#define LWM2M_URI_IS_SET_RESOURCE(uri) ((uri)->resourceId != LWM2M_MAX_ID)
#define LWM2M_URI_IS_SET_RESOURCE_INSTANCE(uri) ((uri)->resInstanceId != LWM2M_MAX_ID)

typedef struct
{
    uint16_t objectId;
    uint16_t instanceId;
    uint16_t resourceId;
#ifndef LWM2M_VERSION_1_0 
    uint16_t resInstanceId;
#endif
} lwm2m_uri_t;

#define LWM2M_URI_RESET(uri) memset((uri), 0xFF, sizeof(lwm2m_uri_t))

Your thoughts ?

[sbertin-telular]

I wasn't planning to do it yet, but I ended up wanting it in place while I worked on the SenML JSON support.

I like your suggestion and will work on the changes for it.

These existing flags

#define LWM2M_URI_FLAG_DM           (uint8_t)0x00
#define LWM2M_URI_FLAG_DELETE_ALL   (uint8_t)0x10
#define LWM2M_URI_FLAG_REGISTRATION (uint8_t)0x20
#define LWM2M_URI_FLAG_BOOTSTRAP    (uint8_t)0x40

will need to be handled differently, but I never really thought they belonged in the URI flags anyway.

[dnav]

Right.

I was planning to change

lwm2m_uri_t * uri_decode(char * altPath, multi_option_t *uriPath);

to

typedef enum
{
    LWM2M_URI_TYPE_UNKNOWN,
    LWM2M_URI_TYPE_DM,
    LWM2M_URI_TYPE_REGISTRATION,
    LWM2M_URI_TYPE_BOOTSTRAP
} lwm2m_uri_type_t;

lwm2m_uri_type_t uri_decode(char * altPath, multi_option_t *uriPath, lwm2m_uri_t *uriP);

[sbertin-telular]

I do have SenML JSON support ready to go once this is merged. It depends on having the resource instance ID in lwm2m_uri_t.