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.

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

支持vless+xtls #524

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
f150420
Update RM2100.config
xumng123 Feb 27, 2021
62742a8
Update Makefile
xumng123 Mar 29, 2021
f1fa7c8
Add files via upload
xumng123 Mar 29, 2021
a58051c
Update MI-R3G.config
xumng123 Mar 29, 2021
eec841b
Update versions.inc
xumng123 Mar 29, 2021
27f5060
Update Shadowsocks.asp
xumng123 Mar 30, 2021
d9fc6e8
Create genxrayconfig.lua
xumng123 Mar 30, 2021
b9e831c
Update dlink.lua
xumng123 Mar 30, 2021
9ede407
Update shadowsocks.sh
xumng123 Mar 30, 2021
48f04a4
Update README.md
xumng123 Mar 30, 2021
72fc378
Create genxrayconfig.lua
xumng123 Apr 1, 2021
55ad056
Update dlink.lua
xumng123 Apr 1, 2021
39b47c5
Update Shadowsocks.asp
xumng123 Apr 1, 2021
cffde7c
Update genxrayconfig.lua
xumng123 Apr 1, 2021
3abd9b9
Update genxrayconfig.lua
xumng123 Apr 1, 2021
b2924fc
Update genxrayconfig.lua
xumng123 Apr 2, 2021
ae386ae
Add files via upload
xumng123 Apr 2, 2021
ec79bfb
Add files via upload
xumng123 Apr 2, 2021
4e5e4c5
Update Makefile
xumng123 Apr 2, 2021
20ade95
Update dlink.lua
xumng123 Apr 2, 2021
a68d110
Update Shadowsocks.asp
xumng123 Apr 2, 2021
39b2407
Update dlink.lua
xumng123 Apr 3, 2021
32663d5
Update Shadowsocks.asp
xumng123 Apr 3, 2021
54ed29c
Update Shadowsocks.asp
xumng123 Apr 3, 2021
3022e4b
Add files via upload
xumng123 Apr 4, 2021
dbcc516
Update Makefile
xumng123 Apr 4, 2021
b474889
Update Makefile
xumng123 Apr 4, 2021
f898d80
Update Makefile
xumng123 Apr 4, 2021
bcb1671
Update Makefile
xumng123 Apr 4, 2021
7a016ea
Update Makefile
xumng123 Apr 4, 2021
8bf66ff
Update Makefile
xumng123 Apr 5, 2021
01e0acb
Update Makefile
xumng123 Apr 5, 2021
1ce4156
Update Makefile
xumng123 Apr 5, 2021
7b6220f
Update Shadowsocks.asp
xumng123 Apr 6, 2021
bbdb3b8
Update Advanced_zerotier.asp
xumng123 Apr 8, 2021
f2f08b1
Update variables.c
xumng123 Apr 8, 2021
254d7da
Update zerotier.sh
xumng123 Apr 8, 2021
35a9eea
Update Advanced_zerotier.asp
xumng123 Apr 10, 2021
aba67a4
Update Advanced_zerotier.asp
xumng123 Apr 10, 2021
89b27c3
Update variables.c
xumng123 Apr 10, 2021
be1c9ab
Update zerotier.sh
xumng123 Apr 10, 2021
52d4345
test
xumng123 Apr 10, 2021
2aefe45
yes
xumng123 Apr 11, 2021
5361459
xray
xumng123 Apr 13, 2021
0781ff1
Add files via upload
xumng123 Apr 13, 2021
2bf2209
Merge branch 'master' of https://github.com/xumng123/rt-n56u
xumng123 Apr 13, 2021
9a3b187
Add files via upload
xumng123 Apr 13, 2021
3414581
Update Makefile
xumng123 Apr 13, 2021
ae29a46
Update Makefile
xumng123 Apr 13, 2021
68943e8
Update Makefile
xumng123 Apr 14, 2021
7d67903
remove zerotierserver
xumng123 Apr 15, 2021
3b40966
Update Shadowsocks.asp
xumng123 Apr 24, 2021
e03aab3
Update Shadowsocks.asp
xumng123 Apr 24, 2021
7e04828
Update Shadowsocks.asp
xumng123 Apr 24, 2021
d5bc724
Update variables.c
xumng123 Apr 24, 2021
1e2372b
Update genxrayconfig.lua
xumng123 Apr 24, 2021
663386c
Update Shadowsocks.asp
xumng123 Apr 24, 2021
9d7ca2c
Update Shadowsocks.asp
xumng123 Apr 24, 2021
8500e9f
Update dlink.lua
xumng123 Apr 26, 2021
3b87847
Create build-MT7620d-mi3.yml
xumng123 May 1, 2021
3ab5bb3
Update build-MT7620d-mi3.yml
xumng123 May 1, 2021
ae8df3b
Add files via upload
xumng123 May 5, 2021
7975bcb
Update Makefile
xumng123 May 5, 2021
a4c530f
Update Makefile
xumng123 May 6, 2021
7c21868
Add files via upload
xumng123 May 6, 2021
6e203e3
Update MI-3.config
xumng123 May 6, 2021
9034fe6
Delete v2ray-core-4.32.1.tar.gz
xumng123 May 6, 2021
825c095
Update genxrayconfig.lua
carey036 May 9, 2021
3fac603
Merge pull request #1 from carey036/patch-1
xumng123 May 24, 2021
51683de
Update build-2100.yml
xumng123 May 24, 2021
2a27fe5
Update build-MT7620d-mi3.yml
xumng123 May 24, 2021
1359bb1
vless ws bugfix
xumng123 May 27, 2021
50df6e0
vless ws fix
xumng123 May 27, 2021
afd322d
fix bug xtls
xumng123 May 27, 2021
6cbfd87
Update Makefile
xumng123 Sep 11, 2021
739f13b
Delete smartdns-Release31.tar.gz
xumng123 Sep 11, 2021
c6064f1
Add files via upload
xumng123 Sep 11, 2021
7372944
Update shadowsocks.sh
xumng123 Sep 12, 2021
48bcc67
Delete v2ray
xumng123 Sep 12, 2021
69505ab
Add files via upload
xumng123 Sep 12, 2021
4736a26
Update shadowsocks.sh
xumng123 Sep 12, 2021
cf9db2d
Update shadowsocks.sh
xumng123 Sep 13, 2021
3fdd08d
Update versions.inc
xumng123 Sep 13, 2021
d7e8547
Update adguardhome.sh
xumng123 Sep 14, 2021
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
Prev Previous commit
Next Next commit
Update Shadowsocks.asp
  • Loading branch information
xumng123 authored Mar 30, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 27f50605d564d33fa1266105bbd91a372c4c5a54
54 changes: 49 additions & 5 deletions trunk/user/www/n56u_ribbon_fixed/Shadowsocks.asp
Original file line number Diff line number Diff line change
@@ -240,7 +240,7 @@ setTimeout('document.getElementById("btn_ctime").style.display="none";',1000);
showhide_div('row_v2_tls', 1);
//showhide_div('row_tj_tls_host', 1);
showhide_div('row_ssp_insecure', 1);
} else if (b == "v2ray") {
} else if (b == "v2ray" || b == "xray") {
switch_v2_type();
showhide_div('row_v2_aid', 1);
showhide_div('row_v2_vid', 1);
@@ -739,7 +739,7 @@ setTimeout('document.getElementById("btn_ctime").style.display="none";',1000);
document.getElementById("ss_method").value = getProperty(ss, 'encrypt_method', 'none');
document.getElementById("ss_obfs").value = getProperty(ss, 'obfs', 'plain');
document.getElementById("ss_obfs_param").value = getProperty(ss, 'obfs_param', '');
} else if (type == "v2ray") {
} else if (type == "v2ray" || type == "xray") {
var transport = getProperty(ss, 'transport', 'tcp');
document.getElementById("ssp_insecure").value = getProperty(ss, 'insecure', 0);
document.getElementById("ssp_insecure").checked = document.getElementById("ssp_insecure").value != 0;
@@ -943,7 +943,7 @@ setTimeout('document.getElementById("btn_ctime").style.display="none";',1000);
var s = document.getElementById(urlname + '-status');
if (!s)
return false;
var ssrurl = prompt("在这里黏贴配置链接 ssr:// | ss:// | vmess:// | trojan://", "");
var ssrurl = prompt("在这里黏贴配置链接 ssr:// | ss:// | vmess:// | vless:// | trojan://", "");
if (ssrurl == null || ssrurl == "") {
s.innerHTML = "<font color='red'>用户取消</font>";
return false;
@@ -952,7 +952,7 @@ setTimeout('document.getElementById("btn_ctime").style.display="none";',1000);
//var ssu = ssrurl.match(/ssr:\/\/([A-Za-z0-9_-]+)/i);
var ssu = ssrurl.split('://');
//console.log(ssu.length);
if ((ssu[0] != "ssr" && ssu[0] != "ss" && ssu[0] != "vmess" && ssu[0] != "trojan") || ssu[1] == "") {
if ((ssu[0] != "ssr" && ssu[0] != "ss" && ssu[0] != "vmess" && ssu[0] != "vless" && ssu[0] != "trojan") || ssu[1] == "") {
s.innerHTML = "<font color='red'>无效格式</font>";
return false;
}
@@ -1082,6 +1082,49 @@ setTimeout('document.getElementById("btn_ctime").style.display="none";',1000);
}
s.innerHTML = "<font color='green'>导入V2ray配置信息成功</font>";
return false;
} else if (ssu[0] == "vless") {
var sstr = b64DecodeUnicode(ssu[1]);
console.log(sstr);
var ploc = sstr.indexOf("/?");
document.getElementById('ssp_type').value = "xray";
document.getElementById('ssp_type').dispatchEvent(event);
var url0, param = "";
if (ploc > 0) {
url0 = sstr.substr(0, ploc);
param = sstr.substr(ploc + 2);
}
var ssm = JSON.parse(sstr);
document.getElementById('ssp_name').value = ssm.ps;
document.getElementById('ssp_server').value = ssm.add;
document.getElementById('ssp_prot').value = ssm.port;
document.getElementById('v2_alter_id').value = ssm.aid;
document.getElementById('v2_vmess_id').value = ssm.id;
if (ssm.net == "tcp") {
document.getElementById('v2_tcp_guise').value = ssm.type;
document.getElementById('v2_http_host').value = ssm.host;
document.getElementById('v2_http_path').value = ssm.path;
} else {
document.getElementById('v2_kcp_guise').value = ssm.type;
}
document.getElementById('v2_transport').value = ssm.net;
document.getElementById('v2_transport').dispatchEvent(event);
if (ssm.net == "ws") {
document.getElementById('v2_ws_host').value = ssm.host;
document.getElementById('v2_ws_path').value = ssm.path;
}
if (ssm.net == "h2") {
document.getElementById('v2_h2_host').value = ssm.host;
document.getElementById('v2_h2_path').value = ssm.path;
}
if (ssm.tls == "tls") {
document.getElementById('v2_tls').value = 1;
document.getElementById('v2_tls').checked = true;
document.getElementById('ssp_insecure').value = 1;
document.getElementById('ssp_insecure').checked = true;
document.getElementById('ssp_tls_host').value = ssm.host;
}
s.innerHTML = "<font color='green'>导入Xray配置信息成功</font>";
return false;
}
}
//-----------导入链接结束
@@ -1178,7 +1221,7 @@ setTimeout('document.getElementById("btn_ctime").style.display="none";',1000);
password: document.getElementById("ss_password").value,
coustom: "1",
}
} else if (type == "v2ray") {
} else if (type == "v2ray" || type == "xray") {
var DataObj = {
type: document.getElementById("ssp_type").value,
alias: document.getElementById("ssp_name").value,
@@ -1779,6 +1822,7 @@ setTimeout('document.getElementById("btn_ctime").style.display="none";',1000);
<option value="ssr">SSR</option>
<option value="trojan">Trojan</option>
<option value="v2ray">V2ray</option>
<option value="xray">Xray</option>
<option value="socks5">SOCKS5</option>
</select>
</td>