Skip to content
Permalink
Browse files

build 13.2.9

  • Loading branch information...
licobc committed Sep 30, 2019
1 parent b22e9d0 commit 85bf95a7da914504d09e7f13ecd0fda884495953
Showing with 29 additions and 9 deletions.
  1. +6 −0 changelog
  2. +1 −1 configure.ac
  3. +2 −2 doc/build-windows.md
  4. +2 −0 src/init.cpp
  5. +18 −6 src/net.cpp
@@ -1,3 +1,9 @@
kore (0.13.2.9) stable; urgency=medium
* only works for testnet
* adding obf4path, so obfuscation works with react gui

-- Kore <dev@kore.com> Wed, 30 Sep 2019 14:00:00 -0300

kore (0.13.2.8) stable; urgency=medium
* only works for testnet
* Fixing listunspent optional parameters
@@ -3,7 +3,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 13)
define(_CLIENT_VERSION_REVISION, 2)
define(_CLIENT_VERSION_BUILD, 8)
define(_CLIENT_VERSION_BUILD, 9)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)
AC_INIT([Kore Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.kore.org],[kore])
@@ -95,7 +95,7 @@ Once the source code is ready the build steps are below.
make HOST=x86_64-w64-mingw32
cd ..
./autogen.sh # not required when building from tarball
CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ --disable-tests --enable-tor-browser
CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ --disable-tests --enable-tor-browser
make
## Building for 32-bit Windows
@@ -123,7 +123,7 @@ Then build using:
make HOST=i686-w64-mingw32
cd ..
./autogen.sh # not required when building from tarball
CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/ --disable-tests --enable-tor-browser
CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/ --prefix=/ --disable-tests --enable-tor-browser
make

## Creating an installer for Windows
@@ -402,6 +402,8 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-timeout=<n>", strprintf(_("Specify connection timeout in milliseconds (minimum: 1, default: %d)"), DEFAULT_CONNECT_TIMEOUT));
strUsage += HelpMessageOpt("-torcontrol=<ip>:<port>", strprintf(_("Tor control port to use if onion listening enabled (default: %s)"), DEFAULT_TOR_CONTROL));
strUsage += HelpMessageOpt("-torpassword=<pass>", _("Tor control port password (default: empty)"));
strUsage += HelpMessageOpt("-obfs4", _("Enable Tor Obfuscation Plugin - obfs4"));
strUsage += HelpMessageOpt("-obfs4path=<path>", _("Tor obfs4proxy path (default: current directory). Only if obfs4 is enabled"));
#ifdef USE_UPNP
#if USE_UPNP
strUsage += HelpMessageOpt("-upnp", _("Use UPnP to map the listening port (default: 1 when listening)"));
@@ -1324,6 +1324,7 @@ std::string GetObfs4TransportPlugin(fs::path &tor_directory)
std::string clientTransportPlugin = "";
bool obfs4 = GetBoolArg("-obfs4", false);
if (obfs4) {
std::string obfs4path = GetArg("-obfs4path", ".");
#ifdef WIN32
if (stat("obfs4proxy.exe", &sb) == 0 && sb.st_mode & S_IXUSR) {
char obfs4proxyPath[MAX_PATH] = {0};
@@ -1333,14 +1334,25 @@ std::string GetObfs4TransportPlugin(fs::path &tor_directory)
string directory;
const size_t last_slash_idx = obfs4Str.rfind('\\');
directory = obfs4Str.substr(0, last_slash_idx);
clientTransportPlugin = "obfs4 exec " + directory + "\\" + "obfs4proxy.exe" + " -enableLogging=true -logLevel DEBUG managed";
LogPrintf("Transport Plug obfs4: %s \n", directory + "\\" + "obfs4proxy");
}
clientTransportPlugin = "obfs4 exec " + directory + "\\" + "obfs4proxy.exe" + " -enableLogging=true -logLevel DEBUG managed";
LogPrintf("Transport Plugin obfs4: %s \n", directory + "\\" + "obfs4proxy.exe");
} else if (stat((obfs4path + "\\obfs4proxy.exe").c_str(), &sb) == 0 && sb.st_mode & S_IXUSR) {
// lets try to find the obfsproxy from the parameter or current directory
clientTransportPlugin = "obfs4 exec " + obfs4path + "\\" + "obfs4proxy.exe" + " -enableLogging=true -logLevel DEBUG managed";
LogPrintf("Transport Plugin obfs4: %s \n", obfs4path + "\\" + "obfs4proxy.exe");
} else {
LogPrintf("Attention Attention, Couldn't find obfs4proxy plugin \n");
LogPrintf("Please check your installation. \n");
}
#else
if ((stat("/usr/local/share/kore/obfs4proxy", &sb) == 0 && sb.st_mode & S_IXUSR) || !std::system("which obfs4proxy")) {
LogPrintf("Attention Attention!!! \n Using external obfs4proxy as ClientTransportPlugin.\nSpecify bridges in %s\n", tor_directory);
if ((stat("/usr/local/share/kore/obfs4proxy", &sb) == 0 && sb.st_mode & S_IXUSR)) {
LogPrintf("Transport Plugin /usr/local/share/kore/obfs4proxy as ClientTransportPlugin.\nSpecify bridges at %s\n", tor_directory);
clientTransportPlugin = "obfs4 exec /usr/local/share/kore/obfs4proxy -enableLogging=true -logLevel DEBUG managed";
} else {
} else if ((stat((obfs4path + "/obfs4proxy").c_str(), &sb) == 0 && sb.st_mode & S_IXUSR)) {
LogPrintf("Transport Plugin %s/obfs4proxy as ClientTransportPlugin.\nSpecify bridges at %s\n", obfs4path, tor_directory);
clientTransportPlugin = "obfs4 exec " + obfs4path + "/obfs4proxy -enableLogging=true -logLevel DEBUG managed";
}
else {
LogPrintf("Attention Attention, Couldn't find obfs4proxy plugin \n");
LogPrintf("Please check your installation. \n");
}

0 comments on commit 85bf95a

Please sign in to comment.
You can’t perform that action at this time.