Commit Graph

4831 Commits

Author SHA1 Message Date
Jeff Becker
157411dcc6
Revert "fix issue #1124"
This reverts commit 29e861d1e6.
2018-02-25 08:51:07 -05:00
Jeff Becker
59672d23cc
Merge branch 'fix-issue-1124' into fix-issue-1126 2018-02-25 08:50:27 -05:00
Jeff Becker
ce30f89c60
make it compile :D 2018-02-25 08:49:39 -05:00
Jeff Becker
ce9c9411b1
fix issue #1126 2018-02-25 08:47:39 -05:00
orignal
cf0d5b616d
Merge pull request #1125 from majestrate/fix-issue-1124
fix issue #1124
2018-02-22 16:18:37 -05:00
Jeff Becker
29e861d1e6
fix issue #1124 2018-02-22 06:54:33 -05:00
orignal
c7accd4a5c
Merge pull request #1122 from majestrate/ntcp-threadpool
NTCP threadpool
2018-02-20 14:49:01 -05:00
Jeff Becker
b469080cd7
make ntcp worker threads configurable in number 2018-02-20 13:18:57 -05:00
Jeff Becker
547a0057e6
whitespace cleanup 2018-02-20 13:04:39 -05:00
Jeff Becker
b980ca4a9e
whitespace cleanup 2018-02-20 13:03:34 -05:00
Jeff Becker
098b2e968e
whitespace cleanup 2018-02-20 13:03:01 -05:00
Jeff Becker
cd59ca8376
whitespace cleanup 2018-02-20 12:59:39 -05:00
Jeff Becker
f2e6fad104
make it work 2018-02-20 12:40:28 -05:00
Jeff Becker
8d7fde0287
more 2018-02-20 11:43:13 -05:00
Jeff Becker
91fdb038d9
add threadpool for ntcp dh 2018-02-20 11:38:48 -05:00
orignal
a0188765c5
Merge pull request #1121 from majestrate/aesni-osx
More OSX fixes
2018-02-19 12:29:34 -05:00
Jeff
b970a005de don't log AESNI/AVX here 2018-02-19 10:45:13 -05:00
Jeff
b64878f4fa use std::move 2018-02-19 10:45:02 -05:00
orignal
c8936c79bf
Merge pull request #1120 from majestrate/aesni-osx
FIX AESNI build on osx with homebrew
2018-02-19 10:19:45 -05:00
Jeff
f876cc9079 update makefile 2018-02-19 10:16:48 -05:00
Jeff
a5cc2f3b5d define bit_* if not already defined 2018-02-19 10:15:39 -05:00
Jeff
9c93d6f931 Revert "define cpu_* if not set"
This reverts commit a077d7671f.
2018-02-19 10:15:26 -05:00
Jeff
a077d7671f define cpu_* if not set 2018-02-19 10:15:03 -05:00
Mikal
6485ebe9a7
Merge pull request #1119 from PurpleI2P/docker_build_badge
Added docker build badge
2018-02-18 20:24:32 +01:00
Mikal Villa
ecb6bb220a Added docker build badge 2018-02-18 20:21:19 +01:00
orignal
e3dc400d74
Merge pull request #1117 from hypnosis-i2p/openssl
fixed #1104
2018-02-17 14:49:18 -05:00
hypnosis-i2p
3bb4151074 fixed #1104 - android 2018-02-18 01:01:48 +08:00
hypnosis-i2p
1de4c2e8c6 perms prompt now doesn't show the back button - android 2018-02-18 00:25:58 +08:00
hypnosis-i2p
fbcc4f28e7 removed design lib from deps - android 2018-02-17 23:55:30 +08:00
orignal
30fb0f5a94
Merge pull request #1116 from majestrate/netbsd
NetBSD support
2018-02-17 07:22:51 -05:00
Jeff Becker
b02464990b
work around netbsd quarkyness 2018-02-16 18:54:34 -05:00
Jeff Becker
4988a32d33
make endian work with netbsd 2018-02-16 18:27:30 -05:00
orignal
b3e5874631 fixed android build error 2018-02-16 13:56:44 -05:00
orignal
f5349dcef9
Merge pull request #1115 from majestrate/aesni-avx-runtime-detect
AESNI/AVX runtime detection [WIP]
2018-02-16 12:40:28 -05:00
Jeff Becker
486a4cfdd6
add to qt 2018-02-16 12:36:51 -05:00
Jeff Becker
2277dcb069
add cpu.cpp to cmake 2018-02-16 12:34:17 -05:00
Jeff Becker
a618a01b1e
don 2018-02-16 11:26:07 -05:00
Jeff Becker
7e60069968
add uncommitted files 2018-02-16 11:01:04 -05:00
Jeff Becker
91e45d9a4a
initial code for runtime detection of aesni/avx 2018-02-16 11:00:33 -05:00
orignal
dea6fbf285
Merge pull request #1114 from majestrate/websocks-datagram
Add datagrams to websocks tunnel
2018-02-16 09:18:24 -05:00
Jeff Becker
48cc0f4289
use write 2018-02-16 08:33:19 -05:00
Jeff Becker
cdc5fce583
check port 2018-02-16 08:31:20 -05:00
Jeff Becker
b41a17d548
add datagrams to websocks 2018-02-16 08:26:46 -05:00
orignal
606cbaa519
Merge pull request #1113 from majestrate/sam-xss-fix
fix xss in webui from SAM session name
2018-02-16 07:02:55 -05:00
Jeff Becker
aaf8f527ef
fix xss in webui from SAM session name 2018-02-16 06:28:22 -05:00
orignal
b7596b7f70
Merge pull request #1112 from majestrate/dns-rebind
mitigate dns rebinding in webui
2018-02-15 09:57:16 -05:00
Jeff Becker
0309b574e8
mitigate dns rebinding in webui 2018-02-15 09:52:20 -05:00
orignal
ca057177c7
Merge pull request #1110 from radfish/PR--remove-openssl-1.1-warning
cmake: remove warning for OpenSSL 1.1
2018-02-11 14:36:03 -05:00
orignal
5d9bf18267
Merge pull request #1109 from radfish/PR--clang-stdlib-fix
cmake: add stdlib args for clang build on Linux
2018-02-11 14:35:32 -05:00
redfish
f1b8742782 cmake: remove warning for OpenSSL 1.1
Works fine.
2018-02-11 13:14:12 -05:00