@openziti/ziti-sdk-nodejs 0.7.0 → 0.8.0

package/src/ziti_dial.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+Copyright Netfoundry, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ limitations under the License.
 // An item that will be generated here and passed into the JavaScript on_data callback
 typedef struct OnDataItem {
 
-  uint8_t *buf;
+  const unsigned char *buf;
   int len;
 
 } OnDataItem;
@@ -139,11 +139,10 @@ static void CallJs_on_data(napi_env env, napi_value js_cb, void* context, void*
 
 
 
-
 /**
  * This function is the callback invoked by the C-SDK when data arrives on the connection.
  */
-ssize_t on_data(ziti_connection conn, uint8_t *buf, ssize_t len) {
+long on_data(struct ziti_conn *conn, const unsigned char *buf, long len) {
   napi_status status;
 
   ConnAddonData* addon_data = (ConnAddonData*) ziti_conn_data(conn);
@@ -168,7 +167,7 @@ ssize_t on_data(ziti_connection conn, uint8_t *buf, ssize_t len) {
     OnDataItem* item = memset(malloc(sizeof(*item)), 0, sizeof(*item));
     item->buf = buf;
     item->buf = calloc(1, len);
-    memcpy(item->buf, buf, len);
+    memcpy((void*)item->buf, buf, len);
     item->len = len;
 
     // if (addon_data->isWebsocket) {

package/src/ziti_enroll.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+Copyright Netfoundry, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ static void CallJs_on_enroll(napi_env env, napi_value js_cb, void* context, void
 /**
  * 
  */
-void on_ziti_enroll(ziti_config *cfg, int status, char *err, void *ctx) {
+void on_ziti_enroll(const ziti_config *cfg, int status, const char *err, void *ctx) {
 
   ZITI_NODEJS_LOG(DEBUG, "\nstatus: %d, \nerr: %s,\nctx: %p", status, err, ctx);
 

package/src/ziti_hello.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+Copyright Netfoundry, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_init.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+Copyright Netfoundry, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ static void CallJs(napi_env env, napi_value js_cb, void* context, void* data) {
     status = napi_get_undefined(env, &undefined);
 
     // Retrieve the rc created by the worker thread.
-    int rc = (int)data;
+    int64_t rc = (int64_t)data;
     status = napi_create_int64(env, (int64_t)rc, &js_rc);
     if (status != napi_ok) {
       napi_throw_error(env, NULL, "Failed to napi_create_int64");
@@ -269,7 +269,6 @@ napi_value _ziti_init(napi_env env, const napi_callback_info info) {
 
   // Create and set up the consumer thread
   if (NULL == thread_loop) {  // Spawn the loop only once
-    ZITI_NODEJS_LOG(DEBUG, "calling uv_loop_new()");
     thread_loop = uv_loop_new();
     uv_async_init(thread_loop, &async, (uv_async_cb)consumer_notify);
     uv_thread_create(&thread, (uv_thread_cb)child_thread, thread_loop);
@@ -289,6 +288,8 @@ napi_value _ziti_init(napi_env env, const napi_callback_info info) {
 
   int rc = ziti_init_opts(opts, thread_loop);
 
+  ZITI_NODEJS_LOG(DEBUG, "ziti_init_opts rc: %d", rc);
+
   status = napi_create_int32(env, rc, &jsRetval);
   if (status != napi_ok) {
     napi_throw_error(env, NULL, "Unable to create return value");