Skip to content
Snippets Groups Projects
Commit bcb8ce00 authored by Craig Tiller's avatar Craig Tiller
Browse files

Rename tsi function

parent 99b642a1
No related branches found
No related tags found
No related merge requests found
...@@ -149,7 +149,7 @@ static void on_peer_checked(grpc_exec_ctx *exec_ctx, void *user_data, ...@@ -149,7 +149,7 @@ static void on_peer_checked(grpc_exec_ctx *exec_ctx, void *user_data,
if (result != TSI_OK) { if (result != TSI_OK) {
security_handshake_done( security_handshake_done(
exec_ctx, h, exec_ctx, h,
grpc_set_tsi_error_bits( grpc_set_tsi_error_result(
GRPC_ERROR_CREATE("Frame protector creation failed"), result)); GRPC_ERROR_CREATE("Frame protector creation failed"), result));
return; return;
} }
...@@ -168,7 +168,7 @@ static void check_peer(grpc_exec_ctx *exec_ctx, grpc_security_handshake *h) { ...@@ -168,7 +168,7 @@ static void check_peer(grpc_exec_ctx *exec_ctx, grpc_security_handshake *h) {
if (result != TSI_OK) { if (result != TSI_OK) {
security_handshake_done( security_handshake_done(
exec_ctx, h, grpc_set_tsi_error_bits( exec_ctx, h, grpc_set_tsi_error_result(
GRPC_ERROR_CREATE("Peer extraction failed"), result)); GRPC_ERROR_CREATE("Peer extraction failed"), result));
return; return;
} }
...@@ -195,9 +195,9 @@ static void send_handshake_bytes_to_peer(grpc_exec_ctx *exec_ctx, ...@@ -195,9 +195,9 @@ static void send_handshake_bytes_to_peer(grpc_exec_ctx *exec_ctx,
} while (result == TSI_INCOMPLETE_DATA); } while (result == TSI_INCOMPLETE_DATA);
if (result != TSI_OK) { if (result != TSI_OK) {
security_handshake_done( security_handshake_done(exec_ctx, h,
exec_ctx, h, grpc_set_tsi_error_result(
grpc_set_tsi_error_bits(GRPC_ERROR_CREATE("Handshake failed"), result)); GRPC_ERROR_CREATE("Handshake failed"), result));
return; return;
} }
...@@ -249,9 +249,9 @@ static void on_handshake_data_received_from_peer(grpc_exec_ctx *exec_ctx, ...@@ -249,9 +249,9 @@ static void on_handshake_data_received_from_peer(grpc_exec_ctx *exec_ctx,
} }
if (result != TSI_OK) { if (result != TSI_OK) {
security_handshake_done( security_handshake_done(exec_ctx, h,
exec_ctx, h, grpc_set_tsi_error_result(
grpc_set_tsi_error_bits(GRPC_ERROR_CREATE("Handshake failed"), result)); GRPC_ERROR_CREATE("Handshake failed"), result));
return; return;
} }
......
...@@ -211,7 +211,7 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, ...@@ -211,7 +211,7 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *user_data,
if (result != TSI_OK) { if (result != TSI_OK) {
gpr_slice_buffer_reset_and_unref(ep->read_buffer); gpr_slice_buffer_reset_and_unref(ep->read_buffer);
call_read_cb(exec_ctx, ep, grpc_set_tsi_error_bits( call_read_cb(exec_ctx, ep, grpc_set_tsi_error_result(
GRPC_ERROR_CREATE("Unwrap failed"), result)); GRPC_ERROR_CREATE("Unwrap failed"), result));
return; return;
} }
...@@ -321,7 +321,7 @@ static void endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, ...@@ -321,7 +321,7 @@ static void endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep,
gpr_slice_buffer_reset_and_unref(&ep->output_buffer); gpr_slice_buffer_reset_and_unref(&ep->output_buffer);
grpc_exec_ctx_sched( grpc_exec_ctx_sched(
exec_ctx, cb, exec_ctx, cb,
grpc_set_tsi_error_bits(GRPC_ERROR_CREATE("Wrap failed"), result), grpc_set_tsi_error_result(GRPC_ERROR_CREATE("Wrap failed"), result),
NULL); NULL);
return; return;
} }
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "src/core/lib/security/transport/tsi_error.h" #include "src/core/lib/security/transport/tsi_error.h"
grpc_error *grpc_set_tsi_error_bits(grpc_error *error, tsi_result result) { grpc_error *grpc_set_tsi_error_result(grpc_error *error, tsi_result result) {
return grpc_error_set_int(grpc_error_set_str(error, GRPC_ERROR_STR_TSI_ERROR, return grpc_error_set_int(grpc_error_set_str(error, GRPC_ERROR_STR_TSI_ERROR,
tsi_result_to_string(result)), tsi_result_to_string(result)),
GRPC_ERROR_INT_TSI_CODE, result); GRPC_ERROR_INT_TSI_CODE, result);
......
...@@ -37,6 +37,6 @@ ...@@ -37,6 +37,6 @@
#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/error.h"
#include "src/core/lib/tsi/transport_security_interface.h" #include "src/core/lib/tsi/transport_security_interface.h"
grpc_error *grpc_set_tsi_error_bits(grpc_error *error, tsi_result result); grpc_error *grpc_set_tsi_error_result(grpc_error *error, tsi_result result);
#endif /* GRPC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H */ #endif /* GRPC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment