mirror of
https://github.com/Qv2ray/Qv2ray.git
synced 2025-05-20 19:00:22 +08:00
589 lines
22 KiB
C++
589 lines
22 KiB
C++
#include "ConfigHandler.hpp"
|
|
|
|
#include "common/QvHelpers.hpp"
|
|
#include "components/plugins/QvPluginHost.hpp"
|
|
#include "core/connection/Serialization.hpp"
|
|
#include "core/settings/SettingsBackend.hpp"
|
|
|
|
namespace Qv2ray::core::handlers
|
|
{
|
|
QvConfigHandler::QvConfigHandler()
|
|
{
|
|
DEBUG(MODULE_CORE_HANDLER, "ConnectionHandler Constructor.")
|
|
const auto connectionJson = JsonFromString(StringFromFile(QV2RAY_CONFIG_DIR + "connections.json"));
|
|
const auto groupJson = JsonFromString(StringFromFile(QV2RAY_CONFIG_DIR + "groups.json"));
|
|
//
|
|
for (const auto &connectionId : connectionJson.keys())
|
|
{
|
|
connections.insert(ConnectionId{ connectionId }, ConnectionObject::fromJson(connectionJson.value(connectionId).toObject()));
|
|
}
|
|
//
|
|
for (const auto &groupId : groupJson.keys())
|
|
{
|
|
const auto groupObject = GroupObject::fromJson(groupJson.value(groupId).toObject());
|
|
groups.insert(GroupId{ groupId }, groupObject);
|
|
//
|
|
for (const auto &connId : groupObject.connections)
|
|
{
|
|
connections[connId].__qvConnectionRefCount++;
|
|
}
|
|
}
|
|
//
|
|
for (const auto &id : connections.keys())
|
|
{
|
|
auto const &connectionObject = connections.value(id);
|
|
if (connectionObject.__qvConnectionRefCount == 0)
|
|
{
|
|
connections.remove(id);
|
|
LOG(MODULE_CORE_HANDLER, "Dropped connection id: " + id.toString() + " since it's not in a group")
|
|
}
|
|
else
|
|
{
|
|
const auto connectionFilePath = QV2RAY_CONNECTIONS_DIR + id.toString() + QV2RAY_CONFIG_FILE_EXTENSION;
|
|
connectionRootCache[id] = CONFIGROOT(JsonFromString(StringFromFile(connectionFilePath)));
|
|
DEBUG(MODULE_CORE_HANDLER, "Loaded connection id: " + id.toString() + " into cache.")
|
|
}
|
|
}
|
|
|
|
// Force default group name.
|
|
if (!groups.contains(DefaultGroupId))
|
|
{
|
|
groups.insert(DefaultGroupId, {});
|
|
groups[DefaultGroupId].displayName = tr("Default Group");
|
|
groups[DefaultGroupId].isSubscription = false;
|
|
}
|
|
//
|
|
kernelHandler = new KernelInstanceHandler(this);
|
|
connect(kernelHandler, &KernelInstanceHandler::OnCrashed, this, &QvConfigHandler::OnKernelCrashed_p);
|
|
connect(kernelHandler, &KernelInstanceHandler::OnStatsDataAvailable, this, &QvConfigHandler::OnStatsDataArrived_p);
|
|
connect(kernelHandler, &KernelInstanceHandler::OnKernelLogAvailable, this, &QvConfigHandler::OnKernelLogAvailable);
|
|
connect(kernelHandler, &KernelInstanceHandler::OnConnected, this, &QvConfigHandler::OnConnected);
|
|
connect(kernelHandler, &KernelInstanceHandler::OnDisconnected, this, &QvConfigHandler::OnDisconnected);
|
|
//
|
|
tcpingHelper = new QvTCPingHelper(5, this);
|
|
httpHelper = new QvHttpRequestHelper(this);
|
|
connect(tcpingHelper, &QvTCPingHelper::OnLatencyTestCompleted, this, &QvConfigHandler::OnLatencyDataArrived_p);
|
|
//
|
|
// Save per 1 minutes.
|
|
saveTimerId = startTimer(1 * 60 * 1000);
|
|
// Do not ping all...
|
|
pingConnectionTimerId = startTimer(60 * 1000);
|
|
}
|
|
|
|
void QvConfigHandler::CHSaveConfigData()
|
|
{
|
|
// Do not copy construct.
|
|
// GlobalConfig.connections = connections.keys();
|
|
// GlobalConfig.groups = groups.keys();
|
|
//
|
|
QJsonObject connectionsObject;
|
|
for (const auto &key : connections.keys())
|
|
{
|
|
connectionsObject[key.toString()] = connections[key].toJson();
|
|
}
|
|
StringToFile(JsonToString(connectionsObject), QV2RAY_CONFIG_DIR + "connections.json");
|
|
//
|
|
QJsonObject groupObject;
|
|
for (const auto &key : groups.keys())
|
|
{
|
|
groupObject[key.toString()] = groups[key].toJson();
|
|
}
|
|
StringToFile(JsonToString(groupObject), QV2RAY_CONFIG_DIR + "groups.json");
|
|
SaveGlobalSettings();
|
|
}
|
|
|
|
void QvConfigHandler::timerEvent(QTimerEvent *event)
|
|
{
|
|
if (event->timerId() == saveTimerId)
|
|
{
|
|
CHSaveConfigData();
|
|
}
|
|
else if (event->timerId() == pingAllTimerId)
|
|
{
|
|
StartLatencyTest();
|
|
}
|
|
else if (event->timerId() == pingConnectionTimerId)
|
|
{
|
|
auto id = kernelHandler->CurrentConnection();
|
|
if (!id.isEmpty() && GlobalConfig.advancedConfig.testLatencyPeriodcally)
|
|
{
|
|
StartLatencyTest(id.connectionId);
|
|
}
|
|
}
|
|
}
|
|
|
|
void QvConfigHandler::StartLatencyTest()
|
|
{
|
|
for (auto connection : connections.keys())
|
|
{
|
|
StartLatencyTest(connection);
|
|
}
|
|
}
|
|
|
|
void QvConfigHandler::StartLatencyTest(const GroupId &id)
|
|
{
|
|
for (auto connection : groups[id].connections)
|
|
{
|
|
StartLatencyTest(connection);
|
|
}
|
|
}
|
|
|
|
void QvConfigHandler::StartLatencyTest(const ConnectionId &id)
|
|
{
|
|
emit OnLatencyTestStarted(id);
|
|
tcpingHelper->TestLatency(id);
|
|
}
|
|
|
|
const QList<GroupId> QvConfigHandler::Subscriptions() const
|
|
{
|
|
QList<GroupId> subsList;
|
|
|
|
for (auto group : groups.keys())
|
|
{
|
|
if (groups[group].isSubscription)
|
|
{
|
|
subsList.push_back(group);
|
|
}
|
|
}
|
|
|
|
return subsList;
|
|
}
|
|
|
|
// const ConnectionId QvConfigHandler::GetConnectionIdByDisplayName(const QString &displayName, const GroupId &group) const
|
|
// {
|
|
// CheckGroupExistanceEx(group, NullConnectionId);
|
|
// for (auto conn : groups[group].connections)
|
|
// {
|
|
// if (connections[conn].displayName == displayName)
|
|
// {
|
|
// return conn;
|
|
// }
|
|
// }
|
|
|
|
// return NullConnectionId;
|
|
// }
|
|
// const GroupId QvConfigHandler::GetGroupIdByDisplayName(const QString &displayName) const
|
|
// {
|
|
// for (auto group : groups.keys())
|
|
// {
|
|
// if (groups[group].displayName == displayName)
|
|
// {
|
|
// return group;
|
|
// }
|
|
// }
|
|
|
|
// return NullGroupId;
|
|
// }
|
|
void QvConfigHandler::ClearGroupUsage(const GroupId &id)
|
|
{
|
|
for (const auto &conn : groups[id].connections)
|
|
{
|
|
ClearConnectionUsage({ conn, id });
|
|
}
|
|
}
|
|
void QvConfigHandler::ClearConnectionUsage(const ConnectionGroupPair &id)
|
|
{
|
|
CheckConnectionExistanceEx(id.connectionId, nothing);
|
|
connections[id.connectionId].upLinkData = 0;
|
|
connections[id.connectionId].downLinkData = 0;
|
|
emit OnStatsAvailable(id, 0, 0, 0, 0);
|
|
PluginHost->Send_ConnectionStatsEvent({ GetDisplayName(id.connectionId), 0, 0, 0, 0 });
|
|
return;
|
|
}
|
|
|
|
const QList<GroupId> QvConfigHandler::GetGroupId(const ConnectionId &connId) const
|
|
{
|
|
CheckConnectionExistanceEx(connId, {});
|
|
QList<GroupId> grps;
|
|
for (const auto &groupId : groups.keys())
|
|
{
|
|
const auto &group = groups[groupId];
|
|
if (group.connections.contains(connId))
|
|
{
|
|
grps.push_back(groupId);
|
|
}
|
|
}
|
|
return grps;
|
|
}
|
|
|
|
const std::optional<QString> QvConfigHandler::RenameConnection(const ConnectionId &id, const QString &newName)
|
|
{
|
|
CheckConnectionExistance(id);
|
|
OnConnectionRenamed(id, connections[id].displayName, newName);
|
|
PluginHost->Send_ConnectionEvent({ Events::ConnectionEntry::Renamed, newName, connections[id].displayName });
|
|
connections[id].displayName = newName;
|
|
CHSaveConfigData();
|
|
return {};
|
|
}
|
|
|
|
const std::optional<QString> QvConfigHandler::DeleteConnectionFromGroup(const ConnectionId &id, const GroupId &gid)
|
|
{
|
|
CheckConnectionExistance(id);
|
|
// auto groupId = connections[id].groupId;
|
|
// QFile connectionFile((groups[groupId].isSubscription ? QV2RAY_SUBSCRIPTION_DIR : QV2RAY_CONNECTIONS_DIR) + groupId.toString() + "/" +
|
|
// id.toString() + QV2RAY_CONFIG_FILE_EXTENSION);
|
|
////
|
|
// PluginHost->Send_ConnectionEvent({ connections[id].displayName, "", Events::ConnectionEntry::Deleted });
|
|
// connections.remove(id);
|
|
// groups[groupId].connections.removeAll(id);
|
|
////
|
|
// if (GlobalConfig.autoStartId == id.toString())
|
|
//{
|
|
// GlobalConfig.autoStartId.clear();
|
|
//}
|
|
////
|
|
// emit OnConnectionDeleted(id, groupId);
|
|
////
|
|
// bool exists = connectionFile.exists();
|
|
// if (exists)
|
|
//{
|
|
// bool removed = connectionFile.remove();
|
|
// if (removed)
|
|
// {
|
|
// return {};
|
|
// }
|
|
// return "Failed to remove file";
|
|
//}
|
|
return tr("File does not exist.");
|
|
}
|
|
|
|
const std::optional<QString> QvConfigHandler::LinkConnectionWithGroup(const ConnectionId &id, const GroupId &newGroupId)
|
|
{
|
|
CheckConnectionExistance(id);
|
|
if (!groups[newGroupId].connections.contains(id))
|
|
{
|
|
groups[newGroupId].connections.append(id);
|
|
}
|
|
PluginHost->Send_ConnectionEvent({ Events::ConnectionEntry::LinkedWithGroup, connections[id].displayName, "" });
|
|
emit OnConnectionLinkedWithGroup(id, newGroupId);
|
|
return {};
|
|
}
|
|
|
|
const std::optional<QString> QvConfigHandler::DeleteGroup(const GroupId &id)
|
|
{
|
|
CheckGroupExistance(id);
|
|
if (!groups.contains(id) || id == NullGroupId)
|
|
{
|
|
return tr("Group does not exist");
|
|
}
|
|
|
|
// Copy construct
|
|
auto list = groups[id].connections;
|
|
for (const auto &conn : list)
|
|
{
|
|
LinkConnectionWithGroup(conn, DefaultGroupId);
|
|
}
|
|
//
|
|
// TODO
|
|
if (groups[id].isSubscription)
|
|
{
|
|
// QDir(QV2RAY_SUBSCRIPTION_DIR + id.toString()).removeRecursively();
|
|
}
|
|
else
|
|
{
|
|
QDir(QV2RAY_CONNECTIONS_DIR + id.toString()).removeRecursively();
|
|
}
|
|
//
|
|
PluginHost->Send_ConnectionEvent({ Events::ConnectionEntry::FullyRemoved, groups[id].displayName, "" });
|
|
//
|
|
groups.remove(id);
|
|
CHSaveConfigData();
|
|
emit OnGroupDeleted(id, list);
|
|
if (id == DefaultGroupId)
|
|
{
|
|
groups[id].displayName = tr("Default Group");
|
|
}
|
|
return {};
|
|
}
|
|
|
|
const std::optional<QString> QvConfigHandler::StartConnection(const ConnectionId &id, const GroupId &group)
|
|
{
|
|
return {};
|
|
// CheckConnectionExistance(id);
|
|
// connections[id].lastConnected = system_clock::to_time_t(system_clock::now());
|
|
// CONFIGROOT root = GetConnectionRoot(id);
|
|
// return kernelHandler->StartConnection(id, root);
|
|
}
|
|
|
|
void QvConfigHandler::RestartConnection() // const ConnectionId &id
|
|
{
|
|
kernelHandler->RestartConnection();
|
|
}
|
|
|
|
void QvConfigHandler::StopConnection() // const ConnectionId &id
|
|
{
|
|
kernelHandler->StopConnection();
|
|
CHSaveConfigData();
|
|
}
|
|
|
|
void QvConfigHandler::OnKernelCrashed_p(const ConnectionGroupPair &id, const QString &errMessage)
|
|
{
|
|
LOG(MODULE_CORE_HANDLER, "Kernel crashed: " + errMessage)
|
|
emit OnDisconnected(id);
|
|
PluginHost->Send_ConnectivityEvent({ GetDisplayName(id.connectionId), {}, Events::Connectivity::Disconnected });
|
|
emit OnKernelCrashed(id, errMessage);
|
|
}
|
|
|
|
QvConfigHandler::~QvConfigHandler()
|
|
{
|
|
LOG(MODULE_CORE_HANDLER, "Triggering save settings from destructor")
|
|
delete kernelHandler;
|
|
delete httpHelper;
|
|
CHSaveConfigData();
|
|
}
|
|
|
|
const CONFIGROOT QvConfigHandler::GetConnectionRoot(const ConnectionId &id) const
|
|
{
|
|
CheckConnectionExistanceEx(id, CONFIGROOT());
|
|
return connectionRootCache.value(id);
|
|
}
|
|
|
|
void QvConfigHandler::OnLatencyDataArrived_p(const QvTCPingResultObject &result)
|
|
{
|
|
CheckConnectionExistanceEx(result.connectionId, nothing);
|
|
connections[result.connectionId].latency = result.avg;
|
|
emit OnLatencyTestFinished(result.connectionId, result.avg);
|
|
}
|
|
|
|
bool QvConfigHandler::UpdateConnection(const ConnectionId &id, const CONFIGROOT &root, bool skipRestart)
|
|
{
|
|
CheckConnectionExistanceEx(id, false);
|
|
//
|
|
auto path = QV2RAY_CONNECTIONS_DIR + "/" + id.toString() + QV2RAY_CONFIG_FILE_EXTENSION;
|
|
auto content = JsonToString(root);
|
|
bool result = StringToFile(content, path);
|
|
//
|
|
connectionRootCache[id] = root;
|
|
//
|
|
emit OnConnectionModified(id);
|
|
PluginHost->Send_ConnectionEvent({ Events::ConnectionEntry::Edited, connections[id].displayName, "" });
|
|
if (!skipRestart && kernelHandler->CurrentConnection().connectionId == id)
|
|
{
|
|
emit RestartConnection();
|
|
}
|
|
return result;
|
|
}
|
|
|
|
const GroupId QvConfigHandler::CreateGroup(const QString displayName, bool isSubscription)
|
|
{
|
|
GroupId id(GenerateRandomString());
|
|
groups[id].displayName = displayName;
|
|
groups[id].isSubscription = isSubscription;
|
|
groups[id].creationDate = system_clock::to_time_t(system_clock::now());
|
|
PluginHost->Send_ConnectionEvent({ Events::ConnectionEntry::Created, displayName, "" });
|
|
emit OnGroupCreated(id, displayName);
|
|
CHSaveConfigData();
|
|
return id;
|
|
}
|
|
|
|
const std::optional<QString> QvConfigHandler::RenameGroup(const GroupId &id, const QString &newName)
|
|
{
|
|
CheckGroupExistance(id);
|
|
if (!groups.contains(id))
|
|
{
|
|
return tr("Group does not exist");
|
|
}
|
|
OnGroupRenamed(id, groups[id].displayName, newName);
|
|
PluginHost->Send_ConnectionEvent({ Events::ConnectionEntry::Renamed, newName, groups[id].displayName });
|
|
groups[id].displayName = newName;
|
|
return {};
|
|
}
|
|
|
|
// const std::tuple<QString, int64_t, float> QvConfigHandler::GetSubscriptionData(const GroupId &id) const
|
|
// {
|
|
// CheckGroupExistanceEx(id, {});
|
|
// std::tuple<QString, int64_t, float> result;
|
|
|
|
// if (!groups[id].isSubscription)
|
|
// {
|
|
// return result;
|
|
// }
|
|
|
|
// return { groups[id].address, groups[id].lastUpdatedDate, groups[id].updateInterval };
|
|
// }
|
|
|
|
bool QvConfigHandler::SetSubscriptionData(const GroupId &id, bool isSubscription, const QString &address, float updateInterval)
|
|
{
|
|
CheckGroupExistanceEx(id, false);
|
|
if (!groups.contains(id))
|
|
{
|
|
return false;
|
|
}
|
|
groups[id].isSubscription = isSubscription;
|
|
if (!address.isEmpty())
|
|
{
|
|
groups[id].subscriptionOption.address = address;
|
|
}
|
|
if (updateInterval != -1)
|
|
{
|
|
groups[id].subscriptionOption.updateInterval = updateInterval;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool QvConfigHandler::UpdateSubscription(const GroupId &id)
|
|
{
|
|
CheckGroupExistanceEx(id, false);
|
|
if (isHttpRequestInProgress || !groups[id].isSubscription)
|
|
{
|
|
return false;
|
|
}
|
|
isHttpRequestInProgress = true;
|
|
auto data = httpHelper->Get(groups[id].subscriptionOption.address);
|
|
isHttpRequestInProgress = false;
|
|
return CHUpdateSubscription_p(id, data);
|
|
}
|
|
|
|
bool QvConfigHandler::CHUpdateSubscription_p(const GroupId &id, const QByteArray &subscriptionData)
|
|
{
|
|
CheckGroupExistanceEx(id, false);
|
|
if (!groups.contains(id))
|
|
{
|
|
return false;
|
|
}
|
|
// List that is holding connection IDs to be updated.
|
|
auto subsList = SplitLines(DecodeSubscriptionString(subscriptionData));
|
|
//
|
|
if (subsList.count() < 5)
|
|
{
|
|
auto yes = QvMessageBoxAsk(
|
|
nullptr, tr("Update Subscription"),
|
|
tr("%1 entrie(s) have been found from the subscription source, do you want to continue?").arg(subsList.count())) ==
|
|
QMessageBox::Yes;
|
|
if (!yes)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
// Anyway, we try our best to preserve the connection id.
|
|
QMultiMap<QString, ConnectionId> nameMap;
|
|
QMultiMap<std::tuple<QString, QString, int>, ConnectionId> typeMap;
|
|
for (const auto &conn : groups[id].connections)
|
|
{
|
|
nameMap.insert(GetDisplayName(conn), conn);
|
|
auto [protocol, host, port] = GetConnectionInfo(conn);
|
|
if (port != 0)
|
|
{
|
|
typeMap.insert({ protocol, host, port }, conn);
|
|
}
|
|
}
|
|
QDir().mkpath(QV2RAY_CONNECTIONS_DIR);
|
|
bool hasErrorOccured = false;
|
|
// Copy construct here.
|
|
auto connectionsOrig = groups[id].connections;
|
|
groups[id].connections.clear();
|
|
//
|
|
for (auto vmess : subsList)
|
|
{
|
|
QString errMessage;
|
|
auto ssdGroupName = GetDisplayName(id);
|
|
QString __alias;
|
|
auto conf = ConvertConfigFromString(vmess.trimmed(), &__alias, &errMessage, &ssdGroupName);
|
|
Q_UNUSED(ssdGroupName)
|
|
// Things may go wrong when updating a subscription with ssd:// link
|
|
for (auto _alias : conf.keys())
|
|
{
|
|
for (const auto &config : conf.values(_alias))
|
|
{
|
|
if (!errMessage.isEmpty())
|
|
{
|
|
LOG(MODULE_SUBSCRIPTION, "Processing a subscription with following error: " + errMessage)
|
|
hasErrorOccured = true;
|
|
continue;
|
|
}
|
|
bool canGetOutboundData = false;
|
|
// Should not have complex connection we assume.
|
|
auto outboundData = GetConnectionInfo(config, &canGetOutboundData);
|
|
//
|
|
// Begin guessing new ConnectionId
|
|
if (nameMap.contains(_alias))
|
|
{
|
|
// Just go and save the connection...
|
|
LOG(MODULE_CORE_HANDLER, "Reused connection id from name: " + _alias)
|
|
auto _conn = nameMap.take(_alias);
|
|
groups[id].connections << _conn;
|
|
UpdateConnection(_conn, config);
|
|
// Remove Connection Id from the list.
|
|
connectionsOrig.removeAll(_conn);
|
|
typeMap.remove(typeMap.key(_conn));
|
|
}
|
|
else if (canGetOutboundData && typeMap.contains(outboundData))
|
|
{
|
|
LOG(MODULE_CORE_HANDLER, "Reused connection id from protocol/host/port pair for connection: " + _alias)
|
|
auto _conn = typeMap.take(outboundData);
|
|
groups[id].connections << _conn;
|
|
// Update Connection Properties
|
|
UpdateConnection(_conn, config);
|
|
RenameConnection(_conn, _alias);
|
|
// Remove Connection Id from the list.
|
|
connectionsOrig.removeAll(_conn);
|
|
nameMap.remove(nameMap.key(_conn));
|
|
}
|
|
else
|
|
{
|
|
// New connection id is required since nothing matched found...
|
|
LOG(MODULE_CORE_HANDLER, "Generated new connection id for connection: " + _alias)
|
|
CreateConnection(_alias, id, config);
|
|
}
|
|
// End guessing connectionId
|
|
}
|
|
}
|
|
}
|
|
|
|
// Check if anything left behind (not being updated or changed significantly)
|
|
LOG(MODULE_CORE_HANDLER, "Removed old connections not have been matched.")
|
|
for (auto conn : connectionsOrig)
|
|
{
|
|
LOG(MODULE_CORE_HANDLER, "Removing: " + conn.toString())
|
|
abort();
|
|
// DeleteConnection(conn);
|
|
}
|
|
|
|
// Update the time
|
|
groups[id].lastUpdatedDate = system_clock::to_time_t(system_clock::now());
|
|
|
|
return hasErrorOccured;
|
|
}
|
|
|
|
void QvConfigHandler::OnStatsDataArrived_p(const ConnectionGroupPair &id, const quint64 uploadSpeed, const quint64 downloadSpeed)
|
|
{
|
|
if (id.isEmpty())
|
|
return;
|
|
const auto &connectionId = id.connectionId;
|
|
connections[connectionId].upLinkData += uploadSpeed;
|
|
connections[connectionId].downLinkData += downloadSpeed;
|
|
emit OnStatsAvailable(id, uploadSpeed, downloadSpeed, //
|
|
connections[connectionId].upLinkData, //
|
|
connections[connectionId].downLinkData);
|
|
PluginHost->Send_ConnectionStatsEvent({ GetDisplayName(connectionId), //
|
|
uploadSpeed, downloadSpeed, //
|
|
connections[connectionId].upLinkData, //
|
|
connections[connectionId].downLinkData });
|
|
}
|
|
|
|
const ConnectionId QvConfigHandler::CreateConnection(const QString &displayName, const GroupId &groupId, const CONFIGROOT &root,
|
|
bool skipSaveConfig)
|
|
{
|
|
LOG(MODULE_CORE_HANDLER, "Creating new connection: " + displayName)
|
|
ConnectionId newId(GenerateUuid());
|
|
groups[groupId].connections << newId;
|
|
connections[newId].creationDate = system_clock::to_time_t(system_clock::now());
|
|
connections[newId].displayName = displayName;
|
|
emit OnConnectionCreated({ newId, groupId }, displayName);
|
|
PluginHost->Send_ConnectionEvent({ Events::ConnectionEntry::Created, displayName, "" });
|
|
UpdateConnection(newId, root);
|
|
if (!skipSaveConfig)
|
|
{
|
|
CHSaveConfigData();
|
|
}
|
|
return newId;
|
|
}
|
|
|
|
} // namespace Qv2ray::core::handlers
|
|
|
|
#undef CheckIdExistance
|
|
#undef CheckGroupExistanceEx
|
|
#undef CheckGroupExistance
|
|
#undef CheckConnectionExistanceEx
|
|
#undef CheckConnectionExistance
|