You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/28 22:43:15 UTC
[1/5] incubator-mynewt-core git commit: oicmgr;
return internal server error if encoding cbor response fails.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 96b3f5ffa -> 37ddd3c34
oicmgr; return internal server error if encoding cbor response
fails.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/37ddd3c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/37ddd3c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/37ddd3c3
Branch: refs/heads/develop
Commit: 37ddd3c3430f216e20bcec598ab06d948c3bcb0a
Parents: 262f8b2
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Oct 28 15:40:56 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Oct 28 15:41:31 2016 -0700
----------------------------------------------------------------------
mgmt/oicmgr/src/oicmgr.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/37ddd3c3/mgmt/oicmgr/src/oicmgr.c
----------------------------------------------------------------------
diff --git a/mgmt/oicmgr/src/oicmgr.c b/mgmt/oicmgr/src/oicmgr.c
index 2cc14e1..3011ebd 100644
--- a/mgmt/oicmgr/src/oicmgr.c
+++ b/mgmt/oicmgr/src/oicmgr.c
@@ -101,7 +101,7 @@ omgr_oic_op(oc_request_t *req, oc_interface_mask_t mask, int isset)
struct omgr_state *o = &omgr_state;
const struct mgmt_handler *handler;
const uint8_t *data;
- int rc;
+ int rc = 0;
extern CborEncoder g_encoder;
if (!req->query_len) {
@@ -160,7 +160,12 @@ bad_req:
/*
* XXXX might send partially constructed response as payload
*/
- oc_send_response(req, OC_STATUS_BAD_REQUEST);
+ if (rc == MGMT_ERR_ENOMEM) {
+ rc = OC_STATUS_INTERNAL_SERVER_ERROR;
+ } else {
+ rc = OC_STATUS_BAD_REQUEST;
+ }
+ oc_send_response(req, rc);
}
static void
[3/5] incubator-mynewt-core git commit: native hal uart;
shorten task name.
Posted by ma...@apache.org.
native hal uart; shorten task name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/dc038ccc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/dc038ccc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/dc038ccc
Branch: refs/heads/develop
Commit: dc038cccf98940a8d59f9b0b27d533f6be15beed
Parents: 96b3f5f
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Oct 28 14:11:41 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Oct 28 15:41:31 2016 -0700
----------------------------------------------------------------------
hw/mcu/native/src/hal_uart.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dc038ccc/hw/mcu/native/src/hal_uart.c
----------------------------------------------------------------------
diff --git a/hw/mcu/native/src/hal_uart.c b/hw/mcu/native/src/hal_uart.c
index eaf964d..1ac5b97 100644
--- a/hw/mcu/native/src/hal_uart.c
+++ b/hw/mcu/native/src/hal_uart.c
@@ -340,7 +340,7 @@ hal_uart_init_cbs(int port, hal_uart_tx_char tx_func, hal_uart_tx_done tx_done,
if (!uart_poller_running) {
uart_poller_running = 1;
- rc = os_task_init(&uart_poller_task, "uart_poller", uart_poller, NULL,
+ rc = os_task_init(&uart_poller_task, "uartpoll", uart_poller, NULL,
UART_POLLER_PRIO, OS_WAIT_FOREVER, uart_poller_stack,
UART_POLLER_STACK_SZ);
assert(rc == 0);
[5/5] incubator-mynewt-core git commit: shell;
make task info display more like newtmgr shows it.
Posted by ma...@apache.org.
shell; make task info display more like newtmgr shows it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/45f74a70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/45f74a70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/45f74a70
Branch: refs/heads/develop
Commit: 45f74a703d92d8e478072e163ba378f5eaaa8dfc
Parents: dc038cc
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Oct 28 14:12:14 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Oct 28 15:41:31 2016 -0700
----------------------------------------------------------------------
sys/shell/src/shell_os.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/45f74a70/sys/shell/src/shell_os.c
----------------------------------------------------------------------
diff --git a/sys/shell/src/shell_os.c b/sys/shell/src/shell_os.c
index dbf85b8..aa20419 100644
--- a/sys/shell/src/shell_os.c
+++ b/sys/shell/src/shell_os.c
@@ -47,6 +47,9 @@ shell_os_tasks_display_cmd(int argc, char **argv)
console_printf("Tasks: \n");
prev_task = NULL;
+ console_printf(" %8s %3s %3s %8s %8s %8s %8s %8s %8s %3s\n",
+ "task", "pri", "tid", "runtime", "csw", "stksz", "stkuse",
+ "lcheck", "ncheck", "flg");
while (1) {
prev_task = os_task_info_get_next(prev_task, &oti);
if (prev_task == NULL) {
@@ -61,14 +64,12 @@ shell_os_tasks_display_cmd(int argc, char **argv)
}
}
- console_printf(" %s (prio: %u, tid: %u, lcheck: %lu, ncheck: %lu, "
- "flags: 0x%x, ssize: %u, susage: %u, cswcnt: %lu, "
- "tot_run_time: %lums)\n",
+ console_printf(" %8s %3u %3u %8lu %8lu %8u %8u %8lu %8lu %3x\n",
oti.oti_name, oti.oti_prio, oti.oti_taskid,
+ (unsigned long)oti.oti_runtime, (unsigned long)oti.oti_cswcnt,
+ oti.oti_stksize, oti.oti_stkusage,
(unsigned long)oti.oti_last_checkin,
- (unsigned long)oti.oti_next_checkin, oti.oti_flags,
- oti.oti_stksize, oti.oti_stkusage, (unsigned long)oti.oti_cswcnt,
- (unsigned long)oti.oti_runtime);
+ (unsigned long)oti.oti_next_checkin, oti.oti_flags);
}
[2/5] incubator-mynewt-core git commit: mgmt handlers;
return MGMT_ERR_XX error codes from handlers. Return error if cbor
response fails to get formed.
Posted by ma...@apache.org.
mgmt handlers; return MGMT_ERR_XX error codes from handlers.
Return error if cbor response fails to get formed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/a7400e75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/a7400e75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/a7400e75
Branch: refs/heads/develop
Commit: a7400e75d95d486217360fb4c6c2b50a67ddecdc
Parents: 45f74a7
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Oct 28 14:45:02 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Oct 28 15:41:31 2016 -0700
----------------------------------------------------------------------
mgmt/imgmgr/src/imgmgr.c | 23 ++++---
mgmt/imgmgr/src/imgmgr_coredump.c | 12 ++--
mgmt/imgmgr/src/imgmgr_fs.c | 6 ++
mgmt/imgmgr/src/imgmgr_state.c | 12 +++-
mgmt/newtmgr/nmgr_os/src/newtmgr_os.c | 37 ++++++----
sys/config/src/config_nmgr.c | 16 ++---
sys/log/src/log_nmgr.c | 106 +++++++++++++++++------------
sys/stats/src/stats_nmgr.c | 11 ++-
8 files changed, 136 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/mgmt/imgmgr/src/imgmgr.c
----------------------------------------------------------------------
diff --git a/mgmt/imgmgr/src/imgmgr.c b/mgmt/imgmgr/src/imgmgr.c
index 76e6844..2a64bc1 100644
--- a/mgmt/imgmgr/src/imgmgr.c
+++ b/mgmt/imgmgr/src/imgmgr.c
@@ -263,10 +263,12 @@ imgr_upload(struct mgmt_cbuf *cb)
struct image_version ver;
struct image_header *hdr;
int area_id;
-
int best;
int rc;
int i;
+ CborEncoder *penc = &cb->encoder;
+ CborEncoder rsp;
+ CborError g_err = CborNoError;
rc = cbor_read_object(&cb->it, off_attr);
if (rc || off == UINT_MAX) {
@@ -371,16 +373,15 @@ imgr_upload(struct mgmt_cbuf *cb)
}
}
out:
- {
- CborError g_err = CborNoError;
- CborEncoder *penc = &cb->encoder;
- CborEncoder rsp;
- g_err |= cbor_encoder_create_map(penc, &rsp, CborIndefiniteLength);
- g_err |= cbor_encode_text_stringz(&rsp, "rc");
- g_err |= cbor_encode_int(&rsp, MGMT_ERR_EOK);
- g_err |= cbor_encode_text_stringz(&rsp, "off");
- g_err |= cbor_encode_int(&rsp, imgr_state.upload.off);
- g_err |= cbor_encoder_close_container(penc, &rsp);
+ g_err |= cbor_encoder_create_map(penc, &rsp, CborIndefiniteLength);
+ g_err |= cbor_encode_text_stringz(&rsp, "rc");
+ g_err |= cbor_encode_int(&rsp, MGMT_ERR_EOK);
+ g_err |= cbor_encode_text_stringz(&rsp, "off");
+ g_err |= cbor_encode_int(&rsp, imgr_state.upload.off);
+ g_err |= cbor_encoder_close_container(penc, &rsp);
+
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
}
return 0;
err_close:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/mgmt/imgmgr/src/imgmgr_coredump.c
----------------------------------------------------------------------
diff --git a/mgmt/imgmgr/src/imgmgr_coredump.c b/mgmt/imgmgr/src/imgmgr_coredump.c
index a8b92c9..df3e321 100644
--- a/mgmt/imgmgr/src/imgmgr_coredump.c
+++ b/mgmt/imgmgr/src/imgmgr_coredump.c
@@ -74,6 +74,10 @@ imgr_core_load(struct mgmt_cbuf *cb)
const struct flash_area *fa;
uint8_t data[IMGMGR_NMGR_MAX_MSG];
struct coredump_header *hdr;
+ CborError g_err = CborNoError;
+ CborEncoder *penc = &cb->encoder;
+ CborEncoder rsp;
+
hdr = (struct coredump_header *)data;
rc = cbor_read_object(&cb->it, dload_attr);
@@ -111,9 +115,6 @@ imgr_core_load(struct mgmt_cbuf *cb)
goto err_close;
}
- CborError g_err = CborNoError;
- CborEncoder *penc = &cb->encoder;
- CborEncoder rsp;
g_err |= cbor_encoder_create_map(penc, &rsp, CborIndefiniteLength);
g_err |= cbor_encode_text_stringz(&rsp, "rc");
g_err |= cbor_encode_int(&rsp, MGMT_ERR_EOK);
@@ -124,13 +125,16 @@ imgr_core_load(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(penc, &rsp);
flash_area_close(fa);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return 0;
err_close:
flash_area_close(fa);
err:
mgmt_cbuf_setoerr(cb, rc);
- return 0;
+ return rc;
}
/*
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/mgmt/imgmgr/src/imgmgr_fs.c
----------------------------------------------------------------------
diff --git a/mgmt/imgmgr/src/imgmgr_fs.c b/mgmt/imgmgr/src/imgmgr_fs.c
index 4bac8b5..2685669 100644
--- a/mgmt/imgmgr/src/imgmgr_fs.c
+++ b/mgmt/imgmgr/src/imgmgr_fs.c
@@ -106,6 +106,9 @@ imgr_file_download(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(penc, &rsp);
fs_close(file);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return 0;
err_close:
@@ -215,6 +218,9 @@ out:
g_err |= cbor_encode_text_stringz(&rsp, "off");
g_err |= cbor_encode_uint(&rsp, imgr_state.upload.off);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return 0;
err_close:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/mgmt/imgmgr/src/imgmgr_state.c
----------------------------------------------------------------------
diff --git a/mgmt/imgmgr/src/imgmgr_state.c b/mgmt/imgmgr/src/imgmgr_state.c
index e1d65b6..d3adf39 100644
--- a/mgmt/imgmgr/src/imgmgr_state.c
+++ b/mgmt/imgmgr/src/imgmgr_state.c
@@ -261,13 +261,16 @@ imgmgr_state_read(struct mgmt_cbuf *cb)
g_err |= cbor_encode_boolean(&image, !(flags & IMAGE_F_NON_BOOTABLE));
g_err |= cbor_encode_text_stringz(&image, "pending");
- g_err |= cbor_encode_boolean(&image, state_flags & IMGMGR_STATE_F_PENDING);
+ g_err |= cbor_encode_boolean(&image,
+ state_flags & IMGMGR_STATE_F_PENDING);
g_err |= cbor_encode_text_stringz(&image, "confirmed");
- g_err |= cbor_encode_boolean(&image, state_flags & IMGMGR_STATE_F_CONFIRMED);
+ g_err |= cbor_encode_boolean(&image,
+ state_flags & IMGMGR_STATE_F_CONFIRMED);
g_err |= cbor_encode_text_stringz(&image, "active");
- g_err |= cbor_encode_boolean(&image, state_flags & IMGMGR_STATE_F_ACTIVE);
+ g_err |= cbor_encode_boolean(&image,
+ state_flags & IMGMGR_STATE_F_ACTIVE);
g_err |= cbor_encoder_close_container(&images, &image);
}
@@ -285,6 +288,9 @@ imgmgr_state_read(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return 0;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
----------------------------------------------------------------------
diff --git a/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c b/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
index c8cf343..c845c75 100644
--- a/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
+++ b/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
@@ -83,7 +83,6 @@ nmgr_def_echo(struct mgmt_cbuf *cb)
CborEncoder *penc = &cb->encoder;
CborError g_err = CborNoError;
CborEncoder rsp;
-
struct cbor_attr_t attrs[2] = {
[0] = {
.attribute = "d",
@@ -103,7 +102,10 @@ nmgr_def_echo(struct mgmt_cbuf *cb)
g_err |= cbor_encode_text_string(&rsp, echo_buf, strlen(echo_buf));
g_err |= cbor_encoder_close_container(penc, &rsp);
- return (g_err);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
+ return (0);
}
static int
@@ -123,7 +125,7 @@ nmgr_def_console_echo(struct mgmt_cbuf *cb)
rc = cbor_read_object(&cb->it, attrs);
if (rc) {
- return OS_EINVAL;
+ return MGMT_ERR_EINVAL;
}
if (echo_on) {
@@ -182,6 +184,9 @@ nmgr_def_taskstat_read(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(&rsp, &tasks);
g_err |= cbor_encoder_close_container(&cb->encoder, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
}
@@ -220,6 +225,9 @@ nmgr_def_mpstat_read(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(&rsp, &pools);
g_err |= cbor_encoder_close_container(&cb->encoder, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
}
@@ -230,9 +238,9 @@ nmgr_datetime_get(struct mgmt_cbuf *cb)
struct os_timezone tz;
char buf[DATETIME_BUFSIZE];
int rc;
-
CborError g_err = CborNoError;
CborEncoder rsp;
+
g_err |= cbor_encoder_create_map(&cb->encoder, &rsp, CborIndefiniteLength);
g_err |= cbor_encode_text_stringz(&rsp, "rc");
g_err |= cbor_encode_int(&rsp, MGMT_ERR_EOK);
@@ -242,13 +250,17 @@ nmgr_datetime_get(struct mgmt_cbuf *cb)
assert(rc == 0);
rc = datetime_format(&tv, &tz, buf, DATETIME_BUFSIZE);
if (rc) {
- rc = OS_EINVAL;
+ rc = MGMT_ERR_EINVAL;
goto err;
}
g_err |= cbor_encode_text_stringz(&rsp, "datetime");
g_err |= cbor_encode_text_stringz(&rsp, buf);
g_err |= cbor_encoder_close_container(&cb->encoder, &rsp);
- return OS_OK;
+
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
+ return 0;
err:
return (rc);
@@ -260,8 +272,7 @@ nmgr_datetime_set(struct mgmt_cbuf *cb)
struct os_timeval tv;
struct os_timezone tz;
char buf[DATETIME_BUFSIZE];
- int rc = OS_OK;
-
+ int rc = 0;
const struct cbor_attr_t datetime_write_attr[3] = {
[0] = {
.attribute = "datetime",
@@ -278,7 +289,7 @@ nmgr_datetime_set(struct mgmt_cbuf *cb)
rc = cbor_read_object(&cb->it, datetime_write_attr);
if (rc) {
- rc = OS_EINVAL;
+ rc = MGMT_ERR_EINVAL;
goto out;
}
@@ -287,15 +298,15 @@ nmgr_datetime_set(struct mgmt_cbuf *cb)
if (!rc) {
rc = os_settimeofday(&tv, &tz);
if (rc) {
- rc = OS_EINVAL;
+ rc = MGMT_ERR_EINVAL;
goto out;
}
} else {
- rc = OS_EINVAL;
+ rc = MGMT_ERR_EINVAL;
goto out;
}
- rc = OS_OK;
+ rc = 0;
out:
mgmt_cbuf_setoerr(cb, rc);
return rc;
@@ -315,7 +326,7 @@ nmgr_reset(struct mgmt_cbuf *cb)
mgmt_cbuf_setoerr(cb, OS_OK);
- return OS_OK;
+ return 0;
}
int
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/sys/config/src/config_nmgr.c
----------------------------------------------------------------------
diff --git a/sys/config/src/config_nmgr.c b/sys/config/src/config_nmgr.c
index 2713486..24c7080 100644
--- a/sys/config/src/config_nmgr.c
+++ b/sys/config/src/config_nmgr.c
@@ -48,6 +48,8 @@ conf_nmgr_read(struct mgmt_cbuf *cb)
char name_str[CONF_MAX_NAME_LEN];
char val_str[CONF_MAX_VAL_LEN];
char *val;
+ CborError g_err = CborNoError;
+ CborEncoder rsp;
const struct cbor_attr_t attr[2] = {
[0] = {
@@ -71,15 +73,13 @@ conf_nmgr_read(struct mgmt_cbuf *cb)
return MGMT_ERR_EINVAL;
}
- {
- CborError g_err = CborNoError;
- CborEncoder rsp;
- g_err |= cbor_encoder_create_map(&cb->encoder, &rsp, CborIndefiniteLength);
- g_err |= cbor_encode_text_stringz(&rsp, "val");
- g_err |= cbor_encode_text_stringz(&rsp, val);
- g_err |= cbor_encoder_close_container(&cb->encoder, &rsp);
+ g_err |= cbor_encoder_create_map(&cb->encoder, &rsp, CborIndefiniteLength);
+ g_err |= cbor_encode_text_stringz(&rsp, "val");
+ g_err |= cbor_encode_text_stringz(&rsp, val);
+ g_err |= cbor_encoder_close_container(&cb->encoder, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
}
-
return 0;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/sys/log/src/log_nmgr.c
----------------------------------------------------------------------
diff --git a/sys/log/src/log_nmgr.c b/sys/log/src/log_nmgr.c
index 686bafe..63f5af6 100644
--- a/sys/log/src/log_nmgr.c
+++ b/sys/log/src/log_nmgr.c
@@ -78,6 +78,8 @@ log_nmgr_encode_entry(struct log *log, void *arg, void *dptr, uint16_t len)
CborError g_err = CborNoError;
CborEncoder *penc = encode_off->eo_encoder;
CborEncoder rsp;
+ struct CborCntWriter cnt_writer;
+ CborEncoder cnt_encoder;
rc = log_read(log, dptr, &ueh, 0, sizeof(ueh));
if (rc != sizeof(ueh)) {
@@ -103,35 +105,30 @@ log_nmgr_encode_entry(struct log *log, void *arg, void *dptr, uint16_t len)
data[rc] = 0;
/*calculate whether this would fit */
- {
- /* create a counting encoder for cbor */
- struct CborCntWriter cnt_writer;
- CborEncoder cnt_encoder;
- cbor_cnt_writer_init(&cnt_writer);
- cbor_encoder_init(&cnt_encoder, &cnt_writer.enc, 0);
-
- /* NOTE This code should exactly match what is below */
- g_err |= cbor_encoder_create_map(&cnt_encoder, &rsp, CborIndefiniteLength);
- g_err |= cbor_encode_text_stringz(&rsp, "msg");
- g_err |= cbor_encode_text_stringz(&rsp, data);
- g_err |= cbor_encode_text_stringz(&rsp, "ts");
- g_err |= cbor_encode_int(&rsp, ueh.ue_ts);
- g_err |= cbor_encode_text_stringz(&rsp, "level");
- g_err |= cbor_encode_uint(&rsp, ueh.ue_level);
- g_err |= cbor_encode_text_stringz(&rsp, "index");
- g_err |= cbor_encode_uint(&rsp, ueh.ue_index);
- g_err |= cbor_encode_text_stringz(&rsp, "module");
- g_err |= cbor_encode_uint(&rsp, ueh.ue_module);
- g_err |= cbor_encoder_close_container(&cnt_encoder, &rsp);
- rsp_len = encode_off->rsp_len;
- rsp_len += cbor_encode_bytes_written(&cnt_encoder);
-
- if (rsp_len > MGMT_MAX_MTU) {
- rc = OS_ENOMEM;
- goto err;
- }
- encode_off->rsp_len = rsp_len;
+ /* create a counting encoder for cbor */
+ cbor_cnt_writer_init(&cnt_writer);
+ cbor_encoder_init(&cnt_encoder, &cnt_writer.enc, 0);
+
+ /* NOTE This code should exactly match what is below */
+ g_err |= cbor_encoder_create_map(&cnt_encoder, &rsp, CborIndefiniteLength);
+ g_err |= cbor_encode_text_stringz(&rsp, "msg");
+ g_err |= cbor_encode_text_stringz(&rsp, data);
+ g_err |= cbor_encode_text_stringz(&rsp, "ts");
+ g_err |= cbor_encode_int(&rsp, ueh.ue_ts);
+ g_err |= cbor_encode_text_stringz(&rsp, "level");
+ g_err |= cbor_encode_uint(&rsp, ueh.ue_level);
+ g_err |= cbor_encode_text_stringz(&rsp, "index");
+ g_err |= cbor_encode_uint(&rsp, ueh.ue_index);
+ g_err |= cbor_encode_text_stringz(&rsp, "module");
+ g_err |= cbor_encode_uint(&rsp, ueh.ue_module);
+ g_err |= cbor_encoder_close_container(&cnt_encoder, &rsp);
+ rsp_len = encode_off->rsp_len;
+ rsp_len += cbor_encode_bytes_written(&cnt_encoder);
+ if (rsp_len > MGMT_MAX_MTU) {
+ rc = OS_ENOMEM;
+ goto err;
}
+ encode_off->rsp_len = rsp_len;
g_err |= cbor_encoder_create_map(penc, &rsp, CborIndefiniteLength);
g_err |= cbor_encode_text_stringz(&rsp, "msg");
@@ -146,6 +143,9 @@ log_nmgr_encode_entry(struct log *log, void *arg, void *dptr, uint16_t len)
g_err |= cbor_encode_uint(&rsp, ueh.ue_module);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
err:
return (rc);
@@ -165,25 +165,24 @@ log_encode_entries(struct log *log, CborEncoder *cb,
int rsp_len = 0;
CborEncoder entries;
CborError g_err = CborNoError;
+ struct CborCntWriter cnt_writer;
+ CborEncoder cnt_encoder;
memset(&encode_off, 0, sizeof(encode_off));
- {
- /* this code counts how long the message would be if we encoded
- * this outer structure using cbor. */
- struct CborCntWriter cnt_writer;
- CborEncoder cnt_encoder;
- cbor_cnt_writer_init(&cnt_writer);
- cbor_encoder_init(&cnt_encoder, &cnt_writer.enc, 0);
- g_err |= cbor_encode_text_stringz(&cnt_encoder, "entries");
- g_err |= cbor_encoder_create_array(&cnt_encoder, &entries, CborIndefiniteLength);
- g_err |= cbor_encoder_close_container(&cnt_encoder, &entries);
- rsp_len = cbor_encode_bytes_written(cb)
- + cbor_encode_bytes_written(&cnt_encoder);
- if (rsp_len > MGMT_MAX_MTU) {
- rc = OS_ENOMEM;
- goto err;
- }
+ /* this code counts how long the message would be if we encoded
+ * this outer structure using cbor. */
+ cbor_cnt_writer_init(&cnt_writer);
+ cbor_encoder_init(&cnt_encoder, &cnt_writer.enc, 0);
+ g_err |= cbor_encode_text_stringz(&cnt_encoder, "entries");
+ g_err |= cbor_encoder_create_array(&cnt_encoder, &entries,
+ CborIndefiniteLength);
+ g_err |= cbor_encoder_close_container(&cnt_encoder, &entries);
+ rsp_len = cbor_encode_bytes_written(cb) +
+ cbor_encode_bytes_written(&cnt_encoder);
+ if (rsp_len > MGMT_MAX_MTU) {
+ rc = OS_ENOMEM;
+ goto err;
}
g_err |= cbor_encode_text_stringz(cb, "entries");
@@ -225,6 +224,9 @@ log_encode(struct log *log, CborEncoder *cb,
rc = log_encode_entries(log, &logs, ts, index);
g_err |= cbor_encoder_close_container(cb, &logs);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return rc;
}
@@ -319,6 +321,9 @@ err:
g_err |= cbor_encode_int(&rsp, rc);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
rc = 0;
return (rc);
}
@@ -360,7 +365,9 @@ log_nmgr_module_list(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(&rsp, &modules);
g_err |= cbor_encoder_close_container(penc, &rsp);
-
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
}
@@ -401,6 +408,9 @@ log_nmgr_logs_list(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(&rsp, &log_list);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
}
@@ -441,6 +451,9 @@ log_nmgr_level_list(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(&rsp, &level_map);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
}
@@ -477,6 +490,9 @@ log_nmgr_clear(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_create_map(penc, &rsp, CborIndefiniteLength);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return 0;
err:
mgmt_cbuf_setoerr(cb, rc);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a7400e75/sys/stats/src/stats_nmgr.c
----------------------------------------------------------------------
diff --git a/sys/stats/src/stats_nmgr.c b/sys/stats/src/stats_nmgr.c
index 01cf0d1..5df6e7c 100644
--- a/sys/stats/src/stats_nmgr.c
+++ b/sys/stats/src/stats_nmgr.c
@@ -79,9 +79,8 @@ static int
stats_nmgr_encode_name(struct stats_hdr *hdr, void *arg)
{
CborEncoder *penc = (CborEncoder *) arg;
- CborError g_err = CborNoError;
- g_err |= cbor_encode_text_stringz(penc, hdr->s_name);
- return (0);
+
+ return cbor_encode_text_stringz(penc, hdr->s_name);
}
static int
@@ -130,6 +129,9 @@ stats_nmgr_read(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(&rsp, &stats);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
err:
mgmt_cbuf_setoerr(cb, g_err);
@@ -153,6 +155,9 @@ stats_nmgr_list(struct mgmt_cbuf *cb)
g_err |= cbor_encoder_close_container(&rsp, &stats);
g_err |= cbor_encoder_close_container(penc, &rsp);
+ if (g_err) {
+ return MGMT_ERR_ENOMEM;
+ }
return (0);
}
[4/5] incubator-mynewt-core git commit: oic;
start oic task if one of the transports initializes ok.
Posted by ma...@apache.org.
oic; start oic task if one of the transports initializes ok.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/262f8b2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/262f8b2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/262f8b2d
Branch: refs/heads/develop
Commit: 262f8b2dee9f275f5b2da4a082a34c69d89038b5
Parents: a7400e7
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Oct 28 15:40:12 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Oct 28 15:41:31 2016 -0700
----------------------------------------------------------------------
net/oic/src/port/mynewt/adaptor.c | 52 ++++++++++++++++------------------
1 file changed, 24 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/262f8b2d/net/oic/src/port/mynewt/adaptor.c
----------------------------------------------------------------------
diff --git a/net/oic/src/port/mynewt/adaptor.c b/net/oic/src/port/mynewt/adaptor.c
index b61ba02..e4b1cd6 100644
--- a/net/oic/src/port/mynewt/adaptor.c
+++ b/net/oic/src/port/mynewt/adaptor.c
@@ -61,28 +61,27 @@ struct os_task oc_task;
os_stack_t *oc_stack;
void
-oc_send_buffer(oc_message_t *message) {
-
- switch (message->endpoint.flags)
- {
+oc_send_buffer(oc_message_t *message)
+{
+ switch (message->endpoint.flags) {
#if (MYNEWT_VAL(OC_TRANSPORT_IP) == 1)
- case IP:
- oc_send_buffer_ip(message);
- break;
+ case IP:
+ oc_send_buffer_ip(message);
+ break;
#endif
#if (MYNEWT_VAL(OC_TRANSPORT_GATT) == 1)
- case GATT:
- oc_send_buffer_gatt(message);
- break;
+ case GATT:
+ oc_send_buffer_gatt(message);
+ break;
#endif
#if (MYNEWT_VAL(OC_TRANSPORT_SERIAL) == 1)
- case SERIAL:
- oc_send_buffer_serial(message);
- break;
+ case SERIAL:
+ oc_send_buffer_serial(message);
+ break;
#endif
- default:
- ERROR("Unknown transport option %u\n", message->endpoint.flags);
- oc_message_unref(message);
+ default:
+ ERROR("Unknown transport option %u\n", message->endpoint.flags);
+ oc_message_unref(message);
}
}
@@ -153,7 +152,8 @@ oc_task_handler(void *arg)
}
static int
-oc_init_task(void) {
+oc_init_task(void)
+{
int rc;
os_eventq_init(&oc_event_q);
@@ -193,25 +193,21 @@ oc_connectivity_shutdown(void)
int
oc_connectivity_init(void)
{
- int rc;
+ int rc = -1;
#if (MYNEWT_VAL(OC_TRANSPORT_IP) == 1)
- rc = oc_connectivity_init_ip();
- if (rc != 0) {
- goto oc_connectivity_init_err;
+ if (oc_connectivity_init_ip() == 0) {
+ rc = 0;
}
#endif
#if (MYNEWT_VAL(OC_TRANSPORT_SERIAL) == 1)
-
- rc = oc_connectivity_init_serial();
- if (rc != 0) {
- goto oc_connectivity_init_err;
+ if (oc_connectivity_init_serial() == 0) {
+ rc = 0;
}
#endif
#if (MYNEWT_VAL(OC_TRANSPORT_GATT) == 1)
- rc = oc_connectivity_init_gatt();
- if (rc != 0) {
- goto oc_connectivity_init_err;
+ if (oc_connectivity_init_gatt() == 0) {
+ rc = 0;
}
#endif
rc = oc_init_task();