Commit Graph
470 Commits
Author SHA1 Message Date
zonyitoo 6c7b133db5 Built with miscreant 0.4.2 2019-01-25 00:34:26 +08:00
mvd-ows 36d91c68ae Prepare crate for library use (#139)
* Move all process signal monitoring out of the library

* Run plugins with tokio-process and monitor them for exit
2019-01-25 00:05:55 +08:00
Linus Färnstrand afff1982aa Misc simplification (#142)
* Remove unused addr field in Plugin struct

* Replace many Option matches with Option::map and and_then

* Rustfmt run

* Various changes suggested by clippy
2019-01-24 22:14:48 +08:00
zonyitoo b9911c888a Merged with master 2019-01-21 23:38:16 +08:00
Linus Färnstrand 988a816fa2 Apply cargo fix --edition and upgrade to 2018 (#141)
* Apply cargo fix --edition and upgrade to 2018

* Fix 2018 imports for miscreant
2019-01-21 22:33:40 +08:00
zonyitoo 15b742f4f0 [#139] Make signal monitor optional 2019-01-08 00:38:54 +08:00
zonyitoo 37f2649608 Set keep-alive with config 2019-01-06 16:52:50 +08:00
zonyitoo 592d831391 Optimized error log in local 2019-01-02 01:00:27 +08:00
zonyitoo 552af56f27 Supports -U and -u as libev version 2019-01-01 17:15:25 +08:00
zonyitoo cecc62e4b4 [#85] Supporting shadowsocks-manager reports 2019-01-01 14:56:29 +08:00
zonyitoo db04bdb36d Follows config key no_delay and mode in ss-libev 2019-01-01 02:32:20 +08:00
zonyitoo 09c622ba8e Removed logs that no body cares 2018-12-31 23:36:05 +08:00
zonyitoo 5dec63a044 Removed all global state maps, which will allow starting multiple shadowsocks instances in one process 2018-12-30 16:02:52 +08:00
zonyitoo 1e026296ae Add missing skip serialize 2018-12-30 03:43:41 +08:00
zonyitoo 3d9c40ea3d Reformatted 2018-12-30 03:42:51 +08:00
zonyitoo 8edd07c3d1 Merge branch 'feature-hjson' 2018-12-30 03:34:32 +08:00
zonyitoo 876342737e Read config with json5 2018-12-30 03:34:17 +08:00
Linus Färnstrand 92c4058be8 Don't pass around Copy types as references (#131) 2018-12-13 14:54:31 +08:00
Linus Färnstrand 2a2ff35dc2 Fix unused warning, simplify assignment (#130)
* Feature gate libsodium specific constant

* Simplifies assignment by removing one layer of (de)referencing
2018-12-13 14:50:52 +08:00
Linus Färnstrand 1024e6dbd5 Feature gate RC4 cipher (#132)
* Feature gate the RC4 cipher

* Enable RC4 cipher by default
2018-12-13 14:50:09 +08:00
zonyitoo 998f7db6c2 Removed unused function 2018-11-14 01:31:21 +08:00
Y. T. Chung 23829543e8 Removed some boxed_future calls 2018-10-01 23:15:11 +08:00
Y. T. Chung c60869aa50 Refactor some boxed futures with impl Trait
- Replaced EncryptedWriterFut and DecryptedReaderFut with impl Trait
- Replaced boxed future in try_timeout and io_timeout with a static type
- Modified rustfmt configuration, fully reformatted
2018-10-01 10:32:04 +08:00
Y. T. Chung e78c5ff6e6 Run trust-dns background resolving Future in current reactor 2018-09-24 19:12:59 +08:00
Y. T. Chung ba2cb079a9 Uses spinlock for resolver config 2018-09-23 23:13:11 +08:00
Y. T. Chung f2b402e126 [#119] Configurable DNS server 2018-09-23 17:43:47 +08:00
Meitian Huang 38b2df66fc Add set_nodelay and set_keepalive (#123)
These additions are similar to those in 271e24d, which were then
removed during the transition to futures and tokio in 5bf6560.
2018-09-23 10:33:09 +08:00
Y. T. Chung 35c69593d0 Add support of udp_timeout config 2018-09-22 22:25:17 +08:00
Y. T. Chung 171173b32c Replaced deprecated deadline() with timeout() 2018-09-01 01:48:55 +08:00
Y. T. Chung 8caac329b0 Impl trait ICE is fixed, updated dependencies 2018-09-01 01:41:44 +08:00
localhost 38a87c0376 🐛 fix dns resolve error (#122) 2018-08-07 08:58:25 +08:00
Y. T. Chung 2a688c4b62 Exit gracefully if any servers exited, bump version to v1.7.0-alpha.12 2018-07-19 09:07:34 +08:00
Y. T. Chung 0ff5c053b1 Kill process if any listener exited 2018-07-18 22:35:06 +08:00
Y. T. Chung 046f5764da Support timeout config in the outer object as the default timeout 2018-07-18 22:10:31 +08:00
Y. T. Chung c6380f5343 Find a way to bypass impl Trait build failed 2018-07-14 23:26:52 +08:00
Y. T. Chung 759fe9d3dd Uses impl Future for dns 2018-07-12 08:35:35 +08:00
Y. T. Chung 03ce21ec01 Updated deps, subprocess impls Send on Windows 2018-06-06 23:01:48 +08:00
Y. T. Chung 6091ad2a2b Optimized aead encrypt code, uses buffer space directly without copy 2018-06-03 02:23:27 +08:00
Y. T. Chung 05ab45b6ca Updated docs 2018-06-03 00:25:14 +08:00
Y. T. Chung ab79b69fdd Correctify naming of ***IetfPoly1305 2018-06-01 08:58:25 +08:00
Y. T. Chung f23d35c273 fixed bug, miscreant build 2018-05-31 23:19:47 +08:00
Y. T. Chung 1c52a4647d Add missing register in new aead encryptor/decryptor 2018-05-31 22:58:14 +08:00
Y. T. Chung b9aaadf539 Fixed #113, implemented xchacha20-ietf-poly1305, updated aead trait by combining tag into input or output buffer 2018-05-31 22:53:51 +08:00
Y. T. Chung 16cb100bd8 Travis installs libsodium with apt, test appveyor by preinstalled openssl 2018-05-31 07:53:02 +08:00
Y. T. Chung 4bdb41808d Test if subprocess Sendable Popen works in win32 2018-05-31 07:41:55 +08:00
Y. T. Chung d9ba5e8445 Fixed bug, Event on windows will spawn tasks to current executor 2018-05-31 07:33:40 +08:00
Y. T. Chung e5cf8907b5 Updated doc tests 2018-05-30 21:41:25 +08:00
Y. T. Chung 0acdb15029 Upgrade rand to v0.5 and use ThreadRng #111, updated to support the latest trust-dns AsyncResolver 2018-05-30 20:50:15 +08:00
Y. T. Chung 8f69141b33 Call tokio::run from the outermost, allow test to run tokio runtime in multiple threads 2018-05-18 23:21:30 +08:00
Y. T. Chung 8f4ba32b58 Updated join_all in DNS relay, enable backtrace in appveyor 2018-05-18 22:32:57 +08:00