Merge branch 'dev' into refactoring/android
This commit is contained in:
commit
e605f549bd
10 changed files with 128 additions and 37 deletions
|
@ -48,6 +48,22 @@ void ExportController::generateFullAccessConfig()
|
|||
int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
|
||||
QJsonObject config = m_settings->server(serverIndex);
|
||||
|
||||
QJsonArray containers = config.value(config_key::containers).toArray();
|
||||
for (auto i = 0; i < containers.size(); i++) {
|
||||
auto containerConfig = containers.at(i).toObject();
|
||||
auto containerType = ContainerProps::containerFromString(containerConfig.value(config_key::container).toString());
|
||||
|
||||
for (auto protocol : ContainerProps::protocolsForContainer(containerType)) {
|
||||
auto protocolConfig = containerConfig.value(ProtocolProps::protoToString(protocol)).toObject();
|
||||
|
||||
protocolConfig.remove(config_key::last_config);
|
||||
containerConfig[ProtocolProps::protoToString(protocol)] = protocolConfig;
|
||||
}
|
||||
|
||||
containers.replace(i, containerConfig);
|
||||
}
|
||||
config[config_key::containers] = containers;
|
||||
|
||||
QByteArray compressedConfig = QJsonDocument(config).toJson();
|
||||
compressedConfig = qCompress(compressedConfig, 8);
|
||||
m_config = QString("vpn://%1")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue