Merge pull request #405 from murgatroid99/credentials_API_change

Update usage of modifed core credentials API

Author: murgatroid99

packages/grpc-native-core/binding.gyp

@@ -65,6 +65,8 @@
         '-Wno-unused-parameter',
         '-DOSATOMIC_USE_INLINED=1',
         '-Wno-deprecated-declarations',
+        '-Ithird_party/nanopb',
+        '-DPB_FIELD_32BIT',
         '-fvisibility=hidden',
     ],
     'ldflags': [
@@ -191,6 +193,8 @@
               '-Wno-unused-parameter',
               '-DOSATOMIC_USE_INLINED=1',
               '-Wno-deprecated-declarations',
+              '-Ithird_party/nanopb',
+              '-DPB_FIELD_32BIT',
               '-fvisibility=hidden',
           ],
           'OTHER_CPLUSPLUSFLAGS': [
@@ -202,6 +206,8 @@
               '-Wno-unused-parameter',
               '-DOSATOMIC_USE_INLINED=1',
               '-Wno-deprecated-declarations',
+              '-Ithird_party/nanopb',
+              '-DPB_FIELD_32BIT',
               '-fvisibility=hidden',
             '-stdlib=libc++',
             '-std=c++11',
@@ -623,6 +629,7 @@
         'deps/grpc/src/core/lib/channel/channel_stack.cc',
         'deps/grpc/src/core/lib/channel/channel_stack_builder.cc',
         'deps/grpc/src/core/lib/channel/channel_trace.cc',
+        'deps/grpc/src/core/lib/channel/channelz.cc',
         'deps/grpc/src/core/lib/channel/channelz_registry.cc',
         'deps/grpc/src/core/lib/channel/connected_channel.cc',
         'deps/grpc/src/core/lib/channel/handshaker.cc',
@@ -904,14 +911,15 @@
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
         'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc',
         'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc',
-        'deps/grpc/src/core/ext/census/grpc_context.cc',
+        'deps/grpc/src/cpp/ext/filters/census/grpc_context.cc',
         'deps/grpc/src/core/ext/filters/max_age/max_age_filter.cc',
         'deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc',
         'deps/grpc/src/core/ext/filters/http/client_authority_filter.cc',

packages/grpc-native-core/deps/grpc

@@ -150,7 +150,7 @@ NAN_METHOD(ChannelCredentials::CreateSsl) {
   }
   grpc_channel_credentials *creds = grpc_ssl_credentials_create(
       root_certs.get(), private_key.isAssigned() ? &key_cert_pair : NULL,
-      NULL);
+      NULL, NULL);
   if (creds == NULL) {
     info.GetReturnValue().SetNull();
   } else {

packages/grpc-native-core/ext/channel_credentials.cc

@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.13.0-dev",
+  "version": "1.14.0-dev",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",