Revert "Import cronet net error list and modify grpc-cronet error message."

yulin-liang · web-flow · commit 00a5f7406fca · 2020-09-21T11:57:23.000-07:00
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
@@ -1603,8 +1603,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/cronet/transport/cronet_status.h',
                       'src/core/ext/transport/cronet/transport/cronet_transport.cc',
                       'src/core/ext/transport/cronet/transport/cronet_transport.h',
-                      'third_party/objective_c/Cronet/bidirectional_stream_c.h',
-                      'third_party/objective_c/Cronet/net_error_list.h'
+                      'third_party/objective_c/Cronet/bidirectional_stream_c.h'
   end
 
   s.subspec 'Tests' do |ss|
diff --git a/src/core/ext/transport/cronet/transport/cronet_status.cc b/src/core/ext/transport/cronet/transport/cronet_status.cc
@@ -20,15 +20,72 @@
 
 #include "src/core/ext/transport/cronet/transport/cronet_status.h"
 
-const char* cronet_net_error_as_string(cronet_net_error_code net_error) {
-  switch (net_error) {
-    case OK:
-      return "OK";
-#define NET_ERROR(label, value)  \
-  case CRONET_NET_ERROR_##label: \
-    return #label;
-#include "third_party/objective_c/Cronet/net_error_list.h"
-#undef NET_ERROR
+const char* cronet_status_as_string(cronet_status_code status) {
+  switch (status) {
+    case CRONET_STATUS_SUCCESS:
+      return "CRONET_STATUS_SUCCESS.";
+    case CRONET_STATUS_ILLEGAL_ARGUMENT:
+      return "CRONET_STATUS_ILLEGAL_ARGUMENT.";
+    case CRONET_STATUS_ILLEGAL_ARGUMENT_STORAGE_PATH_MUST_EXIST:
+      return "CRONET_STATUS_ILLEGAL_ARGUMENT_STORAGE_PATH_MUST_EXIST.";
+    case CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_PIN:
+      return "CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_PIN.";
+    case CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HOSTNAME:
+      return "CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HOSTNAME.";
+    case CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HTTP_METHOD:
+      return "CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HTTP_METHOD.";
+    case CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HTTP_HEADER:
+      return "CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HTTP_HEADER.";
+    case CRONET_STATUS_ILLEGAL_STATE:
+      return "CRONET_STATUS_ILLEGAL_STATE.";
+    case CRONET_STATUS_ILLEGAL_STATE_STORAGE_PATH_IN_USE:
+      return "CRONET_STATUS_ILLEGAL_STATE_STORAGE_PATH_IN_USE.";
+    case CRONET_STATUS_ILLEGAL_STATE_CANNOT_SHUTDOWN_ENGINE_FROM_NETWORK_THREAD:
+      return "CRONET_STATUS_ILLEGAL_STATE_CANNOT_SHUTDOWN_ENGINE_FROM_NETWORK_"
+             "THREAD.";
+    case CRONET_STATUS_ILLEGAL_STATE_ENGINE_ALREADY_STARTED:
+      return "CRONET_STATUS_ILLEGAL_STATE_ENGINE_ALREADY_STARTED.";
+    case CRONET_STATUS_ILLEGAL_STATE_REQUEST_ALREADY_STARTED:
+      return "CRONET_STATUS_ILLEGAL_STATE_REQUEST_ALREADY_STARTED.";
+    case CRONET_STATUS_ILLEGAL_STATE_REQUEST_NOT_INITIALIZED:
+      return "CRONET_STATUS_ILLEGAL_STATE_REQUEST_NOT_INITIALIZED.";
+    case CRONET_STATUS_ILLEGAL_STATE_REQUEST_ALREADY_INITIALIZED:
+      return "CRONET_STATUS_ILLEGAL_STATE_REQUEST_ALREADY_INITIALIZED.";
+    case CRONET_STATUS_ILLEGAL_STATE_REQUEST_NOT_STARTED:
+      return "CRONET_STATUS_ILLEGAL_STATE_REQUEST_NOT_STARTED.";
+    case CRONET_STATUS_ILLEGAL_STATE_UNEXPECTED_REDIRECT:
+      return "CRONET_STATUS_ILLEGAL_STATE_UNEXPECTED_REDIRECT.";
+    case CRONET_STATUS_ILLEGAL_STATE_UNEXPECTED_READ:
+      return "CRONET_STATUS_ILLEGAL_STATE_UNEXPECTED_READ.";
+    case CRONET_STATUS_ILLEGAL_STATE_READ_FAILED:
+      return "CRONET_STATUS_ILLEGAL_STATE_READ_FAILED.";
+    case CRONET_STATUS_NULL_POINTER:
+      return "CRONET_STATUS_NULL_POINTER.";
+    case CRONET_STATUS_NULL_POINTER_HOSTNAME:
+      return "CRONET_STATUS_NULL_POINTER_HOSTNAME.";
+    case CRONET_STATUS_NULL_POINTER_SHA256_PINS:
+      return "CRONET_STATUS_NULL_POINTER_SHA256_PINS.";
+    case CRONET_STATUS_NULL_POINTER_EXPIRATION_DATE:
+      return "CRONET_STATUS_NULL_POINTER_EXPIRATION_DATE.";
+    case CRONET_STATUS_NULL_POINTER_ENGINE:
+      return "CRONET_STATUS_NULL_POINTER_ENGINE.";
+    case CRONET_STATUS_NULL_POINTER_URL:
+      return "CRONET_STATUS_NULL_POINTER_URL.";
+    case CRONET_STATUS_NULL_POINTER_CALLBACK:
+      return "CRONET_STATUS_NULL_POINTER_CALLBACK.";
+    case CRONET_STATUS_NULL_POINTER_EXECUTOR:
+      return "CRONET_STATUS_NULL_POINTER_EXECUTOR.";
+    case CRONET_STATUS_NULL_POINTER_METHOD:
+      return "CRONET_STATUS_NULL_POINTER_METHOD.";
+    case CRONET_STATUS_NULL_POINTER_HEADER_NAME:
+      return "CRONET_STATUS_NULL_POINTER_HEADER_NAME.";
+    case CRONET_STATUS_NULL_POINTER_HEADER_VALUE:
+      return "CRONET_STATUS_NULL_POINTER_HEADER_VALUE";
+    case CRONET_STATUS_NULL_POINTER_PARAMS:
+      return "CRONET_STATUS_NULL_POINTER_PARAMS.";
+    case CRONET_STATUS_NULL_POINTER_REQUEST_FINISHED_INFO_LISTENER_EXECUTOR:
+      return "CRONET_STATUS_NULL_POINTER_REQUEST_FINISHED_INFO_LISTENER_"
+             "EXECUTOR.";
   }
   return "UNAVAILABLE.";
 }
diff --git a/src/core/ext/transport/cronet/transport/cronet_status.h b/src/core/ext/transport/cronet/transport/cronet_status.h
@@ -19,15 +19,41 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H
 #define GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H
 
-#include <grpc/impl/codegen/port_platform.h>
-
-enum cronet_net_error_code {
-  OK = 0,
-#define NET_ERROR(label, value) CRONET_NET_ERROR_##label = value,
-#include "third_party/objective_c/Cronet/net_error_list.h"
-#undef NET_ERROR
+/*  HTTP/2 error codes are mapped to the following cronet net error codes */
+enum cronet_status_code {
+  CRONET_STATUS_SUCCESS = 0,
+  CRONET_STATUS_ILLEGAL_ARGUMENT = -100,
+  CRONET_STATUS_ILLEGAL_ARGUMENT_STORAGE_PATH_MUST_EXIST = -101,
+  CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_PIN = -102,
+  CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HOSTNAME = -103,
+  CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HTTP_METHOD = -104,
+  CRONET_STATUS_ILLEGAL_ARGUMENT_INVALID_HTTP_HEADER = -105,
+  CRONET_STATUS_ILLEGAL_STATE = -200,
+  CRONET_STATUS_ILLEGAL_STATE_STORAGE_PATH_IN_USE = -201,
+  CRONET_STATUS_ILLEGAL_STATE_CANNOT_SHUTDOWN_ENGINE_FROM_NETWORK_THREAD = -202,
+  CRONET_STATUS_ILLEGAL_STATE_ENGINE_ALREADY_STARTED = -203,
+  CRONET_STATUS_ILLEGAL_STATE_REQUEST_ALREADY_STARTED = -204,
+  CRONET_STATUS_ILLEGAL_STATE_REQUEST_NOT_INITIALIZED = -205,
+  CRONET_STATUS_ILLEGAL_STATE_REQUEST_ALREADY_INITIALIZED = -206,
+  CRONET_STATUS_ILLEGAL_STATE_REQUEST_NOT_STARTED = -207,
+  CRONET_STATUS_ILLEGAL_STATE_UNEXPECTED_REDIRECT = -208,
+  CRONET_STATUS_ILLEGAL_STATE_UNEXPECTED_READ = -209,
+  CRONET_STATUS_ILLEGAL_STATE_READ_FAILED = -210,
+  CRONET_STATUS_NULL_POINTER = -300,
+  CRONET_STATUS_NULL_POINTER_HOSTNAME = -301,
+  CRONET_STATUS_NULL_POINTER_SHA256_PINS = -302,
+  CRONET_STATUS_NULL_POINTER_EXPIRATION_DATE = -303,
+  CRONET_STATUS_NULL_POINTER_ENGINE = -304,
+  CRONET_STATUS_NULL_POINTER_URL = -305,
+  CRONET_STATUS_NULL_POINTER_CALLBACK = -306,
+  CRONET_STATUS_NULL_POINTER_EXECUTOR = -307,
+  CRONET_STATUS_NULL_POINTER_METHOD = -308,
+  CRONET_STATUS_NULL_POINTER_HEADER_NAME = -309,
+  CRONET_STATUS_NULL_POINTER_HEADER_VALUE = -310,
+  CRONET_STATUS_NULL_POINTER_PARAMS = -311,
+  CRONET_STATUS_NULL_POINTER_REQUEST_FINISHED_INFO_LISTENER_EXECUTOR = -312,
 };
 
-const char* cronet_net_error_as_string(cronet_net_error_code net_error);
+const char* cronet_status_as_string(cronet_status_code status);
 
 #endif /* GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H */
diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc
@@ -23,7 +23,6 @@
 #include <string>
 
 #include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
 
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
@@ -164,7 +163,7 @@ struct op_state {
   bool pending_send_message = false;
   /* User requested RECV_TRAILING_METADATA */
   bool pending_recv_trailing_metadata = false;
-  cronet_net_error_code net_error = OK;
+  cronet_status_code net_error = CRONET_STATUS_SUCCESS;
   grpc_error* cancel_error = GRPC_ERROR_NONE;
   /* data structure for storing data coming from server */
   struct read_state rs;
@@ -306,14 +305,8 @@ static void read_grpc_header(stream_obj* s) {
                             s->state.rs.remaining_bytes);
 }
 
-static grpc_error* make_error_with_desc(int error_code,
-                                        int cronet_internal_error_code,
-                                        const char* desc) {
-  std::string error_message =
-      absl::StrFormat("Cronet error code:%d, Cronet error detail:%s",
-                      cronet_internal_error_code, desc);
-  grpc_error* error =
-      GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_message.c_str());
+static grpc_error* make_error_with_desc(int error_code, const char* desc) {
+  grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(desc);
   error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, error_code);
   return error;
 }
@@ -441,7 +434,7 @@ static void on_failed(bidirectional_stream* stream, int net_error) {
   gpr_mu_lock(&s->mu);
   bidirectional_stream_destroy(s->cbs);
   s->state.state_callback_received[OP_FAILED] = true;
-  s->state.net_error = static_cast<cronet_net_error_code>(net_error);
+  s->state.net_error = static_cast<cronet_status_code>(net_error);
   s->cbs = nullptr;
   if (s->header_array.headers) {
     gpr_free(s->header_array.headers);
@@ -1304,9 +1297,9 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) {
     if (stream_state->state_op_done[OP_CANCEL_ERROR]) {
       error = GRPC_ERROR_REF(stream_state->cancel_error);
     } else if (stream_state->state_callback_received[OP_FAILED]) {
-      const char* desc = cronet_net_error_as_string(stream_state->net_error);
-      error = make_error_with_desc(GRPC_STATUS_UNAVAILABLE,
-                                   stream_state->net_error, desc);
+      const char* error_message =
+          cronet_status_as_string(stream_state->net_error);
+      error = make_error_with_desc(GRPC_STATUS_UNAVAILABLE, error_message);
     } else if (oas->s->state.rs.trailing_metadata_valid) {
       grpc_chttp2_incoming_metadata_buffer_publish(
           &oas->s->state.rs.trailing_metadata,
@@ -1343,11 +1336,11 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) {
       }
     } else if (stream_state->state_callback_received[OP_FAILED]) {
       if (stream_op->on_complete) {
-        const char* desc = cronet_net_error_as_string(stream_state->net_error);
+        const char* error_message =
+            cronet_status_as_string(stream_state->net_error);
         grpc_core::ExecCtx::Run(
             DEBUG_LOCATION, stream_op->on_complete,
-            make_error_with_desc(GRPC_STATUS_UNAVAILABLE,
-                                 stream_state->net_error, desc));
+            make_error_with_desc(GRPC_STATUS_UNAVAILABLE, error_message));
       }
     } else {
       /* All actions in this stream_op are complete. Call the on_complete
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
@@ -81,8 +81,7 @@
       'src/core/ext/transport/cronet/transport/cronet_status.h',
       'src/core/ext/transport/cronet/transport/cronet_transport.cc',
       'src/core/ext/transport/cronet/transport/cronet_transport.h',
-      'third_party/objective_c/Cronet/bidirectional_stream_c.h',
-      'third_party/objective_c/Cronet/net_error_list.h'
+      'third_party/objective_c/Cronet/bidirectional_stream_c.h'
   ]
 
   grpc_cronet_files = list(sorted(grpc_cronet_extra_impl_files))
diff --git a/third_party/objective_c/Cronet/BUILD b/third_party/objective_c/Cronet/BUILD
@@ -23,6 +23,5 @@ cc_library(
     name = "cronet_c_for_grpc",
     hdrs = [
         "bidirectional_stream_c.h",
-        "net_error_list.h",
     ],
 )
diff --git a/third_party/objective_c/Cronet/net_error_list.h b/third_party/objective_c/Cronet/net_error_list.h

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,7 @@`
`81`	`81`	`'src/core/ext/transport/cronet/transport/cronet_status.h',`
`82`	`82`	`'src/core/ext/transport/cronet/transport/cronet_transport.cc',`
`83`	`83`	`'src/core/ext/transport/cronet/transport/cronet_transport.h',`
`84`		`- 'third_party/objective_c/Cronet/bidirectional_stream_c.h',`
`85`		`- 'third_party/objective_c/Cronet/net_error_list.h'`
	`84`	`+ 'third_party/objective_c/Cronet/bidirectional_stream_c.h'`
`86`	`85`	`]`
`87`	`86`
`88`	`87`	`grpc_cronet_files = list(sorted(grpc_cronet_extra_impl_files))`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,5 @@ cc_library(`
`23`	`23`	`name = "cronet_c_for_grpc",`
`24`	`24`	`hdrs = [`
`25`	`25`	`"bidirectional_stream_c.h",`
`26`		`- "net_error_list.h",`
`27`	`26`	`],`
`28`	`27`	`)`