Skip to content
This repository was archived by the owner on Apr 24, 2019. It is now read-only.

Commit 0e3a26f

Browse files
yogpan01yogpan01
committed
Merge pull request #18 from ARMmbed/revert-16-rst_handling
Revert "Reset message handling"
2 parents 8f6daf3 + 195d358 commit 0e3a26f

File tree

9 files changed

+31
-145
lines changed

9 files changed

+31
-145
lines changed

‎nsdl-c/sn_nsdl_lib.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -341,20 +341,15 @@ extern void sn_nsdl_nsp_lost(struct nsdl_s *handle);
341341
* \param *observe_ptr Pointer to observe number to be sent
342342
* \param observe_len Observe number len
343343
* \param message_type Observation message type (confirmable or non-confirmable)
344-
* \param content_type Observation message payload contetnt type
345-
* \param uri_path_ptr Pointer to uri path to bee sent
346-
* \param uri_path_len Uri path len
344+
* \param contetnt_type Observation message payload contetnt type
347345
*
348346
* \return !0 Success, observation messages message ID
349347
* \return 0 Failure
350348
*/
351349
extern uint16_t sn_nsdl_send_observation_notification(struct nsdl_s *handle, uint8_t *token_ptr, uint8_t token_len,
352350
uint8_t *payload_ptr, uint16_t payload_len,
353351
uint8_t *observe_ptr, uint8_t observe_len,
354-
sn_coap_msg_type_e message_type,
355-
uint8_t content_type,
356-
uint8_t *uri_path_ptr,
357-
uint16_t uri_path_len);
352+
sn_coap_msg_type_e message_type, uint8_t content_type);
358353

359354
/**
360355
* \fn extern uint32_t sn_nsdl_get_version(void)

‎source/libCoap/src/include/sn_coap_header_internal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ typedef struct sn_nsdl_transmit_ {
6464

6565
uint16_t packet_len;
6666
uint8_t *packet_ptr;
67-
uint8_t *uri_path_ptr;
68-
uint8_t uri_path_len;
6967
} sn_nsdl_transmit_s;
7068

7169
/* * * * * * * * * * * * * * * * * * * * * * */

‎source/libCoap/src/sn_coap_builder.c

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,16 @@ uint16_t sn_coap_builder_calc_needed_packet_data_size(sn_coap_hdr_s *src_coap_ms
170170
}
171171

172172
/* URI PATH - Repeatable option. Length of one option is 0-255 */
173-
/* Do not add uri-path for notification message.
174-
* Uri-path is needed for cancelling observation with RESET message */
175-
if (!src_coap_msg_ptr->options_list_ptr ||
176-
(src_coap_msg_ptr->options_list_ptr && !src_coap_msg_ptr->options_list_ptr->observe_len && !src_coap_msg_ptr->options_list_ptr->observe_ptr)) {
177-
if (src_coap_msg_ptr->uri_path_ptr != NULL) {
178-
repeatable_option_size = sn_coap_builder_options_calc_option_size(src_coap_msg_ptr->uri_path_len,
179-
src_coap_msg_ptr->uri_path_ptr, COAP_OPTION_URI_PATH);
180-
if (repeatable_option_size) {
181-
returned_byte_count += repeatable_option_size;
182-
} else {
183-
return 0;
184-
}
173+
if (src_coap_msg_ptr->uri_path_ptr != NULL) {
174+
repeatable_option_size = sn_coap_builder_options_calc_option_size(src_coap_msg_ptr->uri_path_len,
175+
src_coap_msg_ptr->uri_path_ptr, COAP_OPTION_URI_PATH);
176+
if (repeatable_option_size) {
177+
returned_byte_count += repeatable_option_size;
178+
} else {
179+
return 0;
185180
}
186181
}
182+
187183
/* CONTENT TYPE - Length of this option is 0-2 bytes */
188184
if (src_coap_msg_ptr->content_type_ptr != NULL) {
189185
returned_byte_count++;
@@ -614,11 +610,7 @@ static int8_t sn_coap_builder_options_build(uint8_t **dst_packet_data_pptr, sn_c
614610
&src_coap_msg_ptr->options_list_ptr->location_path_len, COAP_OPTION_LOCATION_PATH);
615611
}
616612
/* * * * Build Uri-Path option * * * */
617-
/* Do not add uri-path for notification message.
618-
* Uri-path is needed for cancelling observation with RESET message */
619-
if (!src_coap_msg_ptr->options_list_ptr ||
620-
(src_coap_msg_ptr->options_list_ptr && !src_coap_msg_ptr->options_list_ptr->observe_len && !src_coap_msg_ptr->options_list_ptr->observe_ptr))
621-
sn_coap_builder_options_build_add_multiple_option(dst_packet_data_pptr, &src_coap_msg_ptr->uri_path_ptr,
613+
sn_coap_builder_options_build_add_multiple_option(dst_packet_data_pptr, &src_coap_msg_ptr->uri_path_ptr,
622614
&src_coap_msg_ptr->uri_path_len, COAP_OPTION_URI_PATH);
623615

624616
/* * * * Build Content-Type option * * * */

‎source/libCoap/src/sn_coap_protocol.c

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static int8_t sn_coap_convert_block_size(uint16_t block_size);
6565
static sn_coap_hdr_s *sn_coap_protocol_copy_header(struct coap_s *handle, sn_coap_hdr_s *source_header_ptr);
6666
#endif
6767
#if ENABLE_RESENDINGS
68-
static void sn_coap_protocol_linked_list_send_msg_store(struct coap_s *handle, sn_nsdl_addr_s *dst_addr_ptr, uint16_t send_packet_data_len, uint8_t *send_packet_data_ptr, uint32_t sending_time, void *param, uint8_t *uri_path_ptr, uint8_t uri_path_len);
68+
static void sn_coap_protocol_linked_list_send_msg_store(struct coap_s *handle, sn_nsdl_addr_s *dst_addr_ptr, uint16_t send_packet_data_len, uint8_t *send_packet_data_ptr, uint32_t sending_time, void *param);
6969
static sn_nsdl_transmit_s *sn_coap_protocol_linked_list_send_msg_search(struct coap_s *handle,sn_nsdl_addr_s *src_addr_ptr, uint16_t msg_id);
7070
static void sn_coap_protocol_linked_list_send_msg_remove(struct coap_s *handle, sn_nsdl_addr_s *src_addr_ptr, uint16_t msg_id);
7171
static coap_send_msg_s *sn_coap_protocol_allocate_mem_for_msg(struct coap_s *handle, sn_nsdl_addr_s *dst_addr_ptr, uint16_t packet_data_len);
@@ -311,10 +311,6 @@ void sn_coap_protocol_clear_retransmission_buffer(struct coap_s *handle)
311311
handle->sn_coap_protocol_free(tmp->send_msg_ptr->packet_ptr);
312312
tmp->send_msg_ptr->packet_ptr = 0;
313313
}
314-
if (tmp->send_msg_ptr->uri_path_ptr) {
315-
handle->sn_coap_protocol_free(tmp->send_msg_ptr->uri_path_ptr);
316-
tmp->send_msg_ptr->uri_path_ptr = 0;
317-
}
318314
handle->sn_coap_protocol_free(tmp->send_msg_ptr);
319315
tmp->send_msg_ptr = 0;
320316
}
@@ -438,7 +434,7 @@ int16_t sn_coap_protocol_build(struct coap_s *handle, sn_nsdl_addr_s *dst_addr_p
438434
/* Store message to Linked list for resending purposes */
439435
sn_coap_protocol_linked_list_send_msg_store(handle, dst_addr_ptr, byte_count_built, dst_packet_data_ptr,
440436
handle->system_time + (uint32_t)(handle->sn_coap_resending_intervall * RESPONSE_RANDOM_FACTOR),
441-
param, src_coap_msg_ptr->uri_path_ptr, src_coap_msg_ptr->uri_path_len);
437+
param);
442438
}
443439

444440
#endif /* ENABLE_RESENDINGS */
@@ -675,18 +671,10 @@ sn_coap_hdr_s *sn_coap_protocol_parse(struct coap_s *handle, sn_nsdl_addr_s *src
675671
sn_nsdl_transmit_s *removed_msg_ptr = NULL;
676672

677673
/* Check if received message was confirmation for some active resending message */
674+
678675
removed_msg_ptr = sn_coap_protocol_linked_list_send_msg_search(handle, src_addr_ptr, returned_dst_coap_msg_ptr->msg_id);
679676

680677
if (removed_msg_ptr != NULL) {
681-
if (returned_dst_coap_msg_ptr->msg_type == COAP_MSG_TYPE_RESET) {
682-
if(removed_msg_ptr->uri_path_len) {
683-
returned_dst_coap_msg_ptr->uri_path_ptr = handle->sn_coap_protocol_malloc(removed_msg_ptr->uri_path_len);
684-
if (returned_dst_coap_msg_ptr->uri_path_ptr != NULL) {
685-
memcpy(returned_dst_coap_msg_ptr->uri_path_ptr, removed_msg_ptr->uri_path_ptr, removed_msg_ptr->uri_path_len);
686-
returned_dst_coap_msg_ptr->uri_path_len = removed_msg_ptr->uri_path_len;
687-
}
688-
}
689-
}
690678
/* Remove resending message from active message resending Linked list */
691679
sn_coap_protocol_linked_list_send_msg_remove(handle, src_addr_ptr, returned_dst_coap_msg_ptr->msg_id);
692680
}
@@ -789,7 +777,7 @@ int8_t sn_coap_protocol_exec(struct coap_s *handle, uint32_t current_time)
789777
*****************************************************************************/
790778

791779
static void sn_coap_protocol_linked_list_send_msg_store(struct coap_s *handle, sn_nsdl_addr_s *dst_addr_ptr, uint16_t send_packet_data_len,
792-
uint8_t *send_packet_data_ptr, uint32_t sending_time, void *param, uint8_t *uri_path_ptr, uint8_t uri_path_len)
780+
uint8_t *send_packet_data_ptr, uint32_t sending_time, void *param)
793781
{
794782

795783
coap_send_msg_s *stored_msg_ptr = NULL;
@@ -837,16 +825,6 @@ static void sn_coap_protocol_linked_list_send_msg_store(struct coap_s *handle, s
837825
stored_msg_ptr->coap = handle;
838826
stored_msg_ptr->param = param;
839827

840-
if (uri_path_len) {
841-
stored_msg_ptr->send_msg_ptr->uri_path_ptr = handle->sn_coap_protocol_malloc(uri_path_len);
842-
if (stored_msg_ptr->send_msg_ptr->uri_path_ptr == NULL){
843-
return;
844-
}
845-
stored_msg_ptr->send_msg_ptr->uri_path_len = uri_path_len;
846-
memcpy(stored_msg_ptr->send_msg_ptr->uri_path_ptr, uri_path_ptr, uri_path_len);
847-
}
848-
849-
850828
/* Storing Resending message to Linked list */
851829
ns_list_add_to_end(&handle->linked_list_resent_msgs, stored_msg_ptr);
852830
++handle->count_resent_msgs;
@@ -1423,11 +1401,6 @@ static void sn_coap_protocol_release_allocated_send_msg_mem(struct coap_s *handl
14231401
freed_send_msg_ptr->send_msg_ptr->packet_ptr = 0;
14241402
}
14251403

1426-
if (freed_send_msg_ptr->send_msg_ptr->uri_path_ptr != NULL) {
1427-
handle->sn_coap_protocol_free(freed_send_msg_ptr->send_msg_ptr->uri_path_ptr);
1428-
freed_send_msg_ptr->send_msg_ptr->uri_path_ptr = 0;
1429-
}
1430-
14311404
handle->sn_coap_protocol_free(freed_send_msg_ptr->send_msg_ptr);
14321405
freed_send_msg_ptr->send_msg_ptr = 0;
14331406
}
@@ -1943,7 +1916,7 @@ static sn_coap_hdr_s *sn_coap_handle_blockwise_message(struct coap_s *handle, sn
19431916
sn_coap_protocol_linked_list_send_msg_store(handle, src_addr_ptr,
19441917
dst_packed_data_needed_mem,
19451918
dst_ack_packet_data_ptr,
1946-
handle->system_time + (uint32_t)(handle->sn_coap_resending_intervall * RESPONSE_RANDOM_FACTOR), param, NULL, 0);
1919+
handle->system_time + (uint32_t)(handle->sn_coap_resending_intervall * RESPONSE_RANDOM_FACTOR), param);
19471920
#endif
19481921
handle->sn_coap_protocol_free(dst_ack_packet_data_ptr);
19491922
dst_ack_packet_data_ptr = 0;

‎source/libNsdl/src/sn_nsdl.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,7 @@ int8_t sn_nsdl_is_ep_registered(struct nsdl_s *handle)
502502
uint16_t sn_nsdl_send_observation_notification(struct nsdl_s *handle, uint8_t *token_ptr, uint8_t token_len,
503503
uint8_t *payload_ptr, uint16_t payload_len,
504504
uint8_t *observe_ptr, uint8_t observe_len,
505-
sn_coap_msg_type_e message_type, uint8_t content_type,
506-
uint8_t *uri_path_ptr, uint16_t uri_path_len)
505+
sn_coap_msg_type_e message_type, uint8_t content_type)
507506
{
508507
sn_coap_hdr_s *notification_message_ptr;
509508
uint16_t return_msg_id = 0;
@@ -541,10 +540,6 @@ uint16_t sn_nsdl_send_observation_notification(struct nsdl_s *handle, uint8_t *t
541540
notification_message_ptr->payload_len = payload_len;
542541
notification_message_ptr->payload_ptr = payload_ptr;
543542

544-
/* Fill uri path */
545-
notification_message_ptr->uri_path_len = uri_path_len;
546-
notification_message_ptr->uri_path_ptr = uri_path_ptr;
547-
548543
/* Fill observe */
549544
notification_message_ptr->options_list_ptr->observe_len = observe_len;
550545
notification_message_ptr->options_list_ptr->observe_ptr = observe_ptr;
@@ -563,7 +558,7 @@ uint16_t sn_nsdl_send_observation_notification(struct nsdl_s *handle, uint8_t *t
563558
}
564559

565560
/* Free memory */
566-
notification_message_ptr->uri_path_ptr = NULL;
561+
567562
notification_message_ptr->payload_ptr = NULL;
568563
notification_message_ptr->options_list_ptr->observe_ptr = NULL;
569564
notification_message_ptr->token_ptr = NULL;

‎test/nsdl-c/unittest/sn_coap_builder/libCoap_builder_test.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,8 @@ TEST(libCoap_builder, sn_coap_builder_calc_needed_packet_data_size)
356356
header.options_list_ptr->uri_query_len = 0;
357357
CHECK(sn_coap_builder_calc_needed_packet_data_size(&header) == 0);
358358

359+
free(header.options_list_ptr->observe_ptr);
360+
header.options_list_ptr->observe_ptr = NULL;
359361
header.options_list_ptr->observe = 1;
360362

361363
header.options_list_ptr->uri_query_len = 4;
@@ -368,17 +370,9 @@ TEST(libCoap_builder, sn_coap_builder_calc_needed_packet_data_size)
368370
header.options_list_ptr->block1_len = 0;
369371
CHECK(sn_coap_builder_calc_needed_packet_data_size(&header) == 0);
370372

371-
header.options_list_ptr->block1_len = 2;
372-
header.payload_len = 1;
373-
CHECK(431 == sn_coap_builder_calc_needed_packet_data_size(&header));
374-
375-
free(header.options_list_ptr->observe_ptr);
376-
header.options_list_ptr->observe_ptr = NULL;
377-
header.options_list_ptr->observe_len = 0;
378373
header.options_list_ptr->block1_len = 2;
379374
header.payload_len = 1;
380375
CHECK(722 == sn_coap_builder_calc_needed_packet_data_size(&header));
381-
382376
// <--
383377

384378
free(header.options_list_ptr->block1_ptr);

‎test/nsdl-c/unittest/sn_coap_protocol/libCoap_protocol_test.cpp

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,52 +1957,6 @@ TEST(libCoap_protocol, sn_coap_protocol_parse)
19571957
sn_coap_parser_release_allocated_coap_msg_mem(handle, ret);
19581958

19591959
sn_coap_protocol_destroy(handle);
1960-
1961-
retCounter = 1;
1962-
handle = sn_coap_protocol_init(myMalloc, myFree, null_tx_cb, NULL);
1963-
1964-
sn_coap_parser_stub.expectedHeader = (sn_coap_hdr_s *)malloc(sizeof(sn_coap_hdr_s));
1965-
memset(sn_coap_parser_stub.expectedHeader, 0, sizeof(sn_coap_hdr_s));
1966-
sn_coap_parser_stub.expectedHeader->msg_type = COAP_MSG_TYPE_RESET;
1967-
sn_coap_parser_stub.expectedHeader->msg_id = 18;
1968-
1969-
memset(&tmp_addr, 0, sizeof(sn_nsdl_addr_s));
1970-
memset(&tmp_hdr, 0, sizeof(sn_coap_hdr_s));
1971-
1972-
dst_packet_data_ptr = (uint8_t*)malloc(5);
1973-
memset(dst_packet_data_ptr, '1', 5);
1974-
dst_packet_data_ptr[2]=0;
1975-
dst_packet_data_ptr[3]=18;
1976-
1977-
tmp_addr.addr_ptr = (uint8_t*)malloc(5);
1978-
memset(tmp_addr.addr_ptr, '1', 5);
1979-
tmp_addr.port = 0;
1980-
1981-
retCounter = 21;
1982-
sn_coap_builder_stub.expectedInt16 = 5;
1983-
tmp_hdr.payload_ptr = (uint8_t*)malloc(3);
1984-
tmp_hdr.msg_id = 18;
1985-
tmp_hdr.msg_code = COAP_MSG_CODE_RESPONSE_CREATED;
1986-
tmp_hdr.payload_len = SN_COAP_BLOCKWISE_MAX_PAYLOAD_SIZE + 20;
1987-
tmp_hdr.uri_path_ptr = (uint8_t*)malloc(7);
1988-
snprintf((char *)tmp_hdr.uri_path_ptr, 7, "13/0/1");
1989-
tmp_hdr.uri_path_len = 7;
1990-
1991-
sn_coap_protocol_build(handle, &tmp_addr, dst_packet_data_ptr, &tmp_hdr, NULL);
1992-
1993-
free(tmp_hdr.uri_path_ptr);
1994-
free(tmp_hdr.options_list_ptr->block2_ptr);
1995-
free(tmp_hdr.options_list_ptr);
1996-
free(tmp_hdr.payload_ptr);
1997-
free(tmp_addr.addr_ptr);
1998-
free(dst_packet_data_ptr);
1999-
2000-
ret = sn_coap_protocol_parse(handle, addr, packet_data_len, packet_data_ptr, NULL);
2001-
CHECK( ret != NULL );
2002-
sn_coap_parser_release_allocated_coap_msg_mem(handle, ret);
2003-
2004-
sn_coap_protocol_destroy(handle);
2005-
20061960
retCounter = 1;
20071961
handle = sn_coap_protocol_init(myMalloc, myFree, null_tx_cb, NULL);
20081962

@@ -2029,9 +1983,6 @@ TEST(libCoap_protocol, sn_coap_protocol_parse)
20291983
tmp_hdr.msg_id = 18;
20301984
tmp_hdr.msg_code = COAP_MSG_CODE_RESPONSE_CREATED;
20311985
tmp_hdr.payload_len = SN_COAP_BLOCKWISE_MAX_PAYLOAD_SIZE + 20;
2032-
tmp_hdr.uri_path_ptr = (uint8_t*)malloc(7);
2033-
snprintf((char *)tmp_hdr.uri_path_ptr, 7, "13/0/1");
2034-
tmp_hdr.uri_path_len = 7;
20351986
sn_coap_protocol_build(handle, &tmp_addr, dst_packet_data_ptr, &tmp_hdr, NULL);
20361987

20371988
free(tmp_hdr.options_list_ptr->block2_ptr);
@@ -2044,11 +1995,11 @@ TEST(libCoap_protocol, sn_coap_protocol_parse)
20441995
CHECK( ret != NULL );
20451996
sn_coap_parser_release_allocated_coap_msg_mem(handle, ret);
20461997

2047-
free(tmp_hdr.uri_path_ptr);
1998+
20481999
free(packet_data_ptr);
20492000
free(addr->addr_ptr);
20502001
free(addr);
2051-
sn_coap_protocol_destroy(handle);
2002+
sn_coap_protocol_destroy(handle);
20522003
}
20532004

20542005
TEST(libCoap_protocol, sn_coap_protocol_exec)

‎test/nsdl-c/unittest/sn_nsdl/test_sn_nsdl.c

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -693,46 +693,37 @@ bool test_sn_nsdl_is_ep_registered()
693693

694694
bool test_sn_nsdl_send_observation_notification()
695695
{
696-
if( 0 != sn_nsdl_send_observation_notification(NULL, NULL, 0,NULL,0,NULL,0,0,0, NULL,0) ){
696+
if( 0 != sn_nsdl_send_observation_notification(NULL, NULL, 0,NULL,0,NULL,0,0,0) ){
697697
return false;
698698
}
699699
sn_grs_stub.retNull = false;
700700
retCounter = 4;
701701
sn_grs_stub.expectedGrs = (struct grs_s *)malloc(sizeof(struct grs_s));
702702
struct nsdl_s* handle = sn_nsdl_init(&nsdl_tx_callback, &nsdl_rx_callback, &myMalloc, &myFree);
703703

704-
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,0,NULL,0) ){
704+
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,0) ){
705705
return false;
706706
}
707707

708708
retCounter = 1;
709-
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,0,NULL,0) ){
709+
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,0) ){
710710
return false;
711711
}
712712

713713
retCounter = 2;
714-
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,1,NULL,0) ){
714+
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,1) ){
715715
return false;
716716
}
717717

718718
retCounter = 2;
719-
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,1,NULL,0) ){
719+
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,1) ){
720720
return false;
721721
}
722722

723-
u_int8_t path[] = {"13/0/1"};
724-
uint8_t* uri_path_ptr = (uint8_t*)malloc(sizeof(path));
725-
uint8_t uri_path_len = (uint8_t)sizeof(path);
726-
retCounter = 2;
727-
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,1,uri_path_ptr,uri_path_len) ){
728-
return false;
729-
}
730-
free(uri_path_ptr);
731-
732723
retCounter = 2;
733724
sn_grs_stub.int8SuccessCounter = 0;
734725
sn_grs_stub.expectedInt8 = SN_NSDL_FAILURE;
735-
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,1,NULL,0) ){
726+
if( 0 != sn_nsdl_send_observation_notification(handle, NULL, 0,NULL,0,NULL,0,0,1) ){
736727
return false;
737728
}
738729

‎test/nsdl-c/unittest/stubs/sn_nsdl_stub.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,9 @@ int8_t sn_nsdl_is_ep_registered(struct nsdl_s *handle)
7979
}
8080

8181
uint16_t sn_nsdl_send_observation_notification(struct nsdl_s *handle, uint8_t *token_ptr, uint8_t token_len,
82-
uint8_t *payload_ptr, uint16_t payload_len,
83-
uint8_t *observe_ptr, uint8_t observe_len,
84-
sn_coap_msg_type_e message_type,
85-
uint8_t content_type,
86-
uint8_t *uri_path_ptr,
87-
uint16_t uri_path_len)
82+
uint8_t *payload_ptr, uint16_t payload_len,
83+
uint8_t *observe_ptr, uint8_t observe_len,
84+
sn_coap_msg_type_e message_type, uint8_t content_type)
8885
{
8986
return sn_nsdl_stub.expectedUint16;
9087
}

0 commit comments

Comments
 (0)