implement callback functions, same way as the sync msg callback functions

server/json-adapter.cc

@@ -524,6 +524,11 @@ struct JsonAdapter::Internal
 	PEP_SESSION sync_session = nullptr;
 	ThreadPtr   sync_thread{nullptr, ThreadDeleter};
 	
+	// keyserver lookup
+	locked_queue< pEp_identity*, &free_identity> keyserver_lookup_queue;
+	PEP_SESSION keyserver_lookup_session = nullptr;
+	ThreadPtr   ksl_thread{nullptr, ThreadDeleter};
+	
 	Internal(std::ostream& logger) : Log(logger) {}
 	
 	static
@@ -586,6 +591,12 @@ struct JsonAdapter::Internal
 		return 0;
 	}
 	
+	int injectIdentity(pEp_identity* idy)
+	{
+		keyserver_lookup_queue.push_back(idy);
+		return 0;
+	}
+	
 	void* retrieveNextSyncMsg(time_t* timeout)
 	{
 		const std::chrono::milliseconds timeout_ms(1000*long(*timeout)); 
@@ -599,6 +610,11 @@ struct JsonAdapter::Internal
 		return msg;
 	}
 	
+	pEp_identity* retrieveNextIdentity()
+	{
+		return keyserver_lookup_queue.pop_front();
+	}
+	
 	void* syncThreadRoutine(void* arg)
 	{
 		PEP_STATUS status = do_sync_protocol(sync_session, arg); // does the whole work
@@ -683,6 +699,20 @@ void JsonAdapter::stopSync()
 }
 
 
+int JsonAdapter::examineIdentity(pEp_identity* idy, void* obj)
+{
+	JsonAdapter* ja = static_cast<JsonAdapter*>(obj);
+	return ja->i->injectIdentity(idy);
+}
+
+
+pEp_identity* JsonAdapter::retrieveNextIdentity(void* obj)
+{
+	JsonAdapter* ja = static_cast<JsonAdapter*>(obj);
+	return ja->i->retrieveNextIdentity();
+}
+
+
 JsonAdapter::JsonAdapter(const std::string& address, unsigned start_port, unsigned end_port, bool silent, bool do_sync)
 : i(new Internal( silent ? nulllogger : std::cerr ))
 {

server/json-adapter.hh

@@ -60,12 +60,15 @@ public:
 
 	// BEWARE: msg is 1st parameter, obj is second!!!
 	static int injectSyncMsg(void* msg, void* obj);
-	static void *retrieveNextSyncMsg(void* obj, time_t* timeout);
-	static void *syncThreadRoutine(void* arg);
+	static void* retrieveNextSyncMsg(void* obj, time_t* timeout);
+	static void* syncThreadRoutine(void* arg);
 	
 	void startSync(void);
 	void stopSync(void);
 	
+	static int examineIdentity(pEp_identity*, void* obj);
+	static pEp_identity* retrieveNextIdentity(void* obj);
+	
 	// returns the associated log stream (either std::cerr or nulllogger)
 	std::ostream& Log() const;