add alpn into tlsSetting, fix fallback bug
This commit is contained in:
@@ -417,10 +417,11 @@ class GrpcStreamSettings extends XrayCommonClass {
|
|||||||
|
|
||||||
class TlsStreamSettings extends XrayCommonClass {
|
class TlsStreamSettings extends XrayCommonClass {
|
||||||
constructor(serverName='',
|
constructor(serverName='',
|
||||||
certificates=[new TlsStreamSettings.Cert()]) {
|
certificates=[new TlsStreamSettings.Cert()], alpn=[]) {
|
||||||
super();
|
super();
|
||||||
this.server = serverName;
|
this.server = serverName;
|
||||||
this.certs = certificates;
|
this.certs = certificates;
|
||||||
|
this.alpn = alpn;
|
||||||
}
|
}
|
||||||
|
|
||||||
addCert(cert) {
|
addCert(cert) {
|
||||||
@@ -436,9 +437,11 @@ class TlsStreamSettings extends XrayCommonClass {
|
|||||||
if (!ObjectUtil.isEmpty(json.certificates)) {
|
if (!ObjectUtil.isEmpty(json.certificates)) {
|
||||||
certs = json.certificates.map(cert => TlsStreamSettings.Cert.fromJson(cert));
|
certs = json.certificates.map(cert => TlsStreamSettings.Cert.fromJson(cert));
|
||||||
}
|
}
|
||||||
|
|
||||||
return new TlsStreamSettings(
|
return new TlsStreamSettings(
|
||||||
json.serverName,
|
json.serverName,
|
||||||
certs,
|
certs,
|
||||||
|
json.alpn
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -446,6 +449,7 @@ class TlsStreamSettings extends XrayCommonClass {
|
|||||||
return {
|
return {
|
||||||
serverName: this.server,
|
serverName: this.server,
|
||||||
certificates: TlsStreamSettings.toJsonArray(this.certs),
|
certificates: TlsStreamSettings.toJsonArray(this.certs),
|
||||||
|
alpn: this.alpn
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,9 @@
|
|||||||
<a-form-item label="域名">
|
<a-form-item label="域名">
|
||||||
<a-input v-model.trim="inbound.stream.tls.server"></a-input>
|
<a-input v-model.trim="inbound.stream.tls.server"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
<a-form-item label="alpn" placeholder="http/1.1,h2">
|
||||||
|
<a-input v-model.trim="inbound.stream.tls.alpn"></a-input>
|
||||||
|
</a-form-item>
|
||||||
<a-form-item label="证书">
|
<a-form-item label="证书">
|
||||||
<a-radio-group v-model="inbound.stream.tls.certs[0].useFile"
|
<a-radio-group v-model="inbound.stream.tls.certs[0].useFile"
|
||||||
button-style="solid">
|
button-style="solid">
|
||||||
|
|||||||
Reference in New Issue
Block a user