From 59922b8b768651212047cc9c2fa42b57a19ca291 Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Wed, 9 Nov 2022 10:53:37 +0900 Subject: [PATCH] fix: v2ray http header --- fmt/Bean2CoreObj_ray.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/fmt/Bean2CoreObj_ray.cpp b/fmt/Bean2CoreObj_ray.cpp index 1928868..a8339ac 100644 --- a/fmt/Bean2CoreObj_ray.cpp +++ b/fmt/Bean2CoreObj_ray.cpp @@ -36,6 +36,15 @@ namespace NekoRay::fmt { if (!path.isEmpty()) quic["key"] = path; if (!host.isEmpty()) quic["security"] = host; streamSettings["quicSettings"] = quic; + } else if (network == "tcp" && !header_type.isEmpty()) { + QJsonObject header{{"type", header_type}}; + if (header_type == "http") { + header["request"] = QJsonObject{ + {"path", QList2QJsonArray(path.split(","))}, + {"headers", QJsonObject{{"Host", QList2QJsonArray(host.split(","))}}}, + }; + } + streamSettings["tcpSettings"] = QJsonObject{{"header", header}}; } if (security == "tls") { @@ -56,18 +65,6 @@ namespace NekoRay::fmt { streamSettings["security"] = "tls"; } - if (!header_type.isEmpty()) { - QJsonObject header{{"type", header_type}}; - if (header_type == "http") { - QJsonObject request{ - {"path", QList2QJsonArray(path.split(","))}, - {"headers", QJsonObject{{"Host", QList2QJsonArray(host.split(","))}}}, - }; - header["request"] = request; - } - streamSettings["header"] = header; - } - return streamSettings; }