Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shadowsocks r #1

Open
wants to merge 8 commits into
base: shadowsocksR
Choose a base branch
from
Open

Shadowsocks r #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba51b7c
Update shadowsocks.lua
etnperlong Jul 11, 2016
4ad4148
Update README.md
etnperlong Jul 11, 2016
fc78394
Fix obfs_param and renew Makefile(Testing...)
Jul 16, 2016
bc96af8
Renew Makefile(Testing 2)
Jul 16, 2016
9b54478
Fang Qi Zheng Zha QAQ >_<
Jul 16, 2016
3fa4357
generated lmo i18n files
Jul 16, 2016
6307643
OK I fixed the i18n QAQ
Jul 16, 2016
ed1e921
remove depreciated tls1.0_session_auth
Aug 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=openwrt-dist-luci
PKG_VERSION:=1.3.8
PKG_RELEASE:=1
PKG_RELEASE:=7

PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ APP 列表
tar xjf OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2
cd OpenWrt-SDK-ar71xx-*
# 获取 Makefile
git clone https://github.com/aa65535/openwrt-dist-luci.git package/openwrt-dist-luci
git clone -b shadowsocksR https://github.com/etnperlong/openwrt-dist-luci.git package/openwrt-dist-luci
# 选择要编译的包 LuCI -> 3. Applications
make menuconfig
# 开始编译
make V=99
make -j4 V=99
```


Expand Down
Binary file modified files/luci/i18n/shadowsocks.zh-cn.lmo
View file
Open in desktop
Binary file not shown.
11 changes: 7 additions & 4 deletions files/luci/i18n/shadowsocks.zh-cn.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"

msgid "ShadowSocks"
msgstr "ShadowSocks"
msgid "ShadowSocksR"
msgstr "ShadowSocksR"

msgid "Enable"
msgstr "启用"
Expand All @@ -13,8 +13,8 @@ msgstr "停用"
msgid "ShadowSocksR is running"
msgstr "ShadowSocksR 运行中"

msgid "ShadowSocks is not running"
msgstr "ShadowSocks 未运行"
msgid "ShadowSocksR is not running"
msgstr "ShadowSocksR 未运行"

msgid "Global Setting"
msgstr "全局设置"
Expand Down Expand Up @@ -64,6 +64,9 @@ msgstr "传输协议"
msgid "obfs"
msgstr "混淆插件"

msgid "obfs_param(optional)"
msgstr "混淆参数(可选)"

msgid "UDP Forward"
msgstr "UDP转发"

Expand Down
4 changes: 3 additions & 1 deletion files/luci/model/cbi/shadowsocks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ local protocol = {
obfs = {
"plain",
"http_simple",
"tls1.0_session_auth",
"tls1.2_ticket_auth",
}

ipkg.list_installed("shadowsocks-libev-spec-polarssl", function(n, v, d)
Expand Down Expand Up @@ -123,6 +123,8 @@ o = s:option(ListValue, "obfs", translate("obfs"))
for _, v in ipairs(obfs) do o:value(v) end
o.rmempty = false

o = s:option(Value, "obfs_param", translate("obfs_param(optional)"))

-- [[ UDP Forward ]]--
s = m:section(TypedSection, "udp_forward", translate("UDP Forward"))
s.anonymous = true
Expand Down