Verified Commit b1570a27 authored by Marc Vef's avatar Marc Vef
Browse files

Added data proxy

parent c47e1f4c

.gitmodules

+1 −1
Original line number Original line Diff line number Diff line 
[submodule "external/hermes"]

[submodule "external/hermes"]

	path = external/hermes

	path = external/hermes

	url = https://github.com/bsc-ssrg/hermes.git

	url = https://github.com/marcvef/hermes.git

[submodule "external/fmt"]

[submodule "external/fmt"]

	path = external/fmt

	path = external/fmt

	url = https://github.com/fmtlib/fmt
 
	url = https://github.com/fmtlib/fmt

CMakeLists.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -214,6 +214,8 @@ check_cxx_source_compiles(" 
add_subdirectory(src/global)

add_subdirectory(src/global)

# Daemon

# Daemon

add_subdirectory(src/daemon)

add_subdirectory(src/daemon)

# Proxy

add_subdirectory(src/proxy)

# Client library

# Client library

add_subdirectory(src/client)

add_subdirectory(src/client)

hermes @ 3a542f39

Original line number Original line Diff line number Diff line 
Subproject commit 0af45bfa667f7ff9c78167ef94d975bffbd879f0
 
Subproject commit 3a542f39c5b08cb62b47747bda0edd551064c17e

include/client/env.hpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ static constexpr auto HOSTS_FILE = ADD_PREFIX("HOSTS_FILE"); 
#ifdef GKFS_ENABLE_FORWARDING

#ifdef GKFS_ENABLE_FORWARDING

static constexpr auto FORWARDING_MAP_FILE = ADD_PREFIX("FORWARDING_MAP_FILE");

static constexpr auto FORWARDING_MAP_FILE = ADD_PREFIX("FORWARDING_MAP_FILE");

#endif

#endif

static constexpr auto PROXY_PID_FILE = ADD_PREFIX("PROXY_PID_FILE");





} // namespace env

} // namespace env

} // namespace gkfs

} // namespace gkfs

include/client/preload_context.hpp

+19 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,11 @@ private: 
    std::string rpc_protocol_;

    std::string rpc_protocol_;

    bool auto_sm_{false};

    bool auto_sm_{false};





    // proxy stuff

    bool use_proxy_{false};

    std::string proxy_address_str_;

    hermes::endpoint proxy_host_;



    bool interception_enabled_;

    bool interception_enabled_;





    std::bitset<MAX_INTERNAL_FDS> internal_fds_;

    std::bitset<MAX_INTERNAL_FDS> internal_fds_;
@@ -137,6 +142,20 @@ public: 




    void auto_sm(bool auto_sm);

    void auto_sm(bool auto_sm);





    bool use_proxy() const;



    void use_proxy(bool use_proxy);



    const std::string& proxy_address_str() const;



    void proxy_address_str(const std::string& proxy_address_str);



    const hermes::endpoint& proxy_host() const;



    void proxy_host(const hermes::endpoint& proxy_host);



    void clear_proxy_host();



    RelativizeStatus relativize_fd_path(int dirfd,

    RelativizeStatus relativize_fd_path(int dirfd,

                                        const char* raw_path,

                                        const char* raw_path,

                                        std::string& relative_path,

                                        std::string& relative_path,