diff --git a/llarp/ev/ev.h b/llarp/ev/ev.h index f2873f145..3cf609eb1 100644 --- a/llarp/ev/ev.h +++ b/llarp/ev/ev.h @@ -206,7 +206,7 @@ llarp_fd_promise_wait_for_value(struct llarp_fd_promise *promise); struct llarp_tun_io { // TODO: more info? - char ifaddr[128]; + char ifaddr[128]; // windows only uint32_t dnsaddr; int netmask; diff --git a/llarp/ev/ev_win32.hpp b/llarp/ev/ev_win32.hpp index 92bc5891a..000d8d12c 100644 --- a/llarp/ev/ev_win32.hpp +++ b/llarp/ev/ev_win32.hpp @@ -99,6 +99,6 @@ struct win32_tun_io tuntap_destroy(tunif); } }; - + #endif #endif diff --git a/llarp/handlers/exit.cpp b/llarp/handlers/exit.cpp index 52aa014b7..4e21214f1 100644 --- a/llarp/handlers/exit.cpp +++ b/llarp/handlers/exit.cpp @@ -37,8 +37,8 @@ namespace llarp , m_Resolver(std::make_shared< dns::Proxy >( r->netloop(), r->logic(), r->netloop(), r->logic(), this)) , m_Name(name) - , m_Tun{{0}, 0, 0, {0}, nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, nullptr} + , m_Tun{{0}, 0, 0, {0}, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr} , m_LocalResolverAddr("127.0.0.1", 53) , m_InetToNetwork(name + "_exit_rx", r->netloop(), r->netloop()) diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp index fcc7b1680..e4468ab72 100644 --- a/llarp/handlers/tun.cpp +++ b/llarp/handlers/tun.cpp @@ -217,7 +217,7 @@ namespace llarp resolverAddr = v.substr(0, pos); dnsport = std::atoi(v.substr(pos + 1).c_str()); } - m_LocalResolverAddr = llarp::Addr(resolverAddr, dnsport); + m_LocalResolverAddr = llarp::Addr(resolverAddr, dnsport); // this field is ignored on all other platforms tunif->dnsaddr = m_LocalResolverAddr.ton(); llarp::LogInfo(Name(), " binding DNS server to ", m_LocalResolverAddr); diff --git a/ui-win32/Properties/AssemblyInfo.cs b/ui-win32/Properties/AssemblyInfo.cs index 1de05ae39..94dc96ef3 100644 --- a/ui-win32/Properties/AssemblyInfo.cs +++ b/ui-win32/Properties/AssemblyInfo.cs @@ -37,10 +37,10 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.6.4")] -[assembly: AssemblyFileVersion("0.6.4")] +[assembly: AssemblyVersion("0.7.0")] +[assembly: AssemblyFileVersion("0.7.0")] #if DEBUG -[assembly: AssemblyInformationalVersion("0.6.4-dev-{chash:8}")] +[assembly: AssemblyInformationalVersion("0.7.0-dev-{chash:8}")] #else -[assembly: AssemblyInformationalVersion("0.6.4 (RELEASE_CODENAME)")] +[assembly: AssemblyInformationalVersion("0.7.0 (RELEASE_CODENAME)")] #endif \ No newline at end of file diff --git a/win32-setup/lokinet-win32.iss b/win32-setup/lokinet-win32.iss index f6818aaf1..dd4f5ec91 100644 --- a/win32-setup/lokinet-win32.iss +++ b/win32-setup/lokinet-win32.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Lokinet" -#define MyAppVersion "0.6.4" +#define MyAppVersion "0.7.0" #define MyAppPublisher "Loki Project" #define MyAppURL "https://lokinet.org" #define MyAppExeName "lokinetui.exe" @@ -38,18 +38,18 @@ OutputDir={#DevPath}win32-setup OutputBaseFilename=lokinet-win32 Compression=lzma2/ultra64 SolidCompression=yes -VersionInfoVersion=0.6.4 +VersionInfoVersion=0.7.0 VersionInfoCompany=Loki Project VersionInfoDescription=Lokinet for Microsoft® Windows® NT™ #ifndef RELEASE -VersionInfoTextVersion=0.6.4-dev-{#VCSRev} -VersionInfoProductTextVersion=0.6.4-dev-{#VCSRev} +VersionInfoTextVersion=0.7.0-dev-{#VCSRev} +VersionInfoProductTextVersion=0.7.0-dev-{#VCSRev} #else -VersionInfoTextVersion=0.6.4 -VersionInfoProductTextVersion=0.6.4 ({#Codename}) +VersionInfoTextVersion=0.7.0 +VersionInfoProductTextVersion=0.7.0 ({#Codename}) #endif VersionInfoProductName=Lokinet -VersionInfoProductVersion=0.6.4 +VersionInfoProductVersion=0.7.0 InternalCompressLevel=ultra64 MinVersion=0,5.0 ArchitecturesInstallIn64BitMode=x64