Commit Graph
361 Commits
Author SHA1 Message Date
William Wong aaccd9f5db Fix compile errors with mingw64
Fix two errors:

win32.c:36:9: error: format '%s' expects argument of type 'char *', but argument 5 has type 'void **' [-Werror=format=]
         LOGE("%s: %s", s, msg);
         ^
and
win32.c:47:9: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'int' [-Werror=format=]
         LOGE("ioctlsocket failed with error: %ld\n", iResult);
         ^
2014-04-03 15:09:32 +08:00
Max Lv 94bd9dfa0a fix an issue 2014-04-03 14:02:25 +09:00
Max Lv 2128fc9bab update OpenWRT's makefile 2014-04-03 12:39:59 +08:00
Max Lv c9c4873347 fix setuid issue v1.4.4 2014-03-29 11:36:13 +08:00
Max Lv c9a0f9b3eb Revert "update scripts"
This reverts commit d14da247dc.
2014-03-29 11:33:11 +08:00
Max Lv d14da247dc update scripts 2014-03-28 17:07:21 +08:00
Max Lv 2ad32adcb6 bump OpenWRT's version 2014-03-26 15:39:45 +08:00
Max Lv f403bc7f06 bump version 2014-03-26 15:35:34 +08:00
Max Lv bcad7d5193 Merge pull request #57 from KennethLaw/master
Duplicate text
2014-03-24 15:12:07 +08:00
luojianhui fa1ce72469 Duplicate text 2014-03-24 15:00:09 +08:00
Max Lv f7765385f5 update shadowsocks init 2014-03-24 09:47:44 +08:00
Max Lv 465e487e30 Merge pull request #56 from Hexcles/master
Better support for daemon command line arguments (for Debian).
2014-03-22 17:22:07 +08:00
Hexcles Ma 2943e176d1 Better support for daemon command line arguments.
Put DAEMON_ARGS into init script and add it to service default
configuration.
2014-03-22 14:18:39 +08:00
Max Lv a9e7dad7c8 fix #54 2014-03-22 08:08:24 +08:00
Max Lv 528b4dab8a fix #20 2014-03-18 17:23:52 +08:00
Max Lv 087e67a732 refine the log output 2014-03-16 10:11:39 +08:00
Max Lv 0012b27365 Merge pull request #52 from linusyang/applecc
Serious bug fix for Apple CC branch
2014-03-15 20:41:01 +08:00
Linus Yang 5fd6cd22f7 darwin: applecc: fix compile warnings 2014-03-15 15:33:53 +08:00
Linus Yang 8f88399ffc darwin: applecc: fix iv not randomized issue 2014-03-15 15:29:41 +08:00
Max Lv e0d8a15971 Merge pull request #51 from linusyang/applecc
Support for Apple's CommonCrypto API
2014-03-09 21:12:56 +08:00
Linus Yang 5e5c853807 darwin: initial support for CommonCrypto API 2014-03-09 17:02:06 +08:00
Max Lv 40ea3f690b Merge pull request #50 from nanpuyue/patch-1
refine openwrt build / init scripts
2014-03-09 15:34:20 +08:00
南浦月 0ce9c15186 Update shadowsocks.init
1.使用OpenWrt提供的service_start及service_stop函数控制服务开关
2.由service_start函数生成pid文件
3.改配置文件目录为/etc/shadowsocks.json
2014-03-09 12:36:59 +08:00
南浦月 82d6d2f772 Update Makefile
1./etc/config下的配置文件都是uci的配置文件,所以建议将shadowsocks.json置于/etc/shadowsocks.json
2.PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION),为两个版本设置不同的编译目录,否则当同时编译两个版本时出错
3.优化安装脚本
2014-03-09 12:32:57 +08:00
Max Lv 5709df6e83 add run_as option 2014-03-06 12:50:58 +08:00
Max Lv f402119f6d refine get_addr_str v1.4.3 2014-02-28 13:02:19 +08:00
Max Lv b2df5a4c26 fix redir 2014-02-27 09:18:26 +09:00
Max Lv 2b92b57bed fix the ambiguous type defination 2014-02-27 08:11:16 +08:00
Max Lv 78c79de7dc update usage 2014-02-23 11:52:15 +08:00
Max Lv e48a7ceeeb update OpenWRT 2014-02-23 12:34:25 +09:00
Max Lv 69f8bd61c0 fix the udp connection cache 2014-02-22 16:13:16 +08:00
Max Lv 11da9b233a fix the buffer corruption 2014-02-22 14:00:43 +08:00
Max Lv 7063d1fa6f update json-parser 2014-02-21 19:18:14 +08:00
Max Lv bcd7864a4b update README 2014-02-21 11:50:25 +08:00
Max Lv 26f46bee1f Merge pull request #45 from madeye/ss-tunnel
Add tunnel mode
2014-02-21 11:01:45 +08:00
Max Lv f7212f01f9 Merge branch 'ss-tunnel' of https://github.com/madeye/shadowsocks-libev into ss-tunnel 2014-02-21 12:00:26 +09:00
Max Lv 45c1aecfe3 bump version 2014-02-21 11:59:33 +09:00
Max Lv b0b2a30bb8 fix the udp tunnel 2014-02-21 11:59:33 +09:00
Max Lv 3ed440f6ae fix a memory corruption 2014-02-21 11:59:32 +09:00
Max Lv 84e04eefaa WiP: finish the udp part 2014-02-21 11:59:32 +09:00
Max Lv 6107427bf0 WiP: handle both ipv4 and ipv6 2014-02-21 11:58:41 +09:00
Max Lv 2153e3fd04 WiP: add tunnel mode 2014-02-21 11:58:41 +09:00
Max Lv e737a1ceff bump version 2014-02-21 11:54:55 +09:00
Max Lv a407a064d0 fix the udp tunnel 2014-02-21 10:46:17 +08:00
Max Lv 3a8bf98ebc fix a memory corruption 2014-02-21 10:13:47 +08:00
Max Lv 30cbb8e8c1 fix #44 2014-02-21 09:49:42 +08:00
Max Lv e9a7c0166b fix #44 2014-02-21 09:46:55 +08:00
Max Lv ef432f078b Fix the pid file in centos init script 2014-02-18 09:01:27 +08:00
Max Lv 1bdcadf7e7 Update the init script of centos 2014-02-18 08:52:39 +08:00
Max Lv c895f9f7c6 WiP: finish the udp part 2014-01-25 08:28:46 -05:00