Diff: main.cpp

Revision:

7:d2c5894dcd5e

Parent:

5:6adec9967f93

Child:

8:f7d1fb34d71b

--- a/main.cpp	Tue Feb 18 01:11:28 2014 +0000
+++ b/main.cpp	Tue Feb 18 01:50:19 2014 +0000
@@ -13,12 +13,20 @@
 #include "sn_coap_header.h"
 #include "sn_coap_protocol.h"
 #include "sn_nsdl_lib.h"
+#include "sn_grs.h"
 #include <stdint.h>
 
 using namespace mts;
 
 Cellular* cellular;
 Endpoint nsp;
+static const char* NSP_ADDRESS = "208.111.39.209"; /* demo NSP, web interface at http://nanoservice-demo.mbed.org*/ 
+static const int NSP_PORT = 5683;
+char endpoint_name[] = {"mbed-multitech"};
+uint8_t ep_type[] = {"mbed_lpc1768_appboard"};
+uint8_t lifetime_ptr[] = {"60"};
+
+typedef uint8_t (*sn_grs_dyn_res_callback_t)(sn_coap_hdr_s *, sn_nsdl_addr_s *, sn_proto_info_s *);
 
 // ****************************************************************************
 // Cellular initialization
@@ -70,7 +78,7 @@
 {
     nsp.set_address(NSP_ADDRESS, NSP_PORT);
     
-//    DEBUG("name: %s", endpoint_name);
+    DEBUG("EP Name: %s", endpoint_name);
     DEBUG("NSP Location: coap://%s:%d\n", NSP_ADDRESS, NSP_PORT);
     
     // Bind the port
@@ -97,9 +105,9 @@
 
 static uint8_t tx_cb(sn_nsdl_capab_e protocol, uint8_t *data_ptr, uint16_t data_len, sn_nsdl_addr_s *address_ptr)
 {
-    DEBUG("TX callback!\n\rSending %d bytes", data_len);
+    DEBUG("TX callback! Sending %d bytes", data_len);
 
-    if(cellular->write((char*)data_ptr, data_len, -1) != data_len)
+    if(cellular->write((char*)data_ptr, (int)data_len, -1) != data_len)
         DEBUG("sending failed");
 
     return 1;
@@ -111,8 +119,65 @@
     return 0;
 }
 
+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 (NULL == endpoint_structure)
+    {   
+        endpoint_structure = (sn_nsdl_ep_parameters_s*)nsdl_alloc(sizeof(sn_nsdl_ep_parameters_s));
+    }
+    if (endpoint_structure)
+    {
+        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)
+    {
+        nsdl_free(*endpoint_structure);
+        *endpoint_structure = NULL;
+    }
+}
+
 void nsdl_init()
 {
+    uint8_t nsp_addr[4];
     sn_nsdl_mem_s memory_cbs;
     memory_cbs.sn_nsdl_alloc = &nsdl_alloc;
     memory_cbs.sn_nsdl_free = &nsdl_free;
@@ -121,16 +186,75 @@
     } else {
         DEBUG("libNsdl init done");
     }
+    /* Set nsp address for library */
+    set_NSP_address(nsp_addr, 5683, SN_NSDL_ADDRESS_TYPE_IPV4);
+}
+
+static int create_resources()
+{
+    sn_nsdl_resource_info_s *resource_ptr = NULL;
+    sn_nsdl_ep_parameters_s *endpoint_ptr = NULL;
+    
+    DEBUG("Creating resources");
+
+    /* Create resources */
+    resource_ptr = (sn_nsdl_resource_info_s*)nsdl_alloc(sizeof(sn_nsdl_resource_info_s));
+    if(!resource_ptr)
+        return 0;
+    memset(resource_ptr, 0, sizeof(sn_nsdl_resource_info_s));
+
+    resource_ptr->resource_parameters_ptr = (sn_nsdl_resource_parameters_s*)nsdl_alloc(sizeof(sn_nsdl_resource_parameters_s));
+    if(!resource_ptr->resource_parameters_ptr)
+    {
+        nsdl_free(resource_ptr);
+        return 0;
+    }
+    memset(resource_ptr->resource_parameters_ptr, 0, sizeof(sn_nsdl_resource_parameters_s));
+
+    // Static resources
+    nsdl_create_static_resource(resource_ptr, sizeof("3/0/0")-1, (uint8_t*) "3/0/0", 0, 0,  (uint8_t*) "ARM", sizeof("ARM")-1);
+    nsdl_create_static_resource(resource_ptr, sizeof("3/0/1")-1, (uint8_t*) "3/0/1", 0, 0,  (uint8_t*) "LPC1768 App Board", sizeof("LPC1768 App Board")-1);
+    nsdl_create_static_resource(resource_ptr, sizeof("3/0/16")-1, (uint8_t*) "3/0/16", 0, 0,  (uint8_t*) "U", sizeof("U")-1);
+
+    // Dynamic resources
+    // create_light_resource(resource_ptr);
+    // create_gps_resource(resource_ptr);
+
+    /* Register with NSP */
+    endpoint_ptr = nsdl_init_register_endpoint(endpoint_ptr, (uint8_t*)endpoint_name, ep_type, lifetime_ptr);
+    if(sn_nsdl_register_endpoint(endpoint_ptr) != 0) {
+        DEBUG("NSP registering failed\r\n");
+    } else {
+        DEBUG("NSP registering OK\r\n");
+    }
+    nsdl_clean_register_endpoint(&endpoint_ptr);
+
+    nsdl_free(resource_ptr->resource_parameters_ptr);
+    nsdl_free(resource_ptr);
+    return 1;
+}
+
+void nsp_register()
+{
+    sn_nsdl_ep_parameters_s *endpoint_ptr = NULL;
+
+        endpoint_ptr = nsdl_init_register_endpoint(endpoint_ptr, (uint8_t*)endpoint_name, ep_type, lifetime_ptr);
+        if(sn_nsdl_register_endpoint(endpoint_ptr) != 0) {
+            DEBUG("NSP re-registration failed\r\n");
+        } else {
+            DEBUG("NSP re-registration OK\r\n");
+        }
+        nsdl_clean_register_endpoint(&endpoint_ptr);
 }
 
 void socket_event_loop()
 {
-    //sn_nsdl_addr_s received_packet_address;
-    //uint8_t received_address[4];
+    sn_nsdl_addr_s received_packet_address;
+    uint8_t received_address[4];
     char buffer[2048];
 
-    //memset(&received_packet_address, 0, sizeof(sn_nsdl_addr_s));
-    //received_packet_address.addr_ptr = received_address; 
+    memset(&received_packet_address, 0, sizeof(sn_nsdl_addr_s));
+    received_packet_address.addr_ptr = received_address; 
 
     DEBUG("Starting socket read loop...");
     while(1)
@@ -143,7 +267,7 @@
         else
         {   
             DEBUG("Received %d bytes\r\n", n);
-            //sn_nsdl_process_coap((uint8_t*)buffer, n, &received_packet_address);
+            sn_nsdl_process_coap((uint8_t*)buffer, n, &received_packet_address);
         }
     }
 }
@@ -161,6 +285,9 @@
     
     // Initalize NanoService library
     nsdl_init();
+
+    // Create resources
+    create_resources(); 
      
     // Start socket listening loop
     socket_event_loop();