From f88e0a6ce7d99480f36a37c1219786928cf6ea66 Mon Sep 17 00:00:00 2001 From: ELIN Date: Tue, 8 Mar 2016 18:58:13 +0000 Subject: [PATCH] reduce binary size. --- README.md | 11 +- softethervpn/Makefile | 4 + softethervpn/patches/102-mod-minimize.patch | 280 ++++++++++++++++++++ 3 files changed, 292 insertions(+), 3 deletions(-) create mode 100644 softethervpn/patches/102-mod-minimize.patch diff --git a/README.md b/README.md index e63780d..7944504 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ SoftEther VPN for OpenWrt = -Your router is if ar71xx or brcm47xx, You do not need build steps. +Your router is if ar71xx or brcm47xx, You do not need build steps. You can get binary package from http://b.mikomoe.jp/. If need compile for OpenWrt 12.09, See old [README.MD](https://github.com/el1n/OpenWRT-package-softether/blob/7dc4c4ce19da9aa7dc2330e2dbbdc4d3e4dd4fcc/README.md). -See [Alberts00](https://github.com/Alberts00)'s blog if you want more detailed guide. +See [Alberts00](https://github.com/Alberts00)'s blog if you want more detailed guide. Also you can download SE4WRT Chaos Calmer(15.05) build from his website. -If you are japanese or could read japanese, Visit [my blog](http://elin.mikomoe.jp/index.php?entry=OpenWRT%E3%81%A7SoftEther-VPN%E3%82%92%E5%8B%95%E3%81%8B%E3%81%99). +If you are japanese or could read japanese, Visit [my blog](http://elin.mikomoe.jp/index.php?entry=OpenWRT%E3%81%A7SoftEther-VPN%E3%82%92%E5%8B%95%E3%81%8B%E3%81%99). Since this entry too old, i recommend read this README.MD if possible. Note @@ -19,6 +19,11 @@ Note Binary has function of vpnserver/vpnclient/vpnbridge/vpncmd like busybox now. Uninstall all the SoftEther VPN packages if you will update from old version. ++ WebUI is no longer available for Mar 8, 2016 or later version. ++ Languages except english no longer available for Mar 8, 2016 or later version. ++ pdf file no longer contain when generate a sample configuration file for openvpn for Mar 8, 2016 or later version. +New package size is smaller from 1.8MB to 1.1MB at these changes. + Compile and Install - 1. Install the packages required to compile diff --git a/softethervpn/Makefile b/softethervpn/Makefile index ad339db..a06bdb8 100644 --- a/softethervpn/Makefile +++ b/softethervpn/Makefile @@ -59,6 +59,10 @@ define Build/Compile -f src/makefiles/linux_32bit.mak \ clean + rm -fr $(PKG_BUILD_DIR)/src/bin/hamcore/*_cn.* + rm -fr $(PKG_BUILD_DIR)/src/bin/hamcore/*_ja.* + rm -fr $(PKG_BUILD_DIR)/src/bin/hamcore/openvpn_readme.pdf + rm -fr $(PKG_BUILD_DIR)/src/bin/hamcore/webui/ make \ -C $(PKG_BUILD_DIR) \ -f src/makefiles/linux_32bit.mak \ diff --git a/softethervpn/patches/102-mod-minimize.patch b/softethervpn/patches/102-mod-minimize.patch new file mode 100644 index 0000000..c786e11 --- /dev/null +++ b/softethervpn/patches/102-mod-minimize.patch @@ -0,0 +1,280 @@ +diff -crN a/src/bin/hamcore/languages.txt b/src/bin/hamcore/languages.txt +*** a/src/bin/hamcore/languages.txt 2016-03-06 13:08:52.000000000 +0000 +--- b/src/bin/hamcore/languages.txt 2016-03-08 16:29:02.708560880 +0000 +*************** +*** 2,8 **** + # Copyright (c) SoftEther Corporation. All Rights Reserved + + # 番号 識別子 英語表記 ローカル表記 Windowsロケール番号 UNIXロケール文字一覧 +! 0 ja Japanese 日本語 1041 ja,jp,sjis,shift_jis,euc +! 1 en English English 1033 en,us,c +! 2 cn Simplified_Chinese 简体中文 2052,4100,1028,3076,5124 zh,cn,tw,hkg,mac,sg,chi +! +--- 2,5 ---- + # Copyright (c) SoftEther Corporation. All Rights Reserved + + # 番号 識別子 英語表記 ローカル表記 Windowsロケール番号 UNIXロケール文字一覧 +! 0 en English English 1033 en,us,c +diff -crN a/src/Cedar/Admin.c b/src/Cedar/Admin.c +*** a/src/Cedar/Admin.c 2016-03-06 13:08:37.000000000 +0000 +--- b/src/Cedar/Admin.c 2016-03-08 16:07:31.233562016 +0000 +*************** +*** 1054,1060 **** + ZIP_PACKER *p; + FIFO *f; + BUF *readme_buf; +! BUF *readme_pdf_buf; + BUF *sample_buf; + OPENVPN_SSTP_CONFIG config; + LIST *port_list; +--- 1054,1060 ---- + ZIP_PACKER *p; + FIFO *f; + BUF *readme_buf; +! //BUF *readme_pdf_buf; + BUF *sample_buf; + OPENVPN_SSTP_CONFIG config; + LIST *port_list; +*************** +*** 1085,1091 **** + readme_buf = ReadDump("|openvpn_readme.txt"); + + // readme.pdf +! readme_pdf_buf = ReadDump("|openvpn_readme.pdf"); + + // sample.ovpn + sample_buf = ReadDump("|openvpn_sample.ovpn"); +--- 1085,1091 ---- + readme_buf = ReadDump("|openvpn_readme.txt"); + + // readme.pdf +! //readme_pdf_buf = ReadDump("|openvpn_readme.pdf"); + + // sample.ovpn + sample_buf = ReadDump("|openvpn_sample.ovpn"); +*************** +*** 1094,1100 **** + GetMachineHostName(my_hostname, sizeof(my_hostname)); + my_hostname[16] = 0; + +! if (readme_buf == NULL || sample_buf == NULL || readme_pdf_buf == NULL) + { + ret = ERR_INTERNAL_ERROR; + } +--- 1094,1101 ---- + GetMachineHostName(my_hostname, sizeof(my_hostname)); + my_hostname[16] = 0; + +! //if (readme_buf == NULL || sample_buf == NULL || readme_pdf_buf == NULL) +! if (readme_buf == NULL || sample_buf == NULL) + { + ret = ERR_INTERNAL_ERROR; + } +*************** +*** 1280,1286 **** + } + + ZipAddFileSimple(p, "readme.txt", LocalTime64(), 0, readme_buf->Buf, readme_buf->Size); +! ZipAddFileSimple(p, "readme.pdf", LocalTime64(), 0, readme_pdf_buf->Buf, readme_pdf_buf->Size); + + ReplaceStrEx((char *)config_l3_buf->Buf, config_l3_buf->Size, (char *)config_l3_buf->Buf, + "$TAG_TUN_TAP$", "tun", false); +--- 1281,1287 ---- + } + + ZipAddFileSimple(p, "readme.txt", LocalTime64(), 0, readme_buf->Buf, readme_buf->Size); +! //ZipAddFileSimple(p, "readme.pdf", LocalTime64(), 0, readme_pdf_buf->Buf, readme_pdf_buf->Size); + + ReplaceStrEx((char *)config_l3_buf->Buf, config_l3_buf->Size, (char *)config_l3_buf->Buf, + "$TAG_TUN_TAP$", "tun", false); +*************** +*** 1360,1366 **** + + FreeBuf(readme_buf); + FreeBuf(sample_buf); +! FreeBuf(readme_pdf_buf); + FreeBuf(x_buf); + + FreeX(dummy_x); +--- 1361,1367 ---- + + FreeBuf(readme_buf); + FreeBuf(sample_buf); +! //FreeBuf(readme_pdf_buf); + FreeBuf(x_buf); + + FreeX(dummy_x); +diff -crN a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c +*** a/src/Cedar/Cedar.c 2016-03-06 13:08:37.000000000 +0000 +--- b/src/Cedar/Cedar.c 2016-03-08 17:32:22.878555982 +0000 +*************** +*** 1336,1342 **** + return; + } + +! WuFreeWebUI(c->WebUI); + FreeCedarLayer3(c); + + /* +--- 1336,1342 ---- + return; + } + +! //WuFreeWebUI(c->WebUI); + FreeCedarLayer3(c); + + /* +*************** +*** 1762,1768 **** + + InitCedarLayer3(c); + +! c->WebUI = WuNewWebUI(c); + + #ifdef ALPHA_VERSION + beta_str = "Alpha"; +--- 1762,1768 ---- + + InitCedarLayer3(c); + +! //c->WebUI = WuNewWebUI(c); + + #ifdef ALPHA_VERSION + beta_str = "Alpha"; +diff -crN a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c +*** a/src/Cedar/Protocol.c 2016-03-06 13:08:37.000000000 +0000 +--- b/src/Cedar/Protocol.c 2016-03-08 17:28:58.985554569 +0000 +*************** +*** 6292,6297 **** +--- 6292,6298 ---- + bool b = false; + + // Show the WebUI if the configuration allow to use the WebUI ++ /* + if (c->Cedar->Server != NULL && c->Cedar->Server->UseWebUI) + { + WU_WEBPAGE *page; +*************** +*** 6307,6312 **** +--- 6308,6314 ---- + } + + } ++ */ + + if (c->FirstSock->RemoteIP.addr[0] == 127) + { +diff -crN a/src/Cedar/Server.c b/src/Cedar/Server.c +*** a/src/Cedar/Server.c 2016-03-06 13:08:37.000000000 +0000 +--- b/src/Cedar/Server.c 2016-03-08 16:13:32.025560079 +0000 +*************** +*** 5923,5929 **** + s->Eraser = NewEraser(s->Logger, CfgGetInt64(f, "AutoDeleteCheckDiskFreeSpaceMin")); + + // WebUI +! s->UseWebUI = CfgGetBool(f, "UseWebUI"); + + + // WebTimePage +--- 5923,5930 ---- + s->Eraser = NewEraser(s->Logger, CfgGetInt64(f, "AutoDeleteCheckDiskFreeSpaceMin")); + + // WebUI +! //s->UseWebUI = CfgGetBool(f, "UseWebUI"); +! s->UseWebUI = false; + + + // WebTimePage +diff -crN a/src/makefiles/linux_32bit.mak b/src/makefiles/linux_32bit.mak +*** a/src/makefiles/linux_32bit.mak 2016-03-06 13:08:37.000000000 +0000 +--- b/src/makefiles/linux_32bit.mak 2016-03-08 17:35:04.605554646 +0000 +*************** +*** 49,58 **** + + # Files + HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h src/Mayaqua/FileIO.h src/Mayaqua/intelaes/iaesni.h src/Mayaqua/Internat.h src/Mayaqua/Kernel.h src/Mayaqua/Mayaqua.h src/Mayaqua/MayaType.h src/Mayaqua/Memory.h src/Mayaqua/Microsoft.h src/Mayaqua/Network.h src/Mayaqua/Object.h src/Mayaqua/OS.h src/Mayaqua/Pack.h src/Mayaqua/pkcs11.h src/Mayaqua/pkcs11f.h src/Mayaqua/pkcs11t.h src/Mayaqua/Secure.h src/Mayaqua/Str.h src/Mayaqua/Table.h src/Mayaqua/TcpIp.h src/Mayaqua/Tick64.h src/Mayaqua/Tracking.h src/Mayaqua/TunTap.h src/Mayaqua/Unix.h src/Mayaqua/Win32.h src/Mayaqua/zlib/zconf.h src/Mayaqua/zlib/zlib.h +! HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h + OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o +! OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o +! HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css + + # Build Action + default: build +--- 49,58 ---- + + # Files + HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h src/Mayaqua/FileIO.h src/Mayaqua/intelaes/iaesni.h src/Mayaqua/Internat.h src/Mayaqua/Kernel.h src/Mayaqua/Mayaqua.h src/Mayaqua/MayaType.h src/Mayaqua/Memory.h src/Mayaqua/Microsoft.h src/Mayaqua/Network.h src/Mayaqua/Object.h src/Mayaqua/OS.h src/Mayaqua/Pack.h src/Mayaqua/pkcs11.h src/Mayaqua/pkcs11f.h src/Mayaqua/pkcs11t.h src/Mayaqua/Secure.h src/Mayaqua/Str.h src/Mayaqua/Table.h src/Mayaqua/TcpIp.h src/Mayaqua/Tick64.h src/Mayaqua/Tracking.h src/Mayaqua/TunTap.h src/Mayaqua/Unix.h src/Mayaqua/Win32.h src/Mayaqua/zlib/zconf.h src/Mayaqua/zlib/zlib.h +! HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h + OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o +! OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o +! HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_en.stb src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/warning_en.txt + + # Build Action + default: build +*************** +*** 299,307 **** + tmp/objs/Cedar/WaterMark.o: src/Cedar/WaterMark.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c src/Cedar/WaterMark.c -o tmp/objs/Cedar/WaterMark.o + +- tmp/objs/Cedar/WebUI.o: src/Cedar/WebUI.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) +- $(CC) $(OPTIONS_COMPILE) -c src/Cedar/WebUI.c -o tmp/objs/Cedar/WebUI.o +- + tmp/objs/Cedar/WinUi.o: src/Cedar/WinUi.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c src/Cedar/WinUi.c -o tmp/objs/Cedar/WinUi.o + +--- 299,304 ---- +diff -crN a/src/Mayaqua/Table.c b/src/Mayaqua/Table.c +*** a/src/Mayaqua/Table.c 2016-03-06 13:08:37.000000000 +0000 +--- b/src/Mayaqua/Table.c 2016-03-08 17:40:02.216555597 +0000 +*************** +*** 152,161 **** +--- 152,163 ---- + } + + // Read the lang.config ++ /* + if (LoadLangConfigCurrentDir(tmp, sizeof(tmp))) + { + e = GetBestLangByName(o, tmp); + } ++ */ + + os_lang = GetBestLangForCurrentEnvironment(o); + +*************** +*** 169,175 **** + goto LABEL_FATAL_ERROR; + } + +! SaveLangConfigCurrentDir(e->Name); + + Copy(¤t_lang, e, sizeof(LANGLIST)); + Copy(¤t_os_lang, os_lang, sizeof(LANGLIST)); +--- 171,177 ---- + goto LABEL_FATAL_ERROR; + } + +! //SaveLangConfigCurrentDir(e->Name); + + Copy(¤t_lang, e, sizeof(LANGLIST)); + Copy(¤t_os_lang, os_lang, sizeof(LANGLIST)); +*************** +*** 235,240 **** +--- 237,243 ---- + return e.Id; + } + ++ /* + // Write to the lang.config file in the current directory + bool SaveLangConfigCurrentDir(char *str) + { +*************** +*** 357,362 **** +--- 360,366 ---- + + return ret; + } ++ */ + + // Choose the language from the ID + LANGLIST *GetLangById(LIST *o, UINT id)