From 1fbafab9b2286e856c07751f2a548eade4d86d47 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Wed, 9 Oct 2019 09:25:29 -0400 Subject: [PATCH] remove unused file --- jni/lokinet_android.cpp | 188 ---------------------------------------- 1 file changed, 188 deletions(-) delete mode 100644 jni/lokinet_android.cpp diff --git a/jni/lokinet_android.cpp b/jni/lokinet_android.cpp deleted file mode 100644 index 4c4cc0ac4..000000000 --- a/jni/lokinet_android.cpp +++ /dev/null @@ -1,188 +0,0 @@ -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -struct AndroidMain -{ - llarp_main* m_impl = nullptr; - std::thread* m_thread = nullptr; - std::string configFile; - - /// set configuration and ensure files - bool - Configure(const char* conf, const char* basedir) - { - configFile = conf; - return llarp_ensure_config(conf, basedir, false, false); - } - - /// reload config on runtime - bool - ReloadConfig() - { - if(!m_impl) - return false; - llarp_main_signal(m_impl, SIGHUP); - return true; - } - - /// start daemon thread - bool - Start() - { - if(m_impl || m_thread) - return true; - m_impl = llarp_main_default_init(); - if(m_impl == nullptr) - return false; - if(llarp_main_setup(m_impl)) - { - llarp_main_free(m_impl); - m_impl = nullptr; - return false; - } - m_thread = new std::thread(std::bind(&AndroidMain::Run, this)); - return true; - } - - /// return true if we are running - bool - Running() const - { - return m_impl != nullptr && m_thread != nullptr; - } - - /// blocking run - void - Run() - { - llarp_main_runtime_opts opts; - if(llarp_main_run(m_impl, opts)) - { - // on error - llarp::LogError("daemon run fail"); - llarp_main* ptr = m_impl; - m_impl = nullptr; - llarp_main_signal(ptr, SIGINT); - llarp_main_free(ptr); - } - } - - void - SetVPN_FD(int rfd, int wfd) - { - (void)rfd; - (void)wfd; - // if(m_impl) - // llarp_main_inject_vpn_fd(m_impl, rfd, wfd); - } - - /// stop daemon thread - void - Stop() - { - if(m_impl) - llarp_main_signal(m_impl, SIGINT); - m_thread->join(); - delete m_thread; - m_thread = nullptr; - if(m_impl) - llarp_main_free(m_impl); - m_impl = nullptr; - } - - typedef std::unique_ptr< AndroidMain > Ptr; -}; - -static AndroidMain::Ptr daemon_ptr(new AndroidMain()); - -extern "C" -{ - JNIEXPORT jstring JNICALL - Java_network_loki_lokinet_Lokinet_1JNI_getABICompiledWith(JNIEnv* env, jclass) - { - // TODO: fixme - return env->NewStringUTF("android"); - } - - JNIEXPORT jstring JNICALL - Java_network_loki_lokinet_Lokinet_1JNI_startLokinet(JNIEnv* env, jclass, - jstring configfile) - { - if(daemon_ptr->Running()) - return env->NewStringUTF("already running"); - std::string conf; - fs::path basepath; - { - const char* nativeString = env->GetStringUTFChars(configfile, JNI_FALSE); - conf += std::string(nativeString); - env->ReleaseStringUTFChars(configfile, nativeString); - basepath = fs::path(conf).parent_path(); - } - if(daemon_ptr->Configure(conf.c_str(), basepath.string().c_str())) - { - if(daemon_ptr->Start()) - return env->NewStringUTF("ok"); - else - return env->NewStringUTF("failed to start daemon"); - } - else - return env->NewStringUTF("failed to configure daemon"); - } - - JNIEXPORT void JNICALL - Java_network_loki_lokinet_Lokinet_1JNI_stopLokinet(JNIEnv*, jclass) - { - if(daemon_ptr->Running()) - { - daemon_ptr->Stop(); - } - } - - JNIEXPORT void JNICALL - Java_network_loki_lokinet_Lokinet_1JNI_setVPNFileDescriptor(JNIEnv*, jclass, - jint rfd, - jint wfd) - { - daemon_ptr->SetVPN_FD(rfd, wfd); - } - - JNIEXPORT jstring JNICALL - Java_network_loki_lokinet_Lokinet_1JNI_getIfAddr(JNIEnv* env, jclass) - { - return env->NewStringUTF(""); - } - - JNIEXPORT jint JNICALL - Java_network_loki_lokinet_Lokinet_1JNI_getIfRange(JNIEnv*, jclass) - { - return -1; - } - - JNIEXPORT void JNICALL - Java_network_loki_lokinet_Lokinet_1JNI_onNetworkStateChanged( - JNIEnv*, jclass, jboolean isConnected) - { - if(isConnected) - { - if(!daemon_ptr->Running()) - { - if(!daemon_ptr->Start()) - { - // TODO: do some kind of callback here - } - } - } - else if(daemon_ptr->Running()) - { - daemon_ptr->Stop(); - } - } -}