diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-24 00:12:30 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-24 00:38:19 +0200 |
| commit | 23be2803662c19f73a66c82c9d5dbd62b537515f (patch) | |
| tree | 9d8afeb18c21cddcbfb9bb014f08f1474021db98 /src/core/security/secure_transport_setup.h | |
| parent | b7c2035e83a9b3e346f1fd37f9ad55c2070fb02e (diff) | |
| parent | 3afd92ff511f52db3ecf892d9af65053323c89cb (diff) | |
Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
src/cpp/client/channel.cc
vsprojects/vs2010/grpc++.vcxproj
vsprojects/vs2013/grpc++.vcxproj.filters
Diffstat (limited to 'src/core/security/secure_transport_setup.h')
| -rw-r--r-- | src/core/security/secure_transport_setup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/security/secure_transport_setup.h b/src/core/security/secure_transport_setup.h index e1f8ed7830..58701c461d 100644 --- a/src/core/security/secure_transport_setup.h +++ b/src/core/security/secure_transport_setup.h @@ -35,7 +35,7 @@ #define GRPC_INTERNAL_CORE_SECURITY_SECURE_TRANSPORT_SETUP_H #include "src/core/iomgr/endpoint.h" -#include "src/core/security/security_context.h" +#include "src/core/security/security_connector.h" /* --- Secure transport setup --- */ @@ -45,7 +45,7 @@ typedef void (*grpc_secure_transport_setup_done_cb)( grpc_endpoint *secure_endpoint); /* Calls the callback upon completion. */ -void grpc_setup_secure_transport(grpc_security_context *ctx, +void grpc_setup_secure_transport(grpc_security_connector *connector, grpc_endpoint *nonsecure_endpoint, grpc_secure_transport_setup_done_cb cb, void *user_data); |