bump for next release

pull/1074/head
Rick V 4 years ago
parent 8e9842f4b2
commit 9b0ec0935a
No known key found for this signature in database
GPG Key ID: C0EDC8723FDC3465

@ -206,7 +206,7 @@ llarp_fd_promise_wait_for_value(struct llarp_fd_promise *promise);
struct llarp_tun_io struct llarp_tun_io
{ {
// TODO: more info? // TODO: more info?
char ifaddr[128]; char ifaddr[128];
// windows only // windows only
uint32_t dnsaddr; uint32_t dnsaddr;
int netmask; int netmask;

@ -99,6 +99,6 @@ struct win32_tun_io
tuntap_destroy(tunif); tuntap_destroy(tunif);
} }
}; };
#endif #endif
#endif #endif

@ -37,8 +37,8 @@ namespace llarp
, m_Resolver(std::make_shared< dns::Proxy >( , m_Resolver(std::make_shared< dns::Proxy >(
r->netloop(), r->logic(), r->netloop(), r->logic(), this)) r->netloop(), r->logic(), r->netloop(), r->logic(), this))
, m_Name(name) , m_Name(name)
, m_Tun{{0}, 0, 0, {0}, nullptr, nullptr, nullptr, , m_Tun{{0}, 0, 0, {0}, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr} nullptr, nullptr, nullptr, nullptr, nullptr, nullptr}
, m_LocalResolverAddr("127.0.0.1", 53) , m_LocalResolverAddr("127.0.0.1", 53)
, m_InetToNetwork(name + "_exit_rx", r->netloop(), r->netloop()) , m_InetToNetwork(name + "_exit_rx", r->netloop(), r->netloop())

@ -217,7 +217,7 @@ namespace llarp
resolverAddr = v.substr(0, pos); resolverAddr = v.substr(0, pos);
dnsport = std::atoi(v.substr(pos + 1).c_str()); 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 // this field is ignored on all other platforms
tunif->dnsaddr = m_LocalResolverAddr.ton(); tunif->dnsaddr = m_LocalResolverAddr.ton();
llarp::LogInfo(Name(), " binding DNS server to ", m_LocalResolverAddr); llarp::LogInfo(Name(), " binding DNS server to ", m_LocalResolverAddr);

@ -37,10 +37,10 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.6.4")] [assembly: AssemblyVersion("0.7.0")]
[assembly: AssemblyFileVersion("0.6.4")] [assembly: AssemblyFileVersion("0.7.0")]
#if DEBUG #if DEBUG
[assembly: AssemblyInformationalVersion("0.6.4-dev-{chash:8}")] [assembly: AssemblyInformationalVersion("0.7.0-dev-{chash:8}")]
#else #else
[assembly: AssemblyInformationalVersion("0.6.4 (RELEASE_CODENAME)")] [assembly: AssemblyInformationalVersion("0.7.0 (RELEASE_CODENAME)")]
#endif #endif

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Lokinet" #define MyAppName "Lokinet"
#define MyAppVersion "0.6.4" #define MyAppVersion "0.7.0"
#define MyAppPublisher "Loki Project" #define MyAppPublisher "Loki Project"
#define MyAppURL "https://lokinet.org" #define MyAppURL "https://lokinet.org"
#define MyAppExeName "lokinetui.exe" #define MyAppExeName "lokinetui.exe"
@ -38,18 +38,18 @@ OutputDir={#DevPath}win32-setup
OutputBaseFilename=lokinet-win32 OutputBaseFilename=lokinet-win32
Compression=lzma2/ultra64 Compression=lzma2/ultra64
SolidCompression=yes SolidCompression=yes
VersionInfoVersion=0.6.4 VersionInfoVersion=0.7.0
VersionInfoCompany=Loki Project VersionInfoCompany=Loki Project
VersionInfoDescription=Lokinet for Microsoft® Windows® NT™ VersionInfoDescription=Lokinet for Microsoft® Windows® NT™
#ifndef RELEASE #ifndef RELEASE
VersionInfoTextVersion=0.6.4-dev-{#VCSRev} VersionInfoTextVersion=0.7.0-dev-{#VCSRev}
VersionInfoProductTextVersion=0.6.4-dev-{#VCSRev} VersionInfoProductTextVersion=0.7.0-dev-{#VCSRev}
#else #else
VersionInfoTextVersion=0.6.4 VersionInfoTextVersion=0.7.0
VersionInfoProductTextVersion=0.6.4 ({#Codename}) VersionInfoProductTextVersion=0.7.0 ({#Codename})
#endif #endif
VersionInfoProductName=Lokinet VersionInfoProductName=Lokinet
VersionInfoProductVersion=0.6.4 VersionInfoProductVersion=0.7.0
InternalCompressLevel=ultra64 InternalCompressLevel=ultra64
MinVersion=0,5.0 MinVersion=0,5.0
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64

Loading…
Cancel
Save