Fixes

Signed-off-by: Rohit Agrawal <[email protected]>

Author: agrawroh

source/extensions/dynamic_modules/abi_version.h

@@ -1,24 +1,14 @@
 #pragma once
-
 #ifdef __cplusplus
-extern "C" {
+namespace Envoy {
+namespace Extensions {
+namespace DynamicModules {
 #endif
-
 // This is the ABI version calculated as a sha256 hash of the ABI header files. When the ABI
 // changes, this value must change, and the correctness of this value is checked by the test.
 const char* kAbiVersion = "671102aad648320f21c53d1c04aa9780d1d2668e3e63e8a993d30a9029a168e4";
 
 #ifdef __cplusplus
-} // extern "C"
-
-namespace Envoy {
-namespace Extensions {
-namespace DynamicModules {
-namespace AbiVersion {
-// For C++ code, also provide the version in the namespace.
-constexpr const char kAbiVersion[] =
-    "671102aad648320f21c53d1c04aa9780d1d2668e3e63e8a993d30a9029a168e4";
-} // namespace AbiVersion
 } // namespace DynamicModules
 } // namespace Extensions
 } // namespace Envoy

source/extensions/dynamic_modules/dynamic_modules.cc

@@ -17,7 +17,7 @@ constexpr char DYNAMIC_MODULES_SEARCH_PATH[] = "ENVOY_DYNAMIC_MODULES_SEARCH_PAT
 
 absl::StatusOr<DynamicModulePtr>
 newDynamicModule(const std::filesystem::path& object_file_absolute_path, const bool do_not_close,
-                 const bool load_globally) {
+  const bool load_globally) {
   // From the man page of dlopen(3):
   //
   // > This can be used to test if the object is already resident (dlopen() returns NULL if it
@@ -31,15 +31,10 @@ newDynamicModule(const std::filesystem::path& object_file_absolute_path, const b
     // loaded module. We don't need to call the init function again.
     return std::make_unique<DynamicModule>(handle);
   }
+  // RTLD_LOCAL is always needed to avoid collisions between multiple modules.
   // RTLD_LAZY is required for not only performance but also simply to load the module, otherwise
   // dlopen results in Invalid argument.
-  int mode = RTLD_LAZY;
-  if (load_globally) {
-    mode |= RTLD_GLOBAL;
-  } else {
-    // RTLD_LOCAL is used by default to avoid collisions between multiple modules.
-    mode |= RTLD_LOCAL;
-  }
+  int mode = RTLD_LOCAL | RTLD_LAZY;
   if (do_not_close) {
     mode |= RTLD_NODELETE;
   }
@@ -65,9 +60,9 @@ newDynamicModule(const std::filesystem::path& object_file_absolute_path, const b
         absl::StrCat("Failed to initialize dynamic module: ", object_file_absolute_path.c_str()));
   }
   // Checks the kAbiVersion and the version of the dynamic module.
-  if (absl::string_view(abi_version) != absl::string_view(AbiVersion::kAbiVersion)) {
-    return absl::InvalidArgumentError(absl::StrCat("ABI version mismatch: got ", abi_version,
-                                                   ", but expected ", AbiVersion::kAbiVersion));
+  if (absl::string_view(abi_version) != absl::string_view(kAbiVersion)) {
+    return absl::InvalidArgumentError(
+        absl::StrCat("ABI version mismatch: got ", abi_version, ", but expected ", kAbiVersion));
   }
   return dynamic_module;
 }

source/extensions/dynamic_modules/sdk/rust/build.rs

@@ -18,6 +18,7 @@ fn main() {
   println!("cargo:rerun-if-changed=abi.h");
   let bindings = bindgen::Builder::default()
     .header("../../abi.h")
+    .header("../../abi_version.h")
     .clang_arg("-v")
     .default_enum_style(bindgen::EnumVariation::Rust {
       non_exhaustive: false,