Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import the maybenot machines file in the project #6602

Merged
merged 3 commits into from
Aug 13, 2024
Merged

Import the maybenot machines file in the project #6602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f60c6b8
Import the maybenot machines file in the project
buggmagnet Aug 12, 2024
c932eee
Update swiftformat to ignore the autogenerated file
buggmagnet Aug 12, 2024
3a3a0ce
Update the wireguard-go to head of mullvad-master
buggmagnet Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios/.swiftformat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# file options
--exclude Build, .spm, MullvadVPNScreenshots/SnapshotHelper.swift
--exclude Build, .spm, MullvadVPNScreenshots/SnapshotHelper.swift, PacketTunnelCore/Daita/Maybenot.swift

# general options
--swiftversion 5.8
Expand Down
33 changes: 32 additions & 1 deletion ios/MullvadVPN.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@
A97D25B42B0CB59300946B2D /* TunnelObfuscationStub.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97D25B32B0CB59300946B2D /* TunnelObfuscationStub.swift */; };
A97D30172AE6B5E90045C0E4 /* StoredWgKeyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97D30162AE6B5E90045C0E4 /* StoredWgKeyData.swift */; };
A97FF5502A0D2FFC00900996 /* NSFileCoordinator+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97FF54F2A0D2FFC00900996 /* NSFileCoordinator+Extensions.swift */; };
A9840BB42C69F78A0030F05E /* Maybenot.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9840BB32C69F78A0030F05E /* Maybenot.swift */; };
A98502032B627B120061901E /* LocalNetworkProbe.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98502022B627B120061901E /* LocalNetworkProbe.swift */; };
A988A3E22AFE54AC0008D2C7 /* AccountExpiry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6F2FA62AFBB9AE006D0856 /* AccountExpiry.swift */; };
A988DF272ADE86ED00D807EF /* WireGuardObfuscationSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A988DF252ADE86ED00D807EF /* WireGuardObfuscationSettings.swift */; };
Expand Down Expand Up @@ -2013,6 +2014,7 @@
A97D25B32B0CB59300946B2D /* TunnelObfuscationStub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelObfuscationStub.swift; sourceTree = "<group>"; };
A97D30162AE6B5E90045C0E4 /* StoredWgKeyData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoredWgKeyData.swift; sourceTree = "<group>"; };
A97FF54F2A0D2FFC00900996 /* NSFileCoordinator+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSFileCoordinator+Extensions.swift"; sourceTree = "<group>"; };
A9840BB32C69F78A0030F05E /* Maybenot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Maybenot.swift; sourceTree = "<group>"; };
A98502022B627B120061901E /* LocalNetworkProbe.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNetworkProbe.swift; sourceTree = "<group>"; };
A988DF252ADE86ED00D807EF /* WireGuardObfuscationSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireGuardObfuscationSettings.swift; sourceTree = "<group>"; };
A988DF282ADE880300D807EF /* TunnelSettingsV3.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelSettingsV3.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3330,6 +3332,7 @@
58C7A4372A863F450060C66F /* PacketTunnelCore */ = {
isa = PBXGroup;
children = (
A9840BB12C69F7190030F05E /* Daita */,
58C7A4382A863F450060C66F /* PacketTunnelCore.h */,
58C9B8DF2ABB273700040B46 /* URLRequestProxy */,
58C9B8C52ABB23B400040B46 /* IPC */,
Expand Down Expand Up @@ -3977,6 +3980,14 @@
path = Socks5;
sourceTree = "<group>";
};
A9840BB12C69F7190030F05E /* Daita */ = {
isa = PBXGroup;
children = (
A9840BB32C69F78A0030F05E /* Maybenot.swift */,
);
path = Daita;
sourceTree = "<group>";
};
A992DA1E2C24709F00DE7CE5 /* MullvadRustRuntime */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4428,6 +4439,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 58C7A44B2A863F4A0060C66F /* Build configuration list for PBXNativeTarget "PacketTunnelCore" */;
buildPhases = (
A9840BB22C69F7290030F05E /* Import maybenot_machines */,
58C7A4312A863F440060C66F /* Headers */,
58C7A4322A863F440060C66F /* Sources */,
58C7A4332A863F440060C66F /* Frameworks */,
Expand Down Expand Up @@ -5061,6 +5073,24 @@
shellPath = /bin/sh;
shellScript = "if [[ \"$(uname -m)\" == arm64 ]]; then\n export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif which swiftlint > /dev/null; then\n swiftlint PacketTunnel/**/*.swift\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
A9840BB22C69F7290030F05E /* Import maybenot_machines */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Import maybenot_machines";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "MAYBENOT_MACHINES=`cat ${SRCROOT}/../dist-assets/maybenot_machines`\ncat > ${SRCROOT}/PacketTunnelCore/Daita/Maybenot.swift << EOF\n// swiftlint:disable line_length\n// This is an autogenerated file, do not edit\npublic struct Maybenot {\n public let machines=\"\"\"\n$MAYBENOT_MACHINES\n\"\"\"\n public let maximumEvents: UInt32 = 1000\n public let maximumActions: UInt32 = 1000\n}\n// swiftlint:enable line_length\nEOF\n";
};
A992DA2A2C2470B300DE7CE5 /* Build MullvadRustRuntime */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -5444,6 +5474,7 @@
583832272AC3193600EA2071 /* PacketTunnelActor+SleepCycle.swift in Sources */,
58FE25DC2AA72A8F003D1918 /* AnyTask.swift in Sources */,
F04AF92D2C466013004A8314 /* PostQuantumNegotiationState.swift in Sources */,
A9840BB42C69F78A0030F05E /* Maybenot.swift in Sources */,
58FE25D92AA72A8F003D1918 /* AutoCancellingTask.swift in Sources */,
58FE25E12AA72A9B003D1918 /* SettingsReaderProtocol.swift in Sources */,
58C7A4582A863FB90060C66F /* TunnelMonitorProtocol.swift in Sources */,
Expand Down Expand Up @@ -9147,7 +9178,7 @@
repositoryURL = "https://github.com/mullvad/wireguard-apple.git";
requirement = {
kind = revision;
revision = e3fdc2e95ccd7a30284ec78f3bdf4f9a252a1ed2;
revision = 3c55cc305d30a02f87af5d6228ff416d3901d8dd;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mullvad/wireguard-apple.git",
"state" : {
"revision" : "e3fdc2e95ccd7a30284ec78f3bdf4f9a252a1ed2"
"revision" : "3c55cc305d30a02f87af5d6228ff416d3901d8dd"
}
}
],
Expand Down
13 changes: 13 additions & 0 deletions ios/PacketTunnelCore/Daita/Maybenot.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// swiftlint:disable line_length
// This is an autogenerated file, do not edit
public struct Maybenot {
public let machines="""
789cd5cfbb0900200c04d08b833886adb889389f5bb9801be811acb58ae2837ce02010c158b070555c9538b6377a64dbb0ceff242c20b79038507dd169fbede9f629bf6f021efa1b66
789cedd0510a401110856153f665ffbbb1030e991735717890f8eabae22f35e252e31a6c2b6c2bf158ce88010b61b69fed14db7fabd8498ffad17d8fedbf5decc4adde3ab7b0fddb045fa153d3ff09ecdb6c7faf0cd04322e8
789cedd1510a80200c80617de95addff36dda096e84b209bfe0f1bb40f32297f1056cbdd954eb68d6c9b7ac8e2e33a650176fbdd6ea07df24227b7daaf9effa27df2462768edade766689fa2a093d47aedbf86f6291a3ad1593ffb6e45fb4454795e630ae31d11bd1bedffeb0151b22c62
789cedd2bd4b82411c07f07b2a48846a089a326889861a9c2452ee12221e0ca2a5201ca5a122fc0bda042544370771f3159c9c0405e51914e45c5414df7d441075f00515c4c553f0117906075f40f0331c77c7ddef8efb1e05a6de8e6f3d96661392ee1c6a9f349b72e6316a6e542c4c980b5dbb24cfbbcccefa1d00d57df145ff44079506a677adacc29623a4780f30288a312e99440f809a7d9b457c4711a1b8cf7249ea2adf75cb698e1b4fb50f19dc4d67e0c95d12d354186ab3b1e74f5b9ab7aecc4e70f332e918bfdef6db03ce9042a2bba491e88324629022ef85a6f1aa95a3ece0efcb5f5223012039997e3b726455cb84a9f82322db96f6ff531dbada6558bb120bdce79915bf6c6bc5f51659febc1141265ee0
"""
public let maximumEvents: UInt32 = 1000
public let maximumActions: UInt32 = 1000
}
// swiftlint:enable line_length
Loading