You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2017/04/19 18:18:21 UTC
[25/30] incubator-mynewt-core git commit: apps/iptest;
add sample task to demonstrate IP config over ethernet.
apps/iptest; add sample task to demonstrate IP config over ethernet.
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/39ad85d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/39ad85d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/39ad85d2
Branch: refs/heads/master
Commit: 39ad85d22ef78e6082167c046ef33dc7c876b7aa
Parents: f92e6ab
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Apr 17 14:35:24 2017 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Apr 17 14:35:24 2017 -0700
----------------------------------------------------------------------
apps/iptest/pkg.yml | 46 +++++
apps/iptest/src/main.c | 441 ++++++++++++++++++++++++++++++++++++++++++++
apps/iptest/syscfg.yml | 45 +++++
3 files changed, 532 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/39ad85d2/apps/iptest/pkg.yml
----------------------------------------------------------------------
diff --git a/apps/iptest/pkg.yml b/apps/iptest/pkg.yml
new file mode 100644
index 0000000..a9a5da1
--- /dev/null
+++ b/apps/iptest/pkg.yml
@@ -0,0 +1,46 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: apps/iptest
+pkg.type: app
+pkg.description: "Example application which uses a variety of mynewt features."
+pkg.author: "Apache Mynewt <de...@mynewt.incubator.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+
+pkg.deps:
+ - kernel/os
+ - boot/bootutil
+ - sys/shell
+ - sys/config
+ - sys/console/full
+ - sys/id
+ - sys/log/full
+ - sys/stats/full
+ - net/ip/inet_def_service
+
+pkg.deps.CONFIG_NFFS:
+ - fs/nffs
+
+pkg.deps.CONFIG_FCB:
+ - fs/fcb
+
+pkg.deps.BUILD_WITH_OIC:
+ - net/oic
+ - encoding/cborattr
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/39ad85d2/apps/iptest/src/main.c
----------------------------------------------------------------------
diff --git a/apps/iptest/src/main.c b/apps/iptest/src/main.c
new file mode 100755
index 0000000..3ec726e
--- /dev/null
+++ b/apps/iptest/src/main.c
@@ -0,0 +1,441 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "syscfg/syscfg.h"
+#include "sysinit/sysinit.h"
+#include "sysflash/sysflash.h"
+
+#include <os/os.h>
+#include <bsp/bsp.h>
+
+#include <hal/hal_gpio.h>
+#include <hal/hal_flash.h>
+#include <console/console.h>
+
+#include <log/log.h>
+#include <config/config.h>
+#include <hal/hal_system.h>
+
+#include <bootutil/image.h>
+#include <bootutil/bootutil.h>
+
+#include <shell/shell.h>
+#include <mn_socket/mn_socket.h>
+#include <inet_def_service/inet_def_service.h>
+
+#include <assert.h>
+#include <string.h>
+#include <os/os_time.h>
+#include <id/id.h>
+
+#if MYNEWT_VAL(BUILD_WITH_OIC)
+#include <oic/oc_api.h>
+#include <oic/oc_log.h>
+#include <cborattr/cborattr.h>
+#endif
+
+#ifdef ARCH_sim
+#include <mcu/mcu_sim.h>
+#endif
+
+static struct log my_log;
+
+#define MAX_CBMEM_BUF 2048
+
+static uint32_t cbmem_buf[MAX_CBMEM_BUF];
+static struct cbmem cbmem;
+
+static int net_cli(int argc, char **argv);
+struct shell_cmd net_test_cmd = {
+ .sc_cmd = "net",
+ .sc_cmd_func = net_cli
+};
+
+static struct mn_socket *net_test_socket;
+static struct mn_socket *net_test_socket2;
+
+#if MYNEWT_VAL(BUILD_WITH_OIC)
+static void omgr_app_init(void);
+static const oc_handler_t omgr_oc_handler = {
+ .init = omgr_app_init,
+};
+#endif
+
+static void net_test_readable(void *arg, int err)
+{
+ console_printf("net_test_readable %x - %d\n", (int)arg, err);
+}
+
+static void net_test_writable(void *arg, int err)
+{
+ console_printf("net_test_writable %x - %d\n", (int)arg, err);
+}
+
+static const union mn_socket_cb net_test_cbs = {
+ .socket.readable = net_test_readable,
+ .socket.writable = net_test_writable
+};
+
+static int net_test_newconn(void *arg, struct mn_socket *new)
+{
+ console_printf("net_test_newconn %x - %x\n", (int)arg, (int)new);
+ mn_socket_set_cbs(new, NULL, &net_test_cbs);
+ net_test_socket2 = new;
+ return 0;
+}
+
+static const union mn_socket_cb net_listen_cbs = {
+ .listen.newconn = net_test_newconn,
+};
+
+static int
+net_cli(int argc, char **argv)
+{
+ int rc;
+ struct mn_sockaddr_in sin;
+ struct mn_sockaddr_in *sinp;
+ uint16_t port;
+ uint32_t addr;
+ char *eptr;
+ struct os_mbuf *m;
+
+ if (argc < 2) {
+ return 0;
+ }
+ if (!strcmp(argv[1], "udp")) {
+ rc = mn_socket(&net_test_socket, MN_PF_INET, MN_SOCK_DGRAM, 0);
+ console_printf("mn_socket(UDP) = %d %x\n", rc,
+ (int)net_test_socket);
+ } else if (!strcmp(argv[1], "tcp")) {
+ rc = mn_socket(&net_test_socket, MN_PF_INET, MN_SOCK_STREAM, 0);
+ console_printf("mn_socket(TCP) = %d %x\n", rc,
+ (int)net_test_socket);
+ } else if (!strcmp(argv[1], "connect") || !strcmp(argv[1], "bind")) {
+ if (argc < 4) {
+ return 0;
+ }
+
+ if (mn_inet_pton(MN_AF_INET, argv[2], &addr) != 1) {
+ console_printf("Invalid address %s\n", argv[2]);
+ return 0;
+ }
+
+ port = strtoul(argv[3], &eptr, 0);
+ if (*eptr != '\0') {
+ console_printf("Invalid port %s\n", argv[3]);
+ return 0;
+ }
+ uint8_t *ip = (uint8_t *)&addr;
+
+ console_printf("%d.%d.%d.%d/%d\n", ip[0], ip[1], ip[2], ip[3], port);
+ memset(&sin, 0, sizeof(sin));
+ sin.msin_len = sizeof(sin);
+ sin.msin_family = MN_AF_INET;
+ sin.msin_port = htons(port);
+ sin.msin_addr.s_addr = addr;
+
+ if (!strcmp(argv[1], "connect")) {
+ mn_socket_set_cbs(net_test_socket, NULL, &net_test_cbs);
+ rc = mn_connect(net_test_socket, (struct mn_sockaddr *)&sin);
+ console_printf("mn_connect() = %d\n", rc);
+ } else {
+ mn_socket_set_cbs(net_test_socket, NULL, &net_test_cbs);
+ rc = mn_bind(net_test_socket, (struct mn_sockaddr *)&sin);
+ console_printf("mn_bind() = %d\n", rc);
+ }
+ } else if (!strcmp(argv[1], "listen")) {
+ mn_socket_set_cbs(net_test_socket, NULL, &net_listen_cbs);
+ rc = mn_listen(net_test_socket, 2);
+ console_printf("mn_listen() = %d\n", rc);
+ } else if (!strcmp(argv[1], "close")) {
+ rc = mn_close(net_test_socket);
+ console_printf("mn_close() = %d\n", rc);
+ net_test_socket = NULL;
+ if (net_test_socket2) {
+ rc = mn_close(net_test_socket2);
+ console_printf("mn_close() = %d\n", rc);
+ net_test_socket2 = NULL;
+ }
+ } else if (!strcmp(argv[1], "send")) {
+ if (argc < 3) {
+ return 0;
+ }
+ m = os_msys_get_pkthdr(16, 0);
+ if (!m) {
+ console_printf("out of mbufs\n");
+ return 0;
+ }
+ rc = os_mbuf_copyinto(m, 0, argv[2], strlen(argv[2]));
+ if (rc < 0) {
+ console_printf("can't copy data\n");
+ os_mbuf_free_chain(m);
+ return 0;
+ }
+ if (argc > 4) {
+ if (mn_inet_pton(MN_AF_INET, argv[3], &addr) != 1) {
+ console_printf("Invalid address %s\n", argv[2]);
+ return 0;
+ }
+
+ port = strtoul(argv[4], &eptr, 0);
+ if (*eptr != '\0') {
+ console_printf("Invalid port %s\n", argv[3]);
+ return 0;
+ }
+ uint8_t *ip = (uint8_t *)&addr;
+
+ console_printf("%d.%d.%d.%d/%d\n", ip[0], ip[1], ip[2], ip[3],
+ port);
+ memset(&sin, 0, sizeof(sin));
+ sin.msin_len = sizeof(sin);
+ sin.msin_family = MN_AF_INET;
+ sin.msin_port = htons(port);
+ sin.msin_addr.s_addr = addr;
+ sinp = &sin;
+ } else {
+ sinp = NULL;
+ }
+
+ if (net_test_socket2) {
+ rc = mn_sendto(net_test_socket2, m, (struct mn_sockaddr *)sinp);
+ } else {
+ rc = mn_sendto(net_test_socket, m, (struct mn_sockaddr *)sinp);
+ }
+ console_printf("mn_sendto() = %d\n", rc);
+ } else if (!strcmp(argv[1], "peer")) {
+ if (net_test_socket2) {
+ rc = mn_getpeername(net_test_socket2, (struct mn_sockaddr *)&sin);
+ } else {
+ rc = mn_getpeername(net_test_socket, (struct mn_sockaddr *)&sin);
+ }
+ console_printf("mn_getpeername() = %d\n", rc);
+ uint8_t *ip = (uint8_t *)&sin.msin_addr;
+
+ console_printf("%d.%d.%d.%d/%d\n", ip[0], ip[1], ip[2], ip[3],
+ ntohs(sin.msin_port));
+ } else if (!strcmp(argv[1], "recv")) {
+ if (net_test_socket2) {
+ rc = mn_recvfrom(net_test_socket2, &m, (struct mn_sockaddr *)&sin);
+ } else {
+ rc = mn_recvfrom(net_test_socket, &m, (struct mn_sockaddr *)&sin);
+ }
+ console_printf("mn_recvfrom() = %d\n", rc);
+ if (m) {
+ uint8_t *ip = (uint8_t *)&sin.msin_addr;
+
+ console_printf("%d.%d.%d.%d/%d\n", ip[0], ip[1], ip[2], ip[3],
+ ntohs(sin.msin_port));
+ m->om_data[m->om_len] = '\0';
+ console_printf("received %d bytes >%s<\n",
+ OS_MBUF_PKTHDR(m)->omp_len, (char *)m->om_data);
+ os_mbuf_free_chain(m);
+ }
+ } else if (!strcmp(argv[1], "mcast_join") ||
+ !strcmp(argv[1], "mcast_leave")) {
+ struct mn_mreq mm;
+ int val;
+
+ if (argc < 4) {
+ return 0;
+ }
+
+ val = strtoul(argv[2], &eptr, 0);
+ if (*eptr != '\0') {
+ console_printf("Invalid itf_idx %s\n", argv[2]);
+ return 0;
+ }
+
+ memset(&mm, 0, sizeof(mm));
+ mm.mm_idx = val;
+ mm.mm_family = MN_AF_INET;
+ if (mn_inet_pton(MN_AF_INET, argv[3], &mm.mm_addr) != 1) {
+ console_printf("Invalid address %s\n", argv[2]);
+ return 0;
+ }
+ if (!strcmp(argv[1], "mcast_join")) {
+ val = MN_MCAST_JOIN_GROUP;
+ } else {
+ val = MN_MCAST_LEAVE_GROUP;
+ }
+ rc = mn_setsockopt(net_test_socket, MN_SO_LEVEL, val, &mm);
+ console_printf("mn_setsockopt() = %d\n", rc);
+ } else if (!strcmp(argv[1], "listif")) {
+ struct mn_itf itf;
+ struct mn_itf_addr itf_addr;
+ char addr_str[48];
+
+ memset(&itf, 0, sizeof(itf));
+ while (1) {
+ rc = mn_itf_getnext(&itf);
+ if (rc) {
+ break;
+ }
+ console_printf("%d: %x %s\n", itf.mif_idx, itf.mif_flags,
+ itf.mif_name);
+ memset(&itf_addr, 0, sizeof(itf_addr));
+ while (1) {
+ rc = mn_itf_addr_getnext(&itf, &itf_addr);
+ if (rc) {
+ break;
+ }
+ mn_inet_ntop(itf_addr.mifa_family, &itf_addr.mifa_addr,
+ addr_str, sizeof(addr_str));
+ console_printf(" %s/%d\n", addr_str, itf_addr.mifa_plen);
+ }
+ }
+#ifndef ARCH_sim
+ } else if (!strcmp(argv[1], "mii")) {
+ extern int stm32_mii_dump(void (*func)(const char *fmt, ...));
+
+ stm32_mii_dump(console_printf);
+#endif
+ } else if (!strcmp(argv[1], "service")) {
+ inet_def_service_init(os_eventq_dflt_get());
+#if MYNEWT_VAL(BUILD_WITH_OIC)
+ } else if (!strcmp(argv[1], "oic")) {
+ oc_main_init((oc_handler_t *)&omgr_oc_handler);
+#endif
+ } else {
+ console_printf("unknown cmd\n");
+ }
+ return 0;
+}
+
+#if MYNEWT_VAL(BUILD_WITH_OIC)
+static void
+app_get_light(oc_request_t *request, oc_interface_mask_t interface)
+{
+ bool state;
+
+ if (hal_gpio_read(LED_BLINK_PIN)) {
+ state = true;
+ } else {
+ state = false;
+ }
+ oc_rep_start_root_object();
+ switch (interface) {
+ case OC_IF_BASELINE:
+ oc_process_baseline_interface(request->resource);
+ case OC_IF_RW:
+ oc_rep_set_boolean(root, state, state);
+ break;
+ default:
+ break;
+ }
+ oc_rep_end_root_object();
+ oc_send_response(request, OC_STATUS_OK);
+}
+
+static void
+app_set_light(oc_request_t *request, oc_interface_mask_t interface)
+{
+ bool state;
+ int len;
+ uint16_t data_off;
+ struct os_mbuf *m;
+ struct cbor_attr_t attrs[] = {
+ [0] = {
+ .attribute = "state",
+ .type = CborAttrBooleanType,
+ .addr.boolean = &state,
+ .dflt.boolean = false
+ },
+ [1] = {
+ }
+ };
+
+ len = coap_get_payload(request->packet, &m, &data_off);
+ if (cbor_read_mbuf_attrs(m, data_off, len, attrs)) {
+ oc_send_response(request, OC_STATUS_BAD_REQUEST);
+ } else {
+ hal_gpio_write(LED_BLINK_PIN, state == true);
+ oc_send_response(request, OC_STATUS_CHANGED);
+ }
+}
+
+static void
+omgr_app_init(void)
+{
+ oc_resource_t *res;
+
+ oc_init_platform("MyNewt", NULL, NULL);
+ oc_add_device("/oic/d", "oic.d.light", "MynewtLed", "1.0", "1.0", NULL,
+ NULL);
+
+ res = oc_new_resource("/light/1", 1, 0);
+ oc_resource_bind_resource_type(res, "oic.r.light");
+ oc_resource_bind_resource_interface(res, OC_IF_RW);
+ oc_resource_set_default_interface(res, OC_IF_RW);
+
+ oc_resource_set_discoverable(res);
+ oc_resource_set_periodic_observable(res, 1);
+ oc_resource_set_request_handler(res, OC_GET, app_get_light);
+ oc_resource_set_request_handler(res, OC_PUT, app_set_light);
+ oc_add_resource(res);
+
+ hal_gpio_init_out(LED_BLINK_PIN, 1);
+}
+#endif
+
+/**
+ * main
+ *
+ * The main task for the project. This function initializes the packages, calls
+ * init_tasks to initialize additional tasks (and possibly other objects),
+ * then starts serving events from default event queue.
+ *
+ * @return int NOTE: this function should never return!
+ */
+int
+main(int argc, char **argv)
+{
+#ifdef ARCH_sim
+ mcu_sim_parse_args(argc, argv);
+#endif
+
+#ifndef ARCH_sim
+ {
+ /*
+ * XXX set mac address when using STM32 ethernet XXX
+ * XXX move this somewhere else XXX
+ */
+ static uint8_t mac[6]= { 0, 1, 1, 2, 2, 3 };
+ int stm32_eth_set_hwaddr(uint8_t *addr);
+ stm32_eth_set_hwaddr(mac);
+ }
+#endif
+
+ sysinit();
+
+ console_printf("iptest\n");
+
+ cbmem_init(&cbmem, cbmem_buf, MAX_CBMEM_BUF);
+ log_register("log", &my_log, &log_cbmem_handler, &cbmem, LOG_SYSLEVEL);
+
+ conf_load();
+
+ shell_cmd_register(&net_test_cmd);
+
+ /*
+ * As the last thing, process events from default event queue.
+ */
+ while (1) {
+ os_eventq_run(os_eventq_dflt_get());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/39ad85d2/apps/iptest/syscfg.yml
----------------------------------------------------------------------
diff --git a/apps/iptest/syscfg.yml b/apps/iptest/syscfg.yml
new file mode 100644
index 0000000..b24891c
--- /dev/null
+++ b/apps/iptest/syscfg.yml
@@ -0,0 +1,45 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Package: apps/iptest
+
+syscfg.defs:
+ BUILD_WITH_OIC:
+ description: 'needed?'
+ value: 0
+
+syscfg.vals:
+ # Enable the shell task.
+ SHELL_TASK: 1
+
+ # Include names for statistics.
+ STATS_NAMES: 1
+
+ # Log reboot messages to a flash circular buffer.
+ REBOOT_LOG_FCB: 1
+ LOG_FCB: 1
+
+ CONFIG_FCB: 1
+
+ # Enable shell commands.
+ STATS_CLI: 1
+ LOG_CLI: 1
+ CONFIG_CLI: 1
+
+ ETH_0: 1
+