Merge pull request #241 from despair86/dev

add testnet bootstrap for lokinet on windows

contrib/lokinet-bootstrap-winnt/Makefile

@@ -21,31 +21,43 @@ WINNT_LIBS ?=
 
 # windows target only
 .c.o:
-	$(CC) $(WINNT_INCLUDE) -Ofast -march=core2 -mfpmath=sse $< -c
+	$(CC) $(WINNT_INCLUDE) -Iinclude -Ofast -march=nocona -mfpmath=sse $< -c
 
 zpipe: zpipe.c miniz.c
-	$(NATIVE_CC) $(INCLUDE) $(LIBS) $^ -s -static -o $@
+	$(NATIVE_CC) $(INCLUDE) -Iinclude $(LIBS) $^ -s -static -o $@
 
 base64enc: base64enc.c
-	$(NATIVE_CC) $(INCLUDE) $(LIBS) $^ -s -static -o $@ -lmbedx509 -lmbedtls -lmbedcrypto
+	$(NATIVE_CC) $(INCLUDE) -Iinclude $(LIBS) $^ -s -static -o $@ -lmbedx509 -lmbedtls -lmbedcrypto
 
 download:
 	wget -O ./cacert.pem https://curl.haxx.se/ca/cacert.pem
 
+# I *think* this only work with GNU sed...
 prepare: zpipe base64enc download
 	./zpipe < cacert.pem > data.enc
 	./base64enc < data.enc > out.bin
 	sed -ie "s/.\{76\}/&\n/g" out.bin
 	sed -i 's/.*/\"&\"/g' out.bin
-	sed -i '49,2192d' bootstrap.c
+	sed -i '51,2258d' bootstrap.c
 	echo ';' >> out.bin
-	sed -i '48r out.bin' bootstrap.c
+	sed -i '50r out.bin' bootstrap.c
+
+prepare-testnet: zpipe base64enc download
+	./zpipe < cacert.pem > data.enc
+	./base64enc < data.enc > out.bin
+	sed -ie "s/.\{76\}/&\n/g" out.bin
+	sed -i 's/.*/\"&\"/g' out.bin
+	sed -i '49,2135d' testnet.c
+	echo ';' >> out.bin
+	sed -i '48r out.bin' testnet.c
 
 lokinet-bootstrap: bootstrap.o miniz.o
 	$(CC) $(WINNT_LIBS) -static -s $^ -o $@.exe -lmbedx509 -lmbedtls -lmbedcrypto -lws2_32
 
+lokinet-bootstrap-testnet: testnet.o miniz.o
+	$(CC) $(WINNT_LIBS) -static -s $^ -o $@.exe -lmbedx509 -lmbedtls -lmbedcrypto -lws2_32
 clean:
-	-@rm lokinet-bootstrap.exe
+	-@rm lokinet*.exe
 	-@rm base64enc
 	-@rm zpipe
 	-@rm cacert.pem

contrib/lokinet-bootstrap-winnt/README.md

@@ -18,18 +18,18 @@ native build:
     $ export WINNT_INCLUDE=$INCLUDE WINNT_LIBS=$LIBS
     $ make prepare;make lokinet-bootstrap
 
-cross-compile build:
+cross-compile build (If you have *GNU* sed, you can also update the certificate trust store with `make prepare`):
 
     $ export INCLUDE=/usr/local/include LIBS=/usr/local/lib # or a different path
     $ export CC=i686-w64-mingw32-gcc # change these if you use clang, make sure these are in your system $PATH!
     $ export NATIVE_CC=cc
     $ export WINNT_INCLUDE=/path/to/win32/headers WINNT_LIBS=/path/to/win32/libs
-    $ make prepare;make lokinet-bootstrap
+    $ make lokinet-bootstrap
 
 # Usage
 
-   C:\>lokinet-bootstrap [uri] [local download path]
+    C:\>lokinet-bootstrap [uri] [local download path]
 
 this is also included in the lokinet installer package.
 
--despair86
+-rick

win32-setup/lokinet-win32.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "loki-network"
-#define MyAppVersion "0.3.1"
+#define MyAppVersion "0.4.0"
 #define MyAppPublisher "Loki Project"
 #define MyAppURL "https://loki.network"
 #define MyAppExeName "lokinet.exe"
@@ -32,13 +32,13 @@ OutputDir={#DevPath}win32-setup
 OutputBaseFilename=lokinet-win32
 Compression=lzma
 SolidCompression=yes
-VersionInfoVersion=0.3.1
+VersionInfoVersion=0.4.0
 VersionInfoCompany=Loki Project
 VersionInfoDescription=lokinet for windows
-VersionInfoTextVersion=0.3.1-dev
+VersionInfoTextVersion=0.4.0-dev
 VersionInfoProductName=loki-network
-VersionInfoProductVersion=0.3.1
-VersionInfoProductTextVersion=0.3.1-dev
+VersionInfoProductVersion=0.4.0
+VersionInfoProductTextVersion=0.4.0-dev
 InternalCompressLevel=ultra64
 MinVersion=0,5.0
 ArchitecturesInstallIn64BitMode=x64
@@ -144,7 +144,7 @@ Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Descr
 Filename: "{tmp}\7z.exe"; Parameters: "x tuntapv9.7z"; WorkingDir: "{app}"; Flags: runascurrentuser waituntilterminated skipifdoesntexist; Description: "extract TUN/TAP-v9 driver"; StatusMsg: "Extracting driver..."; OnlyBelowVersion: 0, 6.0
 Filename: "{tmp}\7z.exe"; Parameters: "x tuntapv9_n6.7z"; WorkingDir: "{app}"; Flags: runascurrentuser waituntilterminated skipifdoesntexist; Description: "extract TUN/TAP-v9 driver"; StatusMsg: "Extracting driver..."; MinVersion: 0, 6.0
 Filename: "{tmp}\7z.exe"; Parameters: "x inet6.7z"; WorkingDir: "{app}"; Flags: skipifdoesntexist runascurrentuser waituntilterminated skipifdoesntexist; Description: "extract inet6 driver"; StatusMsg: "Extracting IPv6 driver..."; MinVersion: 0, 5.0; OnlyBelowVersion: 0, 5.1
-Filename: "{tmp}\lokinet-bootstrap.exe"; WorkingDir: "{app}"; Flags: runascurrentuser waituntilterminated; Description: "bootstrap dht"; StatusMsg: "Downloading initial RC..."
+Filename: "{tmp}\lokinet-bootstrap.exe"; Parameters:"https://i2p.rocks/bootstrap.signed %APPDATA%\.lokinet\bootstrap.signed"; WorkingDir: "{app}"; Flags: runascurrentuser waituntilterminated; Description: "bootstrap dht"; StatusMsg: "Downloading initial RC..."
 ; then ask to install drivers
 Filename: "{app}\tap-windows-9.9.2\install.bat"; WorkingDir: "{app}\tap-windows-9.9.2\"; Flags: runascurrentuser waituntilterminated skipifdoesntexist; Description: "Install TUN/TAP-v9 driver"; StatusMsg: "Installing driver..."; OnlyBelowVersion: 0, 6.0;  Check: not FileExists(ExpandConstant('{sys}\drivers\tap0901.sys'))
 Filename: "{app}\tap-windows-9.21.2\install.bat"; WorkingDir: "{app}\tap-windows-9.21.2\"; Flags: runascurrentuser waituntilterminated skipifdoesntexist; Description: "Install TUN/TAP-v9 driver"; StatusMsg: "Installing driver..."; MinVersion: 0, 6.0;  Check: not FileExists(ExpandConstant('{sys}\drivers\tap0901.sys'))