simplify the code

Signed-off-by: wangbaiping/wbpcode <[email protected]>

Author: wangbaiping/wbpcode

include/proxy-wasm/null_plugin.h

@@ -31,6 +31,7 @@ struct NullPluginRegistry {
   void (*proxy_abi_version_0_1_0_)() = nullptr;
   void (*proxy_abi_version_0_2_0_)() = nullptr;
   void (*proxy_abi_version_0_2_1_)() = nullptr;
+  void (*proxy_abi_version_0_3_0_)() = nullptr;
   void (*proxy_on_log_)(uint32_t context_id) = nullptr;
   uint32_t (*proxy_validate_configuration_)(uint32_t root_context_id,
                                             uint32_t plugin_configuration_size) = nullptr;

src/context.cc

@@ -322,18 +322,13 @@ FilterHeadersStatus ContextBase::onRequestHeaders(uint32_t headers, bool end_of_
 
   AbiVersion wasm_abi_version = wasm_->abi_version_;
   uint64_t result{};
-  switch (wasm_abi_version) {
-  case AbiVersion::ProxyWasm_0_1_0:
+
+  if (wasm_->abi_version_ == AbiVersion::ProxyWasm_0_1_0) {
+    // For ProxyWasm_0_1_0.
     result = wasm_->on_request_headers_abi_01_(this, id_, headers);
-    break;
-  case AbiVersion::ProxyWasm_0_2_0:
-  case AbiVersion::ProxyWasm_0_2_1:
-  case AbiVersion::ProxyWasm_0_3_0:
+  } else {
+    // For ProxyWasm_0_2_0, ProxyWasm_0_2_1, or ProxyWasm_0_3_0.
     result = wasm_->on_request_headers_(this, id_, headers, static_cast<uint32_t>(end_of_stream));
-    break;
-  case AbiVersion::Unknown:
-    assert(false); // Should never reach here.
-    return FilterHeadersStatus::Continue;
   }
 
   CHECK_FAIL_HTTP(FilterHeadersStatus::Continue, FilterHeadersStatus::StopAllIterationAndWatermark);
@@ -383,18 +378,13 @@ FilterHeadersStatus ContextBase::onResponseHeaders(uint32_t headers, bool end_of
 
   AbiVersion wasm_abi_version = wasm_->abi_version_;
   uint64_t result{};
-  switch (wasm_abi_version) {
-  case AbiVersion::ProxyWasm_0_1_0:
+
+  if (wasm_->abi_version_ == AbiVersion::ProxyWasm_0_1_0) {
+    // For ProxyWasm_0_1_0.
     result = wasm_->on_response_headers_abi_01_(this, id_, headers);
-    break;
-  case AbiVersion::ProxyWasm_0_2_0:
-  case AbiVersion::ProxyWasm_0_2_1:
-  case AbiVersion::ProxyWasm_0_3_0:
+  } else {
+    // For ProxyWasm_0_2_0, ProxyWasm_0_2_1, or ProxyWasm_0_3_0.
     result = wasm_->on_response_headers_(this, id_, headers, static_cast<uint32_t>(end_of_stream));
-    break;
-  case AbiVersion::Unknown:
-    assert(false); // Should never reach here.
-    return FilterHeadersStatus::Continue;
   }
 
   CHECK_FAIL_HTTP(FilterHeadersStatus::Continue, FilterHeadersStatus::StopAllIterationAndWatermark);

src/wasm.cc

@@ -140,18 +140,17 @@ void WasmBase::registerCallbacks() {
   FOR_ALL_HOST_FUNCTIONS(_REGISTER_PROXY);
 
   if (abiVersion() == AbiVersion::ProxyWasm_0_1_0) {
+    // For ProxyWasm_0_1_0.
     _REGISTER_PROXY(get_configuration);
     _REGISTER_PROXY(continue_request);
     _REGISTER_PROXY(continue_response);
     _REGISTER_PROXY(clear_route_cache);
   } else if (abiVersion() == AbiVersion::ProxyWasm_0_2_0) {
+    // For ProxyWasm_0_2_0.
     _REGISTER_PROXY(continue_stream);
     _REGISTER_PROXY(close_stream);
-  } else if (abiVersion() == AbiVersion::ProxyWasm_0_2_1) {
-    _REGISTER_PROXY(continue_stream);
-    _REGISTER_PROXY(close_stream);
-    _REGISTER_PROXY(get_log_level);
-  } else if (abiVersion() == AbiVersion::ProxyWasm_0_3_0) {
+  } else {
+    // For ProxyWasm_0_2_1 or ProxyWasm_0_3_0.
     _REGISTER_PROXY(continue_stream);
     _REGISTER_PROXY(close_stream);
     _REGISTER_PROXY(get_log_level);
@@ -198,14 +197,11 @@ void WasmBase::getFunctions() {
   FOR_ALL_MODULE_FUNCTIONS(_GET_PROXY);
 
   if (abiVersion() == AbiVersion::ProxyWasm_0_1_0) {
+    // For ProxyWasm_0_1_0.
     _GET_PROXY_ABI(on_request_headers, _abi_01);
     _GET_PROXY_ABI(on_response_headers, _abi_01);
-  } else if (abiVersion() == AbiVersion::ProxyWasm_0_2_0 ||
-             abiVersion() == AbiVersion::ProxyWasm_0_2_1) {
-    _GET_PROXY(on_request_headers);
-    _GET_PROXY(on_response_headers);
-    _GET_PROXY(on_foreign_function);
-  } else if (abiVersion() == AbiVersion::ProxyWasm_0_3_0) {
+  } else {
+    // For ProxyWasm_0_2_0, ProxyWasm_0_2_1, or ProxyWasm_0_3_0.
     _GET_PROXY(on_request_headers);
     _GET_PROXY(on_response_headers);
     _GET_PROXY(on_foreign_function);