mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-12-24 15:22:42 +00:00
Compare commits
No commits in common. "ce76cedb0dbebdcc6ea76b14b41334cf92e91f81" and "c81c27073cada91940685dbb85f703ca4c3a4644" have entirely different histories.
ce76cedb0d
...
c81c27073c
2 changed files with 4 additions and 19 deletions
|
|
@ -1249,6 +1249,7 @@ class Inbound extends XrayCommonClass {
|
||||||
id: clientId,
|
id: clientId,
|
||||||
scy: security,
|
scy: security,
|
||||||
net: this.stream.network,
|
net: this.stream.network,
|
||||||
|
type: 'none',
|
||||||
tls: tls,
|
tls: tls,
|
||||||
};
|
};
|
||||||
const network = this.stream.network;
|
const network = this.stream.network;
|
||||||
|
|
@ -1283,7 +1284,7 @@ class Inbound extends XrayCommonClass {
|
||||||
const xhttp = this.stream.xhttp;
|
const xhttp = this.stream.xhttp;
|
||||||
obj.path = xhttp.path;
|
obj.path = xhttp.path;
|
||||||
obj.host = xhttp.host?.length > 0 ? xhttp.host : this.getHeader(xhttp, 'host');
|
obj.host = xhttp.host?.length > 0 ? xhttp.host : this.getHeader(xhttp, 'host');
|
||||||
obj.type = xhttp.mode;
|
obj.mode = xhttp.mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tls === 'tls') {
|
if (tls === 'tls') {
|
||||||
|
|
|
||||||
|
|
@ -616,27 +616,11 @@ class Outbound extends CommonClass {
|
||||||
}
|
}
|
||||||
|
|
||||||
canEnableMux() {
|
canEnableMux() {
|
||||||
// Disable Mux if flow is set
|
if (this.settings.flow && this.settings.flow != '') {
|
||||||
if (this.settings.flow && this.settings.flow !== '') {
|
|
||||||
this.mux.enabled = false;
|
this.mux.enabled = false;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
return [Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks, Protocols.HTTP, Protocols.Socks].includes(this.protocol);
|
||||||
// Disable Mux if network is xhttp
|
|
||||||
if (this.stream.network === 'xhttp') {
|
|
||||||
this.mux.enabled = false;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allow Mux only for these protocols
|
|
||||||
return [
|
|
||||||
Protocols.VMess,
|
|
||||||
Protocols.VLESS,
|
|
||||||
Protocols.Trojan,
|
|
||||||
Protocols.Shadowsocks,
|
|
||||||
Protocols.HTTP,
|
|
||||||
Protocols.Socks
|
|
||||||
].includes(this.protocol);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
hasVnext() {
|
hasVnext() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue