Commit Graph
2495 Commits
Author SHA1 Message Date
Max Lv 0a8d194426 Merge pull request #2097 from rogers0/PR/fix_hurd
Fix of PATH_MAX for GNU/Hurd
2018-06-16 19:10:54 +08:00
Roger Shimizu d88345fa46 Fix of PATH_MAX for GNU/Hurd
Memory of userconf in src/utils.c:get_default_conf() only gets allocated
once, and will not be freed. It's used as static buffer.

This can avoid using PATH_MAX, which actually doesn't exist on certain
platforms.

Info:
- https://www.gnu.org/software/hurd/community/gsoc/project_ideas/maxpath.html
- https://www.gnu.org/software/hurd/hurd/porting/guidelines.html#PATH_MAX_tt_MAX_PATH_tt_MAXPATHL
2018-06-16 19:47:39 +09:00
Max Lv 167b510053 Merge pull request #2087 from rogers0/PR/fix_tests
Update config under tests/ folder
2018-06-09 17:07:39 +08:00
Max Lv c24b11f089 Merge pull request #2088 from linusyang92/docker-speed
Docker: speed up MinGW build by parallel make
2018-06-09 17:07:12 +08:00
Linus Yang 64100a1b22 Docker: speed up MinGW build by parallel make 2018-06-09 15:48:07 +08:00
Colin Watson 4a4531d866 skip tests if an upstream HTTP proxy is set
shadowsocks-libev doesn't support connecting through an upstream HTTP
proxy, so if the test environment requires that then there's nothing we can
do.  (In future it might be possible to set up a local server to avoid this
problem.)
2018-06-09 16:31:25 +09:00
Roger Shimizu 44c557c170 Update config under tests/ folder
Fix tests by using "local" setting instead of "local_address" in config.

This is mentioned in:
- https://github.com/shadowsocks/shadowsocks-libev/issues/247
2018-06-09 15:54:08 +09:00
Yegor Ievlev 8fd83e2686 Use chacha20-ietf as a default cipher instead of rc4-md5 (#2080)
* Use chacha20-ietf as a default cipher instead of rc4-md5

* Update tunnel.c

* Update utils.c

* Update ss-local.asciidoc

* Update ss-local.asciidoc

* Update tunnel.c

* Update ss-tunnel.asciidoc

* Update ss-manager.asciidoc

* Update ss-redir.asciidoc

* Update shadowsocks-libev.asciidoc

* Update aead.c

* Update local.c

* Update server.c

* Update utils.c
2018-06-07 08:58:10 +08:00
Max Lv 873a577726 Add winsock.h to dist target 2018-05-28 21:53:13 -07:00
Max Lv 8c98bdecac Bump version v3.2.0 2018-05-28 19:55:12 -07:00
Max Lv 262c6d45fc Merge pull request #2064 from wogong/patch-1
update image value.
2018-05-28 11:03:45 +08:00
Cheng Zhen 6ddbecc10f update image value.
Current setting will cause following error: `ERROR: pull access denied for shadowsocks-libev, repository does not exist or may require 'docker login'`, this update fixes this.
2018-05-27 10:14:16 +08:00
Max Lv a0ef456977 Fix #2051 2018-05-24 16:54:57 +08:00
Max Lv 21fb6e639e Merge pull request #2049 from mcspr/rpm-copr
Fedora COPR support
2018-05-15 08:55:52 +08:00
Max Prokhorov 3c10661d81 Use correct outdir 2018-05-14 09:59:43 +03:00
Max Prokhorov 999e0555c7 Fedora COPR support
- Support .copr/Makefile for 'SCM / make srpm' COPR package
- Use genrpm.sh to generate srpm and optionally build it
- Use generic substitution syntax in specfile
2018-05-14 09:38:07 +03:00
Max Lv a0a56e713b Merge pull request #2045 from xnoreq/master
Fix DNS timeouts
2018-05-10 14:45:10 +08:00
xnor 14b6261b40 Optimize resolv timer
Don't call ares_timeout since it does a search through all queries.
Instead, schedule a timer that fires after 1 second. If no activity happened
for over 1 second do ares timeout processing, otherwise reschedule the timer
to fire after the remaining timeout.
This also completely avoids the ev_timer_again calls for each single fd event.
2018-05-09 23:20:13 +00:00
xnor a5db5ef71f Fix DNS timeouts
C-ares creates up to two sockets per nameserver. With up to three nameservers
in resolv.conf this makes a max of six active sockets.
Having only one ev_io watcher resulted in closing watchers that were
still active, needlessly resulting in DNS timeouts.
2018-05-08 21:16:28 +00:00
Max Lv 380cb81234 Revert "Create srpm and rpm targets to the Autotools build"
This reverts commit 395515d1f7.
2018-05-08 15:26:39 +08:00
Max Lv a4f40437c3 Revert "Update docker ignore"
This reverts commit 3ef7f701e4.
2018-05-08 15:26:13 +08:00
Max Lv 3ef7f701e4 Update docker ignore 2018-05-08 10:41:12 +08:00
Max Lv 8d3ce8b77c Make sure ev_io_stop before ev_io_set 2018-05-07 09:05:38 +08:00
Max Lv 320668e628 Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev 2018-05-06 11:41:48 +08:00
Max Lv 204037b100 Simplify the handshake part 2018-05-06 11:41:29 +08:00
Max Lv 68e53dd07f Merge pull request #2039 from vfreex/automake-srpm-target
Create srpm and rpm targets to the Autotools build
2018-05-06 10:27:10 +08:00
Yuxiang Zhu 395515d1f7 Create srpm and rpm targets to the Autotools build
The new `srpm` target can be handled by Fedora Copr for
automated builds. A `rpm` target is also added for alignment.
2018-05-04 18:12:49 +08:00
Max Lv c61736e903 Set the minimum resolv timeout to be one second 2018-05-04 10:33:09 +08:00
Max Lv a12cafae9f Merge pull request #2034 from poonzah/patch-1
fixed docker -p flag syntax
2018-05-04 10:16:29 +08:00
Max Lv a16826b83e Merge pull request #2037 from FlyingheartCN/master
Fix Build Fail with GCC8
2018-05-04 10:15:36 +08:00
FlyingheartCN 662b6db3f3 Fix Build Fail with GCC8 2018-05-04 01:41:36 +08:00
Dariush Alipour c3db67bce5 fixed docker -p flag syntax 2018-05-01 18:36:31 +04:30
Max Lv eb53d54334 Merge pull request #2022 from zhuzeitou/master
Optimize Dockerfile, add SERVER_PORT back
2018-04-20 16:51:37 +08:00
zhuzeitou cb109a41fd Optimize Dockerfile, add SERVER_PORT back 2018-04-16 01:13:06 +08:00
Max Lv 710f7471fc Merge pull request #2020 from rogers0/PR/fix_script3
Improve on the build scripts
2018-04-13 16:27:56 +08:00
Roger Shimizu c19f0ed46d Add scripts/chroot_build.sh to call build_deb.sh in a chrooted env
Support common debian and ubuntu version, such as jessie, stretch,
trusty, and xenial, etc.

e.g.
$ sudo scripts/chroot_build.sh jessie
2018-04-12 23:29:57 +09:00
Roger Shimizu 540f0903f5 scripts/build_deb.sh: Update libsodium build due to debhelper 11 2018-04-12 23:29:57 +09:00
Max Lv a9d56518bb Update libcork 2018-04-10 00:58:32 -07:00
Max Lv dada99c5b6 Fix the SNI issue 2018-04-08 22:32:21 -07:00
Max Lv c377dcac97 Merge pull request #2017 from rallet/master
Ignore SIGCHLD for library usage
2018-04-09 09:47:32 +08:00
Max Lv 2c2063a792 Fix a warning on Android 2018-04-08 18:36:38 -07:00
Max Lv d4298f71f0 Refine the code structure 2018-04-08 18:32:32 -07:00
Rallets 5d17c0431f Ignore SIGCHLD for library usage 2018-04-08 12:51:45 +08:00
Max Lv aa6557b729 Merge pull request #2016 from rogers0/PR/fix_script2
scripts/build_deb.sh: Update URL in script
2018-04-07 22:45:29 +08:00
Roger Shimizu a98587fa5f scripts/build_deb.sh: Update URL in script
- Use https URL when possible.
- Use salsa git repo instead of alioth (anonscm) for those already
  migrated in debian.
2018-04-07 12:05:00 +09:00
Mygod a4c9059ffe Fix all routing not working in Android
This reverts commit 66ed595c52.
2018-04-04 19:02:26 -07:00
Max Lv 68f885c271 Fix plugin on Android 2018-04-04 23:44:24 +08:00
Max Lv 404c798a1a Merge pull request #2010 from feng-ye/master
fix cmake syntax.
2018-04-03 16:00:45 +08:00
Feng Ye a8681c260e fix cmake syntax. 2018-04-03 13:58:54 +08:00
Max Lv 3e7c852970 Fix a crash 2018-04-01 21:27:16 -07:00