Commit Graph
2513 Commits
Author SHA1 Message Date
DUPONCHEEL Sébastien 380fddbba9 redir: fix dscp to tos conversion 2017-08-06 06:58:31 -07:00
Daniel 6544ef9cf8 Replace udprealy function name typos with udprelay.
Two functions `construct_udprealy_header` and `parse_udprealy_header`
contained typos and should be `construct_udprelay_header` and
`parse_udprelay_header` respectively. This commit updates these function
names and the respective callers.
2017-08-06 06:58:16 -07:00
Max Lv 0ff1ec97be Enlarge the max_tries 2017-08-03 07:52:28 +08:00
Max Lv bf7fd7a860 Merge branch 'issue-1566'. #1566 2017-08-03 07:40:26 +08:00
Max Lv 8e41a43dc9 Remove reuse_port lock 2017-08-03 07:24:54 +08:00
Yousong Zhou 7c5416b441 syslog with daemon facility instead of kern (0) 2017-08-01 22:59:38 -07:00
Yousong Zhou db1728c76d decouple use_syslog from pid_flags
Sometimes we need processes to run in the foreground to be supervised
and at the same time use syslog facility instead of logging its stdout,
stderr output
2017-08-01 22:59:38 -07:00
Symeon Huang 28cf0ac1a5 Update README.md about Fedora/RHEL repo 2017-07-29 12:45:06 +01:00
Max Lv fbd34516f0 Update json.c and fix #1594 2017-07-28 22:55:23 +08:00
Max Lv a94bc33457 Merge pull request #1599 from rogers0/PR/build-fix
Minor fix for build_deb.sh script
2017-07-28 07:14:35 -07:00
netroby 4ab1440fd8 Add notes. fedora 26 has libsodium >= 1.0.12 2017-07-28 07:14:13 -07:00
Roger Shimizu 15a54beb8c Minor fix for build_deb.sh script
- Install libbloom-dev in backports repository.
- Clone libsodium git under "libsodium" directory.
- Change to a safer way to check debhelper version.
- Remove simple-obfs for jessie/stretch because it's just
  accepted to backports repository.
2017-07-28 20:58:44 +09:00
Max Lv 7912e9b385 Merge pull request #1595 from rogers0/PR/build-update-stretch
Update scripts/build_deb.sh after stretch release
2017-07-27 05:57:22 -07:00
Roger Shimizu cae2625513 Update scripts/build_deb.sh after stretch release
- Update build of libsodium to use debian's git repo
- Now libbloom is available in stretch-backports and
  jessie-backports-sloppy
2017-07-28 06:33:02 +09:00
Max Lv f1dd1354a9 Bump version v3.0.8 2017-07-27 11:22:27 +08:00
xqdoo00o 58fba54042 Update README.md
update Libsodium version
2017-07-25 23:36:24 -07:00
Max Lv bf8f8312b4 Refine the ppbloom filter 2017-07-21 19:54:00 +08:00
Yifu Yu 4ea517daf3 Fix: ss-local and ss-redir should also respect ipv6_first. 2017-07-14 01:51:35 -05:00
wangxufire 61e145140d trigger macOS build
trigger macOS build

trigger macOS build

trigger macOS build

trigger macOS build

trigger macOS build

trigger macOS build
2017-07-09 23:36:59 -05:00
Max Lv 0e74ea509c Refine the CLI help text. #1547 2017-07-06 17:17:17 +08:00
Vladimir Olteanu 556627399e parsing socks 5 request: more suggestive code 2017-07-04 23:57:21 -05:00
Vladimir Olteanu afb27ad054 count length bit when checking buffer size 2017-07-04 23:57:21 -05:00
xqdoo00o 3f0564f2ff Update README.md
update MbedTLS version
2017-07-03 01:32:57 -05:00
Secbone 4c88c72a66 delete duplicate code 2017-07-02 17:45:57 -05:00
Yuxiang Zhu c90cb5a0ae Fix #1533
This patch is going to replace the group name 'nogroup' with 'nobody' in
debian/shadowsocks-libev.service, and move file
'/etc/default/shadowsocks-libev' to '/etc/sysconfig/shadowsocks-libev'.

This is implemented by creating a text patch file. Not sure whether
there is a better approach.
2017-06-28 05:02:49 -05:00
Max Lv 5070256631 Clean up 2017-06-28 17:13:00 +08:00
Max Lv c11b2c08e4 Bump version v3.0.7 2017-06-27 14:17:53 +08:00
Jiewei Qian 42ce34518d Add ARGS env variable to alpine Dockerfile (#1537) 2017-06-21 00:57:02 -05:00
Max Lv babc9c4775 Fix #1531 2017-06-18 16:02:57 +08:00
Max Lv 95b4416e14 Clean up 2017-06-14 16:36:47 +08:00
Mass Carl 6b70ce59eb Add TW website "Bahamut" (#1527)
Since some part of this website "Bahamut" is blocked by China.And it benefits to many gamers and anime lovers.So I decide to list it into the GFW.
2017-06-12 02:25:47 -05:00
thelastfantasy a51309d88f 添加漫画人 (#1525) 2017-06-12 00:55:58 -05:00
Max Lv f5278f0ac8 Fix a typo 2017-06-12 10:27:41 +08:00
Max Lv ba81b2f49e Decrease the visibility of fragmentation. #1524 2017-06-12 10:14:03 +08:00
Xiandong eba486cb02 Output service method in list API (#1523)
* Fix #1518 config file with wrong json format

Removing trailing "," to make the configuration file compliant with JSON specification

* Remove extra "," in json file

* server_port should be integer instead of string 

server_port in generated json configuration file should be integer instead of string

* Add list active service ports feature

A new management API has been added to list all active service ports.

* Make list API output JSON compliant 

In the following format:
[
{ "server_port":"8388","password":"password"},
...
]
Note that server_port value is string instead of integer for easy display on the console.

* Make safe room for the new list entry

"\n\t{\"server_port\":\"%s\",\"password\":\"%s\"}," 
Reserve 50 char spaces for the extra characters in the above.

* Output method for each service port in list API
2017-06-08 21:56:35 -05:00
Max Lv f308ddeda6 Fix #1522 2017-06-08 15:39:18 +08:00
Xiandong e2f717e9fb Add list API to list service ports (#1521)
* Fix #1518 config file with wrong json format

Removing trailing "," to make the configuration file compliant with JSON specification

* Remove extra "," in json file

* server_port should be integer instead of string 

server_port in generated json configuration file should be integer instead of string

* Add list active service ports feature

A new management API has been added to list all active service ports.

* Make list API output JSON compliant 

In the following format:
[
{ "server_port":"8388","password":"password"},
...
]
Note that server_port value is string instead of integer for easy display on the console.

* Make safe room for the new list entry

"\n\t{\"server_port\":\"%s\",\"password\":\"%s\"}," 
Reserve 50 char spaces for the extra characters in the above.
2017-06-07 22:10:52 -05:00
Xiandong 195a961e97 server_port in json file should be integer (#1520)
* Fix #1518 config file with wrong json format

Removing trailing "," to make the configuration file compliant with JSON specification

* Remove extra "," in json file

* server_port should be integer instead of string 

server_port in generated json configuration file should be integer instead of string
2017-06-06 04:27:22 -05:00
Xiandong b9085c2e32 Remove extra "," in json file 2017-06-06 02:55:50 -05:00
Xiandong ae156c6aeb Fix #1518 config file with wrong json format
Removing trailing "," to make the configuration file compliant with JSON specification
2017-06-06 02:55:50 -05:00
Vladimir Olteanu 0b2dce5fe9 ss-redir: fix memleak in remote_send_cb 2017-06-05 19:09:38 -05:00
Max Lv 03adf82a8a Clean up 2017-05-28 22:37:09 +08:00
Max Lv 4b1550626f Update specs 2017-05-27 09:34:55 +08:00
Aaron LI e65b3b1505 Move <sys/socket.h> inclusion to fix build on DFlyBSD
The ``<sys/socket.h>`` header should be included in ``src/netutils.h``
before the usage of ``struct sockaddr_storage``, otherwise build failed
with errors such as:

```
In file included from udprelay.c:53:0:
netutils.h:68:22: error: 'struct sockaddr_storage' declared inside parameter list [-Werror]
                      int ipv6first);
                      ^
netutils.h:68:22: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]
```

Tested on DragonFly BSD 4.9-development and Debian Linux testing.
2017-05-24 20:00:53 +08:00
Sherlock Holo 2734365a82 Update README.md
complement RHEL/Fedora depends
2017-05-23 16:42:12 +08:00
Lucas BEE 44feddd4f6 ss-redir: Add option to disable SNI feature
Add an option 'disable_sni' in the config file to allow clients running
ss-redir to disable the HTTP/SNI feature
2017-05-23 06:23:53 +08:00
Max Lv b7bb4358e1 Clean up 2017-05-22 17:11:59 +08:00
Max Lv b7bdb16338 Fix #1502 2017-05-19 12:27:19 +08:00
Mygod 72622a3e3d Use standard __ANDROID__ preprocessor macro 2017-05-17 07:08:41 +08:00
Max Lv c02176df71 Update README.md 2017-05-15 09:06:38 +08:00