cloak container fix
This commit is contained in:
parent
5932db24e1
commit
d553d7f772
1 changed files with 6 additions and 0 deletions
|
|
@ -19,15 +19,20 @@ amnezia::DockerContainer ContainerProps::containerFromString(const QString &cont
|
||||||
|
|
||||||
QString ContainerProps::containerToString(amnezia::DockerContainer c){
|
QString ContainerProps::containerToString(amnezia::DockerContainer c){
|
||||||
if (c == DockerContainer::None) return "none";
|
if (c == DockerContainer::None) return "none";
|
||||||
|
if (c == DockerContainer::Cloak) return "amnezia-openvpn-cloak";
|
||||||
|
|
||||||
QMetaEnum metaEnum = QMetaEnum::fromType<DockerContainer>();
|
QMetaEnum metaEnum = QMetaEnum::fromType<DockerContainer>();
|
||||||
QString containerKey = metaEnum.valueToKey(static_cast<int>(c));
|
QString containerKey = metaEnum.valueToKey(static_cast<int>(c));
|
||||||
|
|
||||||
return "amnezia-" + containerKey.toLower();
|
return "amnezia-" + containerKey.toLower();
|
||||||
}
|
}
|
||||||
|
|
||||||
QVector<amnezia::Protocol> ContainerProps::protocolsForContainer(amnezia::DockerContainer container)
|
QVector<amnezia::Protocol> ContainerProps::protocolsForContainer(amnezia::DockerContainer container)
|
||||||
{
|
{
|
||||||
switch (container) {
|
switch (container) {
|
||||||
|
case DockerContainer::None:
|
||||||
|
return { };
|
||||||
|
|
||||||
case DockerContainer::OpenVpn:
|
case DockerContainer::OpenVpn:
|
||||||
return { Protocol::OpenVpn };
|
return { Protocol::OpenVpn };
|
||||||
|
|
||||||
|
|
@ -59,6 +64,7 @@ QList<DockerContainer> ContainerProps::allContainers()
|
||||||
QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
|
QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
|
||||||
{
|
{
|
||||||
return {
|
return {
|
||||||
|
{DockerContainer::None, "Unknown (Old version)"},
|
||||||
{DockerContainer::OpenVpn, "OpenVPN"},
|
{DockerContainer::OpenVpn, "OpenVPN"},
|
||||||
{DockerContainer::ShadowSocks, "OpenVpn over ShadowSocks"},
|
{DockerContainer::ShadowSocks, "OpenVpn over ShadowSocks"},
|
||||||
{DockerContainer::Cloak, "OpenVpn over Cloak"},
|
{DockerContainer::Cloak, "OpenVpn over Cloak"},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue