diff --git a/src/speedtestutil.h b/src/speedtestutil.h index 29b5c12..2688f64 100644 --- a/src/speedtestutil.h +++ b/src/speedtestutil.h @@ -2,7 +2,6 @@ #define SPEEDTESTUTIL_H_INCLUDED #include -#include #include "misc.h" #include "nodeinfo.h" diff --git a/src/subexport.cpp b/src/subexport.cpp index 63ef75d..c9cdd02 100644 --- a/src/subexport.cpp +++ b/src/subexport.cpp @@ -90,21 +90,21 @@ std::string vmessConstruct(const std::string &group, const std::string &remarks, writer.Key("Port"); writer.Int(to_int(port)); writer.Key("UserID"); - writer.String(id.size() ? id.data() : "00000000-0000-0000-0000-000000000000"); + writer.String(id.empty() ? "00000000-0000-0000-0000-000000000000" : id.data()); writer.Key("AlterID"); writer.Int(to_int(aid)); writer.Key("EncryptMethod"); writer.String(cipher.data()); writer.Key("TransferProtocol"); - writer.String(net.data()); + writer.String(net.empty() ? "tcp" : net.data()); writer.Key("Host"); - writer.String(host.size() ? trim(host).data() : add.data()); + writer.String(host.empty() ? add.data() : trim(host).data()); writer.Key("Edge"); writer.String(edge.data()); if(net == "ws" || net == "http") { writer.Key("Path"); - writer.String(path.size() ? trim(path).data() : "/"); + writer.String(path.empty() ? "/" : trim(path).data()); } else {