Commit Graph

4842 Commits

Author SHA1 Message Date
orignal
56dd0db001
Merge pull request #1066 from PurpleI2P/revert-1065-openssl
Revert " Fixes for #1024 , #1018 #1064 "
2018-01-22 13:00:15 -05:00
orignal
626ed720a6
Revert " Fixes for #1024 , #1018 #1064 " 2018-01-22 12:59:34 -05:00
orignal
b8fd9ba83f
Merge pull request #1065 from unlnown542a/openssl
Fixes for #1024 , #1018 #1064
2018-01-22 07:08:34 -05:00
unlnown542a
316a4457af Merge github.com:unlnown542a/i2pd into openssl 2018-01-22 01:39:51 +03:00
unlnown542a
347a2c2150 fixing conflicts 2018-01-22 01:30:21 +03:00
orignal
42d3770b14
fixed layout 2018-01-21 11:28:16 -05:00
orignal
39ca07bcc6
Merge pull request #1058 from majestrate/streaming_race_fix_2018_01_15
Streaming race fix 2018 01 15
2018-01-21 11:15:44 -05:00
orignal
914566ece0 removed unused Java router certificates 2018-01-21 10:27:41 -05:00
orignal
f537e7b2c6 removed unused cert 2018-01-21 08:09:01 -05:00
Jeff Becker
06020b8f54
re-enable packet pool 2018-01-20 13:06:08 -05:00
orignal
b486d1cd27
rollback
non buildable under x64
2018-01-20 12:07:57 -05:00
Jeff Becker
b3b38015c2
check max buffer size in Stream::Send 2018-01-20 07:31:58 -05:00
unlnown542a
4c6988e3bc code cleanup 2018-01-18 19:35:37 +03:00
unlnown542a
0bd4db4cc7 less lines 2018-01-18 16:41:02 +03:00
unlnown542a
bc72800fef moved hard code into java side and successfully passed back to native 2018-01-17 20:58:56 +03:00
yangfl
951f8972c7 replace non-working CheckLibcxxAtomic 2018-01-17 16:12:46 +08:00
Jeff
38b694a055
Merge pull request #1060 from inetic/openssl
Inherit _publicly_ from shared_from_this in I2PService
2018-01-15 11:58:27 -05:00
Jeff
44a9c3ca0c
Merge pull request #1059 from K1773R/fix-headers-rn
removed redundant \r\n in HTTP header builder
2018-01-15 10:36:42 -05:00
K1773R
6bf823fb15 removed \r\n in header builder which was redundant and caused the further headers to be ignored 2018-01-15 16:30:01 +01:00
Jeff Becker
43a751ee0b
Merge remote-tracking branch 'purple/openssl' into streaming_race_fix_2018_01_15 2018-01-15 08:25:58 -05:00
Jeff Becker
207212557e
fix sam race conditions 2018-01-15 08:19:57 -05:00
R4SAS
fd1aeeac92
Merge pull request #1045 from yangfl/upstream
code cleanup
2018-01-13 18:11:19 +03:00
yangfl
50ba52756f fix mixing tabs and spaces 2018-01-13 22:51:02 +08:00
Peter Jankuliak
e630b8f8a8 Inherit _publicly_ from shared_from_this in I2PService 2018-01-12 11:04:26 +01:00
unlnown542a
cf5081d300 fixed creating certificates.zip when target zip did not include the directory certificates, so they were bein unpacked into datadir. Added entryCompression ZipEntryCompression.STORED since final APK is being compressed as well. Put all custom tasks under android plugin definitions 2018-01-07 19:30:32 +03:00
unlnown542a
8864cbf80a return to strdup() when filling argv[] for i2p::android::start(argc,argv).c_str() 2018-01-07 00:40:17 +03:00
unknown542a
81d7a832c0 netDB and certificates in internal storage 2018-01-07 00:08:07 +03:00
unknown542a
d41fabbc9f netDB and certificates in internal storage 2018-01-06 23:59:22 +03:00
yangfl
46f62e1af9 remove trailing whitespaces 2018-01-06 22:24:03 +08:00
Jeff
b91efaa973
Merge pull request #1044 from yangfl/upstream
update Makefile and CMakeLists
2018-01-06 09:22:11 -05:00
yangfl
e3238ff75c CMakeLists: autodetect libatomic 2018-01-06 22:06:44 +08:00
yangfl
9cc4e8d03a Makefile: get target platform from compiler 2018-01-06 22:06:28 +08:00
Jeff Becker
68b1afa2df
Merge remote-tracking branch 'purple/openssl' into i2cp-session-reconfig 2018-01-04 08:33:06 -05:00
orignal
34c98e03c1 Merge branch 'openssl' of https://github.com/PurpleI2P/i2pd into openssl 2018-01-03 12:53:05 -05:00
orignal
41e40bbc0d fixed typo 2018-01-03 12:52:29 -05:00
Jeff Becker
80149342f2
proper bounds check 2018-01-03 10:02:11 -05:00
Jeff Becker
1967dee50c
don't recreate tunnels of different size 2018-01-02 12:59:16 -05:00
Jeff Becker
ab80def94b
use reference instead of copy 2018-01-02 12:06:10 -05:00
Jeff Becker
254bf313a2
fix previous commit 2018-01-02 11:48:38 -05:00
Jeff Becker
938d5d901a
implement i2cp session reconfigure 2018-01-02 11:34:58 -05:00
Jeff Becker
7b00d828b2
fix lambda capture, don't capture copy 2018-01-01 09:35:32 -05:00
orignal
ca49944c85
Merge pull request #1041 from majestrate/fix-streaming-race
fix race condition
2018-01-01 09:26:21 -05:00
Jeff Becker
d5e9fc7677
fix race condition 2018-01-01 08:28:42 -05:00
orignal
6db7c5733d use outbound.nickname as tunnel name if inbound.nickname is not set 2017-12-20 11:38:35 -05:00
orignal
418f86ecbd
Merge pull request #1039 from majestrate/fix-arm-compile-latomic
Fix arm compile latomic
2017-12-20 10:48:45 -05:00
Jeff Becker
c68c5af856
fix lib name 2017-12-20 08:56:39 -05:00
Jeff Becker
950dffbe06
update gitignore 2017-12-20 08:54:41 -05:00
Jeff Becker
5d557003b6
include cmake stuff 2017-12-20 08:54:02 -05:00
Jeff Becker
3b8c3c1346
try fixing issue #897 2017-12-20 08:49:47 -05:00
orignal
1853263f6c
Merge pull request #1038 from PurpleI2P/master
Master
2017-12-18 08:59:19 -05:00