yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-11-04 19:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

再再次修复tls_settings为空时不下发flow

Browse Source
This commit is contained in:
root
2023-08-21 02:11:18 +09:00
parent a653a44afc
commit 7aee877367
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Protocols/General.php
View File

@@ -125,11 +125,11 @@ class General
$output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}"; $output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}";
if ($server['tls']) { if ($server['tls']) {
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

2
app/Protocols/Passwall.php
View File

@@ -114,11 +114,11 @@ class Passwall
$output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}"; $output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}";
if ($server['tls']) { if ($server['tls']) {
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

2
app/Protocols/SSRPlus.php
View File

@@ -108,11 +108,11 @@ class SSRPlus
$output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}"; $output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}";
if ($server['tls']) { if ($server['tls']) {
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

2
app/Protocols/SagerNet.php
View File

@@ -120,11 +120,11 @@ class SagerNet
$output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}"; $output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}";
if ($server['tls']) { if ($server['tls']) {
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

2
app/Protocols/Shadowrocket.php
View File

@@ -148,11 +148,11 @@ class Shadowrocket
$output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}"; $output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}";
if ($server['tls']) { if ($server['tls']) {
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

2
app/Protocols/V2rayN.php
View File

@@ -125,11 +125,11 @@ class V2rayN
$output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}"; $output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}";
if ($server['tls']) { if ($server['tls']) {
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

2
app/Protocols/V2rayNG.php
View File

@@ -114,11 +114,11 @@ class V2rayNG
$output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}"; $output .= "?" . "type={$config['type']}" . "&encryption={$config['encryption']}" . "&security={$config['security']}";
if ($server['tls']) { if ($server['tls']) {
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
if ($config['flow'] !="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];