Skip to content

Commit

Permalink
Merge pull request eclipse-wakaama#323 from eclipse/fix_314
Browse files Browse the repository at this point in the history 
Fix for issue eclipse-wakaama#314: harmonize usage of CoAP error codes.
  • Loading branch information
@dnav
dnav committed Jul 13, 2017
2 parents 8a90b89 + 7ac27b6 commit 5ae0e7f
Show file tree
Hide file tree
Showing 10 changed files with 119 additions and 119 deletions.
18 changes: 9 additions & 9 deletions core/block1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
// the maximum payload transferred by block1 we accumulate per server
#define MAX_BLOCK1_SIZE 4096

coap_status_t coap_block1_handler(lwm2m_block1_data_t ** pBlock1Data,
uint16_t mid,
uint8_t * buffer,
size_t length,
uint16_t blockSize,
uint32_t blockNum,
bool blockMore,
uint8_t ** outputBuffer,
size_t * outputLength)
uint8_t coap_block1_handler(lwm2m_block1_data_t ** pBlock1Data,
uint16_t mid,
uint8_t * buffer,
size_t length,
uint16_t blockSize,
uint32_t blockNum,
bool blockMore,
uint8_t ** outputBuffer,
size_t * outputLength)
{
lwm2m_block1_data_t * block1Data = *pBlock1Data;;

Expand Down
24 changes: 12 additions & 12 deletions core/bootstrap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ void bootstrap_step(lwm2m_context_t * contextP,
}
}

coap_status_t bootstrap_handleFinish(lwm2m_context_t * context,
void * fromSessionH)
uint8_t bootstrap_handleFinish(lwm2m_context_t * context,
void * fromSessionH)
{
lwm2m_server_t * bootstrapServer;

Expand Down Expand Up @@ -294,7 +294,7 @@ lwm2m_status_t bootstrap_getStatus(lwm2m_context_t * contextP)
return bs_status;
}

static coap_status_t prv_checkServerStatus(lwm2m_server_t * serverP)
static uint8_t prv_checkServerStatus(lwm2m_server_t * serverP)
{
LOG_ARG("Initial status: %s", STR_STATUS(serverP->status));

Expand Down Expand Up @@ -367,13 +367,13 @@ static void prv_tagAllServer(lwm2m_context_t * contextP,
}
}

coap_status_t bootstrap_handleCommand(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
coap_packet_t * message,
coap_packet_t * response)
uint8_t bootstrap_handleCommand(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
coap_packet_t * message,
coap_packet_t * response)
{
coap_status_t result;
uint8_t result;
lwm2m_media_type_t format;

LOG_ARG("Code: %02X", message->code);
Expand Down Expand Up @@ -510,11 +510,11 @@ coap_status_t bootstrap_handleCommand(lwm2m_context_t * contextP,
return result;
}

coap_status_t bootstrap_handleDeleteAll(lwm2m_context_t * contextP,
void * fromSessionH)
uint8_t bootstrap_handleDeleteAll(lwm2m_context_t * contextP,
void * fromSessionH)
{
lwm2m_server_t * serverP;
coap_status_t result;
uint8_t result;
lwm2m_object_t * objectP;

LOG("Entering");
Expand Down
4 changes: 2 additions & 2 deletions core/er-coap-13/er-coap-13.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@

/* Bitmap for set options */
enum { OPTION_MAP_SIZE = sizeof(uint8_t) * 8 };
#define SET_OPTION(packet, opt) ((packet)->options[opt / OPTION_MAP_SIZE] |= 1 << (opt % OPTION_MAP_SIZE))
#define IS_OPTION(packet, opt) ((packet)->options[opt / OPTION_MAP_SIZE] & (1 << (opt % OPTION_MAP_SIZE)))
#define SET_OPTION(packet, opt) {if (opt <= sizeof((packet)->options) * OPTION_MAP_SIZE) {(packet)->options[opt / OPTION_MAP_SIZE] |= 1 << (opt % OPTION_MAP_SIZE);}}
#define IS_OPTION(packet, opt) ((opt <= sizeof((packet)->options) * OPTION_MAP_SIZE)?(packet)->options[opt / OPTION_MAP_SIZE] & (1 << (opt % OPTION_MAP_SIZE)):0)

#ifndef MIN
#define MIN(a, b) ((a) < (b)? (a) : (b))
Expand Down
36 changes: 18 additions & 18 deletions core/internals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,21 +246,21 @@ int uri_getNumber(uint8_t * uriString, size_t uriLength);
int uri_toString(lwm2m_uri_t * uriP, uint8_t * buffer, size_t bufferLen, uri_depth_t * depthP);

// defined in objects.c
coap_status_t object_readData(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, int * sizeP, lwm2m_data_t ** dataP);
coap_status_t object_read(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t * formatP, uint8_t ** bufferP, size_t * lengthP);
coap_status_t object_write(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
coap_status_t object_create(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
coap_status_t object_execute(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, uint8_t * buffer, size_t length);
coap_status_t object_delete(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
coap_status_t object_discover(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, uint8_t ** bufferP, size_t * lengthP);
uint8_t object_readData(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, int * sizeP, lwm2m_data_t ** dataP);
uint8_t object_read(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t * formatP, uint8_t ** bufferP, size_t * lengthP);
uint8_t object_write(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
uint8_t object_create(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
uint8_t object_execute(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, uint8_t * buffer, size_t length);
uint8_t object_delete(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
uint8_t object_discover(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, uint8_t ** bufferP, size_t * lengthP);
uint8_t object_checkReadable(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
uint8_t object_checkNumeric(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
bool object_isInstanceNew(lwm2m_context_t * contextP, uint16_t objectId, uint16_t instanceId);
int object_getRegisterPayloadBufferLength(lwm2m_context_t * contextP);
int object_getRegisterPayload(lwm2m_context_t * contextP, uint8_t * buffer, size_t length);
int object_getServers(lwm2m_context_t * contextP, bool checkOnly);
coap_status_t object_createInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
coap_status_t object_writeInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
uint8_t object_createInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
uint8_t object_writeInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);

// defined in transaction.c
lwm2m_transaction_t * transaction_new(void * sessionH, coap_method_t method, char * altPath, lwm2m_uri_t * uriP, uint16_t mID, uint8_t token_len, uint8_t* token);
Expand All @@ -271,34 +271,34 @@ bool transaction_handleResponse(lwm2m_context_t * contextP, void * fromSessionH,
void transaction_step(lwm2m_context_t * contextP, time_t currentTime, time_t * timeoutP);

// defined in management.c
coap_status_t dm_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);
uint8_t dm_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);

// defined in observe.c
coap_status_t observe_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, int size, lwm2m_data_t * dataP, coap_packet_t * message, coap_packet_t * response);
uint8_t observe_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, int size, lwm2m_data_t * dataP, coap_packet_t * message, coap_packet_t * response);
void observe_cancel(lwm2m_context_t * contextP, uint16_t mid, void * fromSessionH);
coap_status_t observe_setParameters(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, lwm2m_attributes_t * attrP);
uint8_t observe_setParameters(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, lwm2m_attributes_t * attrP);
void observe_step(lwm2m_context_t * contextP, time_t currentTime, time_t * timeoutP);
void observe_clear(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
bool observe_handleNotify(lwm2m_context_t * contextP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
void observe_remove(lwm2m_observation_t * observationP);
lwm2m_observed_t * observe_findByUri(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);

// defined in registration.c
coap_status_t registration_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
uint8_t registration_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
void registration_deregister(lwm2m_context_t * contextP, lwm2m_server_t * serverP);
void registration_freeClient(lwm2m_client_t * clientP);
uint8_t registration_start(lwm2m_context_t * contextP);
void registration_step(lwm2m_context_t * contextP, time_t currentTime, time_t * timeoutP);
lwm2m_status_t registration_getStatus(lwm2m_context_t * contextP);

// defined in packet.c
coap_status_t message_send(lwm2m_context_t * contextP, coap_packet_t * message, void * sessionH);
uint8_t message_send(lwm2m_context_t * contextP, coap_packet_t * message, void * sessionH);

// defined in bootstrap.c
void bootstrap_step(lwm2m_context_t * contextP, uint32_t currentTime, time_t* timeoutP);
coap_status_t bootstrap_handleCommand(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);
coap_status_t bootstrap_handleDeleteAll(lwm2m_context_t * context, void * fromSessionH);
coap_status_t bootstrap_handleFinish(lwm2m_context_t * context, void * fromSessionH);
uint8_t bootstrap_handleCommand(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);
uint8_t bootstrap_handleDeleteAll(lwm2m_context_t * context, void * fromSessionH);
uint8_t bootstrap_handleFinish(lwm2m_context_t * context, void * fromSessionH);
uint8_t bootstrap_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
void bootstrap_start(lwm2m_context_t * contextP);
lwm2m_status_t bootstrap_getStatus(lwm2m_context_t * contextP);
Expand All @@ -317,7 +317,7 @@ int json_serialize(lwm2m_uri_t * uriP, int size, lwm2m_data_t * tlvP, uint8_t **
int discover_serialize(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, int size, lwm2m_data_t * dataP, uint8_t ** bufferP);

// defined in block1.c
coap_status_t coap_block1_handler(lwm2m_block1_data_t ** block1Data, uint16_t mid, uint8_t * buffer, size_t length, uint16_t blockSize, uint32_t blockNum, bool blockMore, uint8_t ** outputBuffer, size_t * outputLength);
uint8_t coap_block1_handler(lwm2m_block1_data_t ** block1Data, uint16_t mid, uint8_t * buffer, size_t length, uint16_t blockSize, uint32_t blockNum, bool blockMore, uint8_t ** outputBuffer, size_t * outputLength);
void free_block1_buffer(lwm2m_block1_data_t * block1Data);

// defined in utils.c
Expand Down
12 changes: 6 additions & 6 deletions core/management.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ static int prv_readAttributes(multi_option_t * query,
return 0;
}

coap_status_t dm_handleRequest(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
coap_packet_t * message,
coap_packet_t * response)
uint8_t dm_handleRequest(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
coap_packet_t * message,
coap_packet_t * response)
{
coap_status_t result;
uint8_t result;
lwm2m_media_type_t format;

LOG_ARG("Code: %02X, server status: %s", message->code, STR_STATUS(serverP->status));
Expand Down
78 changes: 39 additions & 39 deletions core/objects.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
uint8_t object_checkReadable(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP)
{
coap_status_t result;
uint8_t result;
lwm2m_object_t * targetP;
lwm2m_data_t * dataP = NULL;
int size;
Expand Down Expand Up @@ -94,7 +94,7 @@ uint8_t object_checkReadable(lwm2m_context_t * contextP,
uint8_t object_checkNumeric(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP)
{
coap_status_t result;
uint8_t result;
lwm2m_object_t * targetP;
lwm2m_data_t * dataP = NULL;
int size;
Expand Down Expand Up @@ -130,12 +130,12 @@ uint8_t object_checkNumeric(lwm2m_context_t * contextP,
return result;
}

coap_status_t object_readData(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
int * sizeP,
lwm2m_data_t ** dataP)
uint8_t object_readData(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
int * sizeP,
lwm2m_data_t ** dataP)
{
coap_status_t result;
uint8_t result;
lwm2m_object_t * targetP;

LOG_URI(uriP);
Expand Down Expand Up @@ -199,13 +199,13 @@ coap_status_t object_readData(lwm2m_context_t * contextP,
return result;
}

coap_status_t object_read(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_media_type_t * formatP,
uint8_t ** bufferP,
size_t * lengthP)
uint8_t object_read(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_media_type_t * formatP,
uint8_t ** bufferP,
size_t * lengthP)
{
coap_status_t result;
uint8_t result;
lwm2m_data_t * dataP = NULL;
int size = 0;
int res;
Expand All @@ -232,13 +232,13 @@ coap_status_t object_read(lwm2m_context_t * contextP,
return result;
}

coap_status_t object_write(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_media_type_t format,
uint8_t * buffer,
size_t length)
uint8_t object_write(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_media_type_t format,
uint8_t * buffer,
size_t length)
{
coap_status_t result = NO_ERROR;
uint8_t result = NO_ERROR;
lwm2m_object_t * targetP;
lwm2m_data_t * dataP = NULL;
int size = 0;
Expand Down Expand Up @@ -272,10 +272,10 @@ coap_status_t object_write(lwm2m_context_t * contextP,
return result;
}

coap_status_t object_execute(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
uint8_t * buffer,
size_t length)
uint8_t object_execute(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
uint8_t * buffer,
size_t length)
{
lwm2m_object_t * targetP;

Expand All @@ -288,11 +288,11 @@ coap_status_t object_execute(lwm2m_context_t * contextP,
return targetP->executeFunc(uriP->instanceId, uriP->resourceId, buffer, length, targetP);
}

coap_status_t object_create(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_media_type_t format,
uint8_t * buffer,
size_t length)
uint8_t object_create(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_media_type_t format,
uint8_t * buffer,
size_t length)
{
lwm2m_object_t * targetP;
lwm2m_data_t * dataP = NULL;
Expand Down Expand Up @@ -354,11 +354,11 @@ coap_status_t object_create(lwm2m_context_t * contextP,
return result;
}

coap_status_t object_delete(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP)
uint8_t object_delete(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP)
{
lwm2m_object_t * objectP;
coap_status_t result;
uint8_t result;

LOG_URI(uriP);
objectP = (lwm2m_object_t *)LWM2M_LIST_FIND(contextP->objectList, uriP->objectId);
Expand Down Expand Up @@ -401,13 +401,13 @@ coap_status_t object_delete(lwm2m_context_t * contextP,
return result;
}

coap_status_t object_discover(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
uint8_t ** bufferP,
size_t * lengthP)
uint8_t object_discover(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
uint8_t ** bufferP,
size_t * lengthP)
{
coap_status_t result;
uint8_t result;
lwm2m_object_t * targetP;
lwm2m_data_t * dataP = NULL;
int size = 0;
Expand Down Expand Up @@ -887,7 +887,7 @@ int object_getServers(lwm2m_context_t * contextP, bool checkOnly)
return 0;
}

coap_status_t object_createInstance(lwm2m_context_t * contextP,
uint8_t object_createInstance(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_data_t * dataP)
{
Expand All @@ -905,7 +905,7 @@ coap_status_t object_createInstance(lwm2m_context_t * contextP,
return targetP->createFunc(lwm2m_list_newId(targetP->instanceList), dataP->value.asChildren.count, dataP->value.asChildren.array, targetP);
}

coap_status_t object_writeInstance(lwm2m_context_t * contextP,
uint8_t object_writeInstance(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_data_t * dataP)
{
Expand Down
22 changes: 11 additions & 11 deletions core/observe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@ static lwm2m_watcher_t * prv_getWatcher(lwm2m_context_t * contextP,
return watcherP;
}

coap_status_t observe_handleRequest(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
int size,
lwm2m_data_t * dataP,
coap_packet_t * message,
coap_packet_t * response)
uint8_t observe_handleRequest(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
int size,
lwm2m_data_t * dataP,
coap_packet_t * message,
coap_packet_t * response)
{
lwm2m_watcher_t * watcherP;
uint32_t count;
Expand Down Expand Up @@ -308,10 +308,10 @@ void observe_clear(lwm2m_context_t * contextP,
}
}

coap_status_t observe_setParameters(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
lwm2m_attributes_t * attrP)
uint8_t observe_setParameters(lwm2m_context_t * contextP,
lwm2m_uri_t * uriP,
lwm2m_server_t * serverP,
lwm2m_attributes_t * attrP)
{
uint8_t result;
lwm2m_watcher_t * watcherP;
Expand Down
Loading

0 comments on commit 5ae0e7f

Please sign in to comment.