Revision 0:31292d956e92, committed 2015-02-01

Comitter:

ansond

Date:

Sun Feb 01 18:24:03 2015 +0000

Child:

1:cb681dfa1678

Commit message:

revamped

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/NSDL/libnsdl_src.lib	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,1 @@
+http://developer.mbed.org/users/ansond/code/libnsdl_src/#552b2df972d3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/NSDL/nsdl_support.cpp	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,168 @@
+// NSDL library support functions
+
+#include "mbed.h"
+#include "nsdl_support.h"
+
+#include "mbedConnectorInterface.h"
+
+// we have to redefine DBG as its used differently here...
+#ifdef DBG
+    #undef DBG
+#endif
+#define DBG  printf
+
+Endpoint nsp;
+UDPSocket server;
+
+void *nsdl_alloc(uint16_t size) {
+    void *chunk = NULL;
+    if (size > 0) chunk = malloc(size);
+    if (chunk != NULL && size > 0) memset(chunk,0,size);
+    return chunk;
+}
+
+void nsdl_free(void* ptr_to_free) {
+    if (ptr_to_free != NULL) free(ptr_to_free);
+}
+
+/*
+ * Create a static resoure
+ * Only get is allowed
+ */
+void nsdl_create_static_resource(sn_nsdl_resource_info_s *resource_structure, uint16_t pt_len, uint8_t *pt, uint16_t rpp_len, uint8_t *rpp_ptr, uint8_t *rsc, uint16_t rsc_len)
+{
+    resource_structure->access = SN_GRS_GET_ALLOWED;
+    resource_structure->mode = SN_GRS_STATIC;
+    resource_structure->pathlen = pt_len;
+    resource_structure->path = pt;
+    resource_structure->resource_parameters_ptr->resource_type_len = rpp_len;
+    resource_structure->resource_parameters_ptr->resource_type_ptr = rpp_ptr;
+    resource_structure->resource = rsc;
+    resource_structure->resourcelen = rsc_len;
+    sn_nsdl_create_resource(resource_structure);
+}
+
+void nsdl_create_dynamic_resource(sn_nsdl_resource_info_s *resource_structure, uint16_t pt_len, uint8_t *pt, uint16_t rpp_len, uint8_t *rpp_ptr, uint8_t is_observable, sn_grs_dyn_res_callback_t callback_ptr, int access_right)
+{
+    resource_structure->access = (sn_grs_resource_acl_e)access_right;
+    resource_structure->resource = 0;
+    resource_structure->resourcelen = 0;
+    resource_structure->sn_grs_dyn_res_callback = callback_ptr;
+    resource_structure->mode = SN_GRS_DYNAMIC;
+    resource_structure->pathlen = pt_len;
+    resource_structure->path = pt;
+    resource_structure->resource_parameters_ptr->resource_type_len = rpp_len;
+    resource_structure->resource_parameters_ptr->resource_type_ptr = rpp_ptr;
+    resource_structure->resource_parameters_ptr->observable = is_observable;
+    sn_nsdl_create_resource(resource_structure);
+}
+
+sn_nsdl_ep_parameters_s* nsdl_init_register_endpoint(sn_nsdl_ep_parameters_s *endpoint_structure, uint8_t* name, uint8_t* typename_ptr, uint8_t *lifetime_ptr) {
+    if (endpoint_structure == NULL) {   
+        endpoint_structure = (sn_nsdl_ep_parameters_s*)nsdl_alloc(sizeof(sn_nsdl_ep_parameters_s));
+    }
+    
+    if (endpoint_structure != NULL) {
+        memset(endpoint_structure, 0, sizeof(sn_nsdl_ep_parameters_s));
+        endpoint_structure->endpoint_name_ptr = name;
+        endpoint_structure->endpoint_name_len = strlen((char*)name);
+        endpoint_structure->type_ptr = typename_ptr;
+        endpoint_structure->type_len =  strlen((char*)typename_ptr);
+        endpoint_structure->lifetime_ptr = lifetime_ptr;
+        endpoint_structure->lifetime_len =  strlen((char*)lifetime_ptr);
+    }
+    
+    return endpoint_structure;
+}
+
+void nsdl_clean_register_endpoint(sn_nsdl_ep_parameters_s **endpoint_structure) {
+    if (endpoint_structure != NULL) {
+        if (*endpoint_structure != NULL) {
+            nsdl_free(*endpoint_structure);
+            *endpoint_structure = NULL;
+        }
+    }
+}
+
+static uint8_t tx_cb(sn_nsdl_capab_e protocol, uint8_t *data_ptr, uint16_t data_len, sn_nsdl_addr_s *address_ptr) {
+    //if (m_logger != NULL) m_logger->log("NSP: sending %d bytes...",data_len);
+    int sent = server.sendTo(nsp, (char*)data_ptr, data_len);
+    return 1;
+}
+
+static uint8_t rx_cb(sn_coap_hdr_s *coap_packet_ptr, sn_nsdl_addr_s *address_ptr) {
+    // Rx callback process it...
+    return 0;
+}
+
+void register_endpoint(bool init) {
+    sn_nsdl_ep_parameters_s *endpoint_ptr = NULL;
+    endpoint_ptr = nsdl_init_register_endpoint(endpoint_ptr, (uint8_t*)NSP_address_bytes, ep_type, lifetime_ptr);
+    sn_nsdl_update_registration(endpoint_ptr);
+    nsdl_clean_register_endpoint(&endpoint_ptr);
+}
+
+void registration_update_thread(void const *args) {
+    int count = 0;
+    int registration_time = NSP_RD_UPDATE_PERIOD;      // about 2.5 minutes assuming 4 iterations/second
+    
+    // first we want to wait a bit... let the endpoint crank up...
+    Thread::wait(NSP_RD_UPDATE_PERIOD);   // wait about 150 seconds, then go ahead and start the re-registration interval...  
+                
+    // now loop this thread forever sleeping and re-registering at the right iteration.
+    while(true) {
+        Thread::wait(MAIN_LOOP_SLEEP);
+        ++count;
+        if (count%registration_time == 0) {
+            // re-registration time!
+            count = 0;
+            DBG("NSP: (re)registering...\r\n");
+            register_endpoint(false);
+            DBG("NSP: (re)registering complete.\r\n");
+        }
+    }
+}
+
+void nsdl_init() {    
+    uint8_t nsp_addr[4];
+    sn_nsdl_mem_s memory_cbs;
+    
+    /* Initialize libNsdl */
+    memset(&memory_cbs,0,sizeof(memory_cbs));
+    memset(nsp_addr,0,sizeof(nsp_addr));
+    memory_cbs.sn_nsdl_alloc = &nsdl_alloc;
+    memory_cbs.sn_nsdl_free = &nsdl_free;
+    if(sn_nsdl_init(&tx_cb, &rx_cb, &memory_cbs) == -1) {
+        DBG("NSP: libNsdl init failed\r\n");
+    }
+    else {
+        DBG("NSP: libNsdl init successfu\r\nl");
+    }
+
+    /* Set nsp address for library */
+    set_NSP_address(nsp_addr, NSP_COAP_UDP_PORT, SN_NSDL_ADDRESS_TYPE_IPV4);
+}
+
+// NSP event loop - spawn a re-registration thread AFTER we have initially registered and begun event processing...     
+void nsdl_event_loop() {    
+    sn_nsdl_addr_s received_packet_address; 
+    Endpoint from;
+    uint8_t nsp_received_address[4];
+    char nsp_buffer[1024];
+
+    memset(&received_packet_address, 0, sizeof(sn_nsdl_addr_s));
+    memset(nsp_received_address, 0, sizeof(nsp_received_address));
+    received_packet_address.addr_ptr = nsp_received_address;    
+            
+    // start the registration update thread.. it will wait a bit while the endpoint gins up...
+    Thread registration_thread(registration_update_thread);
+    
+    // FOREVER: main loop for event processing  
+    while(true) {        
+        //if (m_logger != NULL) m_logger->log("NSP: waiting for data...");
+        int n = server.receiveFrom(from,nsp_buffer,sizeof(nsp_buffer));
+
+        //if (m_logger != NULL) m_logger->log("NSP: received %d bytes... processing...",n);
+        if (n >= 0) sn_nsdl_process_coap((uint8_t*)nsp_buffer,n,&received_packet_address);        
+     }
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/NSDL/nsdl_support.h	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,53 @@
+// Support functions for the NSDL library
+
+#ifndef __NSDL_SUPPORT_H__
+#define __NSDL_SUPPORT_H__
+
+#include "mbed.h"
+#include <stdint.h>
+
+#include "sn_nsdl.h"
+#include "sn_coap_header.h"
+#include "sn_coap_protocol.h"
+#include "sn_nsdl_lib.h"
+
+#include "mbedConnectorInterface.h"
+
+// ************************* MDS CONFIGURATION *********************************
+
+extern uint8_t NSP_address_bytes[NSP_IP_ADDRESS_LENGTH];    // which MDS instance we want to bind to...
+extern uint8_t endpoint_name[NODE_NAME_LENGTH];             // our NODE name
+extern uint8_t domain_name[NSP_DOMAIN_LENGTH];              // our MDS domain name
+extern uint8_t ep_type[NSP_ENDPOINT_TYPE_LENGTH];           // our NODE type
+extern uint8_t lifetime_ptr[NSP_LIFE_TIME_LENGTH];          // MDS lifetime
+
+// ************************* MDS CONFIGURATION *********************************
+
+
+#define MAIN_LOOP_SLEEP         2000
+
+typedef uint8_t (*sn_grs_dyn_res_callback_t)(sn_coap_hdr_s *, sn_nsdl_addr_s *, sn_proto_info_s *);
+typedef void (*sn_update_observation_t)(sn_coap_hdr_s *,sn_coap_hdr_s *);
+
+// external methods
+extern "C" void *nsdl_alloc(uint16_t size);
+extern "C" void nsdl_free(void* ptr_to_free);
+extern void nsdl_create_static_resource(sn_nsdl_resource_info_s *resource_structure, uint16_t pt_len, uint8_t *pt, uint16_t rpp_len, uint8_t *rpp_ptr, uint8_t *rsc, uint16_t rsc_len);
+extern void nsdl_create_dynamic_resource(sn_nsdl_resource_info_s *resource_structure, uint16_t pt_len, uint8_t *pt, uint16_t rpp_len, uint8_t *rpp_ptr, uint8_t is_observable, sn_grs_dyn_res_callback_t callback_ptr, int access_right);
+extern "C" sn_nsdl_ep_parameters_s* nsdl_init_register_endpoint(sn_nsdl_ep_parameters_s *endpoint_structure, uint8_t *domain, uint8_t* name, uint8_t* ypename_ptr, uint8_t *lifetime_ptr);
+extern "C" void nsdl_clean_register_endpoint(sn_nsdl_ep_parameters_s **endpoint_structure);
+extern "C" void nsdl_init();
+extern "C" void nsdl_event_loop();
+extern "C" void nsdl_reg_update();
+extern "C" void configure_endpoint();
+extern void NSP_registration();
+extern "C" void register_endpoint(bool init);
+extern void registration_update_thread(void const *args);
+
+#include "EthernetInterface.h"
+#include "UDPSocket.h"
+#include "Endpoint.h"
+
+extern EthernetInterface ethernet;
+
+#endif // __NSDL_SUPPORT_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/configuration.h	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,9 @@
+#ifndef __CONFIGURATION_H_
+#define __CONFIGURATION_H_
+
+/************** Ethernet CONFIGURATION PARAMETERS  ************************/
+
+
+/************** Ethernet CONFIGURATION PARAMETERS  ************************/
+
+#endif // __CONFIGURATION_H_
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethernet_network/EthernetInterface.lib	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/EthernetInterface/#d1ccbed7687a

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethernet_network/mbed-rtos.lib	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed-rtos/#5448826aa700

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbedEndpointNetworkStubs.h	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,41 @@
+ /**
+ * @file    mbedEndpointNetworkStubs.h
+ * @brief   mbed Endpoint Network Stubs header - these must be implemented in any lower network layer interfacing with mbedConnectorInterface
+ * @author  Doug Anson
+ * @version 1.0
+ * @see     
+ *
+ * Copyright (c) 2014
+ *
+ * Licensed 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.
+ */
+ 
+ #ifndef __MBED_ENDPOINT_NETWORK_STUBS_H__
+ #define __MBED_ENDPOINT_NETWORK_STUBS_H__
+ 
+ #include "configuration.h"
+ #include "nsdl_support.h"
+ 
+ // we have to redefine DBG as its used differently here...
+ #ifdef DBG
+    #undef DBG
+ #endif
+ #define DBG  printf
+ 
+ // Linkage to the lower network APIs and interfaces
+ extern "C" void net_stubs_plumb_network(bool canActAsRouterNode);
+ extern "C" void net_stubs_create_main_loop(void);
+ extern "C" void net_stubs_register_endpoint();
+ extern "C" void net_stubs_begin_main_loop(void);
+ 
+ #endif // __MBED_ENDPOINT_NETWORK_STUBS_H__
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network_stubs/network_stubs.cpp	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,61 @@
+/**
+ * @file    network_stubs.cpp
+ * @brief   mbed Endpoint network stubs implementation (Ethernet)
+ * @author  Doug Anson
+ * @version 1.0
+ * @see     
+ *
+ * Copyright (c) 2014
+ *
+ * Licensed 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 "network_stubs.h"
+
+extern "C" {
+    
+// plumb out the network
+void net_stubs_plumb_network(bool canActAsRouterNode) 
+{
+     // ethernet initialize
+     ethernet.init();       // DHCP
+     ethernet.connect();    // connect
+     
+     // our IP address
+     DBG("Ethernet Address: %s\r\n",ethernet.getIPAddress());
+     
+     // initialize NSDL
+     registration_update_thread(NULL);
+}
+
+// create a suitable main event loop for this specific network
+void net_stubs_create_main_loop(void)
+{
+    // not used for EthernetInterface...
+    ;
+}
+
+// register the endpoint
+void net_stubs_register_endpoint(void)
+{
+    register_endpoint(true);
+}
+
+// begin the main loop for processing network events
+void net_stubs_begin_main_loop(void) 
+{
+    // NDSL main loop
+    nsdl_event_loop();
+}
+
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network_stubs/network_stubs.h	Sun Feb 01 18:24:03 2015 +0000
@@ -0,0 +1,41 @@
+/**
+ * @file    network_stubs.h
+ * @brief   mbed Endpoint Network Stubs header (Ethernet)
+ * @author  Doug Anson
+ * @version 1.0
+ * @see     
+ *
+ * Copyright (c) 2014
+ *
+ * Licensed 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.
+ */
+#ifndef __ETHERNET_STUBS_H__
+#define __ETHERNET_STUBS_H__
+
+// mbed support
+#include "mbed.h"
+
+// NSP support
+#include "nsdl_support.h"
+
+// Ethernet Interface
+#include "EthernetInterface.h"
+extern EthernetInterface ethernet;
+
+// we have to redefine DBG as its used differently here...
+#ifdef DBG
+    #undef DBG
+#endif
+#define DBG  printf
+
+#endif // __ETHERNET_STUBS_H__
\ No newline at end of file