aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2018-01-26 08:30:44 -0800
committerGravatar GitHub <noreply@github.com>2018-01-26 08:30:44 -0800
commit77474d46adb69ffb4f899c072e5ab33fa4754018 (patch)
tree1164b67a4129b15d9d4a2100ab548f379de99059 /src/core
parent75c190ddd39db674744c387580c1f85b14c4509b (diff)
parentd36fe0708b90491252ce4d192621f36fb39ab2b7 (diff)
Merge pull request #13820 from yihuazhang/rename-gts
Rename GTS to ALTS for TSI plugin
Diffstat (limited to 'src/core')
-rw-r--r--src/core/plugin_registry/grpc_cronet_plugin_registry.cc8
-rw-r--r--src/core/plugin_registry/grpc_plugin_registry.cc8
-rw-r--r--src/core/tsi/alts_transport_security.cc (renamed from src/core/tsi/gts_transport_security.cc)26
-rw-r--r--src/core/tsi/alts_transport_security.h (renamed from src/core/tsi/gts_transport_security.h)14
4 files changed, 29 insertions, 27 deletions
diff --git a/src/core/plugin_registry/grpc_cronet_plugin_registry.cc b/src/core/plugin_registry/grpc_cronet_plugin_registry.cc
index 101e29c481..fe5eb28f05 100644
--- a/src/core/plugin_registry/grpc_cronet_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_cronet_plugin_registry.cc
@@ -26,8 +26,8 @@ void grpc_deadline_filter_init(void);
void grpc_deadline_filter_shutdown(void);
void grpc_client_channel_init(void);
void grpc_client_channel_shutdown(void);
-void grpc_tsi_gts_init(void);
-void grpc_tsi_gts_shutdown(void);
+void grpc_tsi_alts_init(void);
+void grpc_tsi_alts_shutdown(void);
void grpc_server_load_reporting_plugin_init(void);
void grpc_server_load_reporting_plugin_shutdown(void);
@@ -40,8 +40,8 @@ void grpc_register_built_in_plugins(void) {
grpc_deadline_filter_shutdown);
grpc_register_plugin(grpc_client_channel_init,
grpc_client_channel_shutdown);
- grpc_register_plugin(grpc_tsi_gts_init,
- grpc_tsi_gts_shutdown);
+ grpc_register_plugin(grpc_tsi_alts_init,
+ grpc_tsi_alts_shutdown);
grpc_register_plugin(grpc_server_load_reporting_plugin_init,
grpc_server_load_reporting_plugin_shutdown);
}
diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc
index 89be351785..fdf9acc09c 100644
--- a/src/core/plugin_registry/grpc_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_plugin_registry.cc
@@ -22,8 +22,8 @@ void grpc_http_filters_init(void);
void grpc_http_filters_shutdown(void);
void grpc_chttp2_plugin_init(void);
void grpc_chttp2_plugin_shutdown(void);
-void grpc_tsi_gts_init(void);
-void grpc_tsi_gts_shutdown(void);
+void grpc_tsi_alts_init(void);
+void grpc_tsi_alts_shutdown(void);
void grpc_deadline_filter_init(void);
void grpc_deadline_filter_shutdown(void);
void grpc_client_channel_init(void);
@@ -58,8 +58,8 @@ void grpc_register_built_in_plugins(void) {
grpc_http_filters_shutdown);
grpc_register_plugin(grpc_chttp2_plugin_init,
grpc_chttp2_plugin_shutdown);
- grpc_register_plugin(grpc_tsi_gts_init,
- grpc_tsi_gts_shutdown);
+ grpc_register_plugin(grpc_tsi_alts_init,
+ grpc_tsi_alts_shutdown);
grpc_register_plugin(grpc_deadline_filter_init,
grpc_deadline_filter_shutdown);
grpc_register_plugin(grpc_client_channel_init,
diff --git a/src/core/tsi/gts_transport_security.cc b/src/core/tsi/alts_transport_security.cc
index 2b099773c4..ddd75cbd02 100644
--- a/src/core/tsi/gts_transport_security.cc
+++ b/src/core/tsi/alts_transport_security.cc
@@ -16,25 +16,27 @@
*
*/
-#include "src/core/tsi/gts_transport_security.h"
+#include "src/core/tsi/alts_transport_security.h"
#include <string.h>
-static gts_shared_resource g_gts_resource;
+static alts_shared_resource g_alts_resource;
-gts_shared_resource* gts_get_shared_resource(void) { return &g_gts_resource; }
+alts_shared_resource* alts_get_shared_resource(void) {
+ return &g_alts_resource;
+}
-void grpc_tsi_gts_init() {
- memset(&g_gts_resource, 0, sizeof(gts_shared_resource));
- gpr_mu_init(&g_gts_resource.mu);
+void grpc_tsi_alts_init() {
+ memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
+ gpr_mu_init(&g_alts_resource.mu);
}
-void grpc_tsi_gts_shutdown() {
- gpr_mu_destroy(&g_gts_resource.mu);
- if (g_gts_resource.cq == nullptr) {
+void grpc_tsi_alts_shutdown() {
+ gpr_mu_destroy(&g_alts_resource.mu);
+ if (g_alts_resource.cq == nullptr) {
return;
}
- grpc_completion_queue_destroy(g_gts_resource.cq);
- grpc_channel_destroy(g_gts_resource.channel);
- gpr_thd_join(g_gts_resource.thread_id);
+ grpc_completion_queue_destroy(g_alts_resource.cq);
+ grpc_channel_destroy(g_alts_resource.channel);
+ gpr_thd_join(g_alts_resource.thread_id);
}
diff --git a/src/core/tsi/gts_transport_security.h b/src/core/tsi/alts_transport_security.h
index 23b2b66fb3..c90e31478e 100644
--- a/src/core/tsi/gts_transport_security.h
+++ b/src/core/tsi/alts_transport_security.h
@@ -16,22 +16,22 @@
*
*/
-#ifndef GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H
-#define GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H
+#ifndef GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H
+#define GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H
#include <grpc/grpc.h>
#include <grpc/support/sync.h>
#include <grpc/support/thd.h>
-typedef struct gts_shared_resource {
+typedef struct alts_shared_resource {
gpr_thd_id thread_id;
grpc_channel* channel;
grpc_completion_queue* cq;
gpr_mu mu;
-} gts_shared_resource;
+} alts_shared_resource;
-/* This method returns the address of gts_shared_resource object shared by all
+/* This method returns the address of alts_shared_resource object shared by all
* TSI handshakes. */
-gts_shared_resource* gts_get_shared_resource(void);
+alts_shared_resource* alts_get_shared_resource(void);
-#endif /* GRPC_CORE_TSI_GTS_TRANSPORT_SECURITY_H */
+#endif /* GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H */