wip

3 files changed, 70 insertions, 3 deletions

diff --git a/modules/remote/c++/remote_loopback.hpp b/modules/remote/c++/remote_loopback.hpp
index 400a076..17f1bfe 100644
--- a/modules/remote/c++/remote_loopback.hpp
+++ b/modules/remote/c++/remote_loopback.hpp
@@ -81,6 +81,8 @@ public:
 	{}
 
 	// error_or<id<>>
+	conveyor<
+	> call
 };
 
 }
diff --git a/modules/remote/c++/remote_loopback_base.hpp b/modules/remote/c++/remote_loopback_base.hpp
index 660180d..9b66fa8 100644
--- a/modules/remote/c++/remote_loopback_base.hpp
+++ b/modules/remote/c++/remote_loopback_base.hpp
@@ -12,7 +12,20 @@ struct Loopback {};
 template<>
 class remote<rmt::Loopback> {
 private:
-	std::map<uint64_t, ptr<i_data_server<rmt::Loopback>>> registered_data_servers_;
+	struct key_t {
+		std::array<uint64_t,3> data;
+
+		bool operator<(const std::array<uint64_t,3>& rhs) const {
+			for(uint64_t i = 0u; i < 3; ++i){
+				if(data[i] != rhs.data[i]){
+					return data[i] < rhs.data[i];
+				}
+			}
+			return false;
+		}
+	};
+
+	std::map<key_t, ptr<i_data_server<rmt::Loopback>>> registered_data_servers_;
 public:
 	/**
 	 * Resolves an address for the remote
@@ -52,6 +65,15 @@ public:
 	 */
 	template<typename Schema, typename Encode>
 	conveyor<data_client<Schema, Encode, rmt::Loopback>> data_connect(const remote_address<rmt::Loopback>& addr){
+		auto class_id = srv.get_class_id();
+		key_t key;
+		key.data = {addr.get_address_id(), class_id.first, class_id.second};
+
+		auto find = registered_data_servers_.find(key);
+		if(find == registered_data_servers_.end()){
+			return make_error<err::not_found>("Server not found");
+		}
+
 		
 	}
 
@@ -60,11 +82,15 @@ public:
 	 */
 	error_or<void> register_data_server(const remote_address<rmt::Loopback>& addr, i_data_server<rmt::Loopback>& srv){
 
-		auto insert = registered_data_servers_.emplace(std::make_pair(addr.get_address_id(), {srv}));
+		auto class_id = srv.get_class_id();
+		key_t key;
+		key.data = {addr.get_address_id(), class_id.first, class_id.second};
+		auto insert = registered_data_servers_.emplace(std::make_pair(key, {srv}));
 		if(insert.second){
 			return make_error<err::already_exists>("Server already bound to this address");
 		}
 
+		return make_void();
 	}
 };
 }
diff --git a/modules/remote/c++/transfer_loopback.hpp b/modules/remote/c++/transfer_loopback.hpp
index d205776..55a43fa 100644
--- a/modules/remote/c++/transfer_loopback.hpp
+++ b/modules/remote/c++/transfer_loopback.hpp
@@ -12,14 +12,53 @@ struct Loopback {};
 template<>
 class remote<rmt::Loopback>;
 
+template<typename Schema, typename Encoding>
+class data_server<Schema, Encoding, rmt::Loopback> final : public i_data_server<rmt::Loopback> {
+private:
+	//typename 
+	using type = std::unordered_map<uint64_t, data<Schema, Encoding>>;
+	type values_;
+
+	ptr<remote<rmt::Loopback>> remote_;
+	remote_address<rmt::Loopback> rmt_address_;
+public:
+	data_server(ptr<remote<rmt::Loopback>> remote__, const remote_address<rmt::Loopback>& addr):
+		remote_{remote__},
+		rmt_address_{addr}
+	{
+		remote_().register_server(addr);
+	}
+
+	~data_server(){
+		remote_().deregister_server(addr);
+	}
+
+	SAW_FORBID_COPY(data_server);
+	SAW_FORBID_MOVE(data_server);
+
+	/**
+	 * Return the schema id
+	 */
+	std::pair<uint32_t,uint32_t> get_class_id() const override {
+		uint32_t schema_hash = schema_hash<Schema>::apply();
+		uint32_t encode_hash = schema_hash<Encoding>::apply();
+
+		return std::make_pair(schema_hash, encode_hash);
+	}
+};
+
 template<typename... Schema, typename Encoding>
 class data_server<tmpl_group<Schema...>, Encoding, rmt::Loopback> final : public i_data_server<rmt::Loopback> {
 private:
 	typename impl::data_server_redux<Encoding, storage::Default, typename tmpl_reduce<tmpl_group<Schema...>>::type>::type values_;
 
 	ptr<remote<rmt::Loopback>> remote_;
+	remote_address<rmt::Loopback> rmt_address_;
 public:
-	data_server(remote_address<rmt::Loopback>& addr){
+	data_server(ptr<remote<rmt::Loopback>> remote__, const remote_address<rmt::Loopback>& addr):
+		remote_{remote__},
+		rmt_address_{addr}
+	{
 		remote_().register_server(addr);
 	}