diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bef831ae012..63878a7c956d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -709,7 +709,7 @@ This release is identical to 2021.5-beta2 except that it has translations for ne - Fix incorrect location and connection status while disconnecting and incorrect location in the beginning while connecting in the desktop app. - Improve responsiveness of the controls and status text in the main view in the desktop app. -- Read macOS scrollbar visibility settings to decide wheter or not the scrollbars should hide when +- Read macOS scrollbar visibility settings to decide whether or not the scrollbars should hide when not scrolling. - Fix IPv6 connections to WireGuard servers by not dropping select neighbor advertisements and solicitations. @@ -1949,7 +1949,7 @@ This release is identical to 2019.8-beta1 the Wi-Fi calling via iPhone when both devices are on the same network. - Allow incoming DHCPv4 requests and outgoing responses if allow local network is enabled. Enables being a DHCPv4 server. -- Add GUI translations for Italian, Japanese, Dutch, Portugese, Russian and Turkish. +- Add GUI translations for Italian, Japanese, Dutch, Portuguese, Russian and Turkish. - Add missing GUI translations for Czech Republic, USA and UK in the select location view. - Add translations for the current location displayed on the main screen in the GUI. - Allow a subset of NDP (Router solicitation, router advertisement and redirects) in the firewall. @@ -1973,7 +1973,7 @@ This release is identical to 2019.8-beta1 - Stop allowing the wrong IPv6 net fe02::/16 in the firewall when allow local network was enabled. Instead allow the correct multicast nets ff02::/16 and ff05::/16. - Fix the regression that allowed to get past the login screen using the invalid account token. -- Fix the GUI crash caused by a derefence of the already released remote object in Electron. +- Fix the GUI crash caused by a dereference of the already released remote object in Electron. #### macOS - Raise max number of open files for the daemon to 1024. Should prevent threads from panicking. @@ -2361,7 +2361,7 @@ This release is identical to 2018.2-beta3 - Account tokens are now required to have at least ten digits. #### macOS -- Rename directores for settings, logs and cache from `mullvad-daemon` to `mullvad-vpn`. +- Rename directories for settings, logs and cache from `mullvad-daemon` to `mullvad-vpn`. #### Windows - Use local user directory to store system service settings and GUI electron cache, instead of the @@ -2527,8 +2527,8 @@ This release is identical to 2018.2-beta3 - The tray icon now indicates whether the app is allowing traffic outside the tunnel or not. If the app blocks traffic because the tunnel is not connected the tray icon will indicate this with a green lock with a red dot. -- While connecting, a message telling the user that internet accesss is blocked is shown. -- Default to selecting servers in Sweden to increase the likelyhood of a fast and stable connection. +- While connecting, a message telling the user that internet access is blocked is shown. +- Default to selecting servers in Sweden to increase the likelihood of a fast and stable connection. - Scrollbars will automatically hide when not scrolling. ### Removed diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md index 5a49fe8837b6..7ef56a54c60b 100644 --- a/android/BuildInstructions.md +++ b/android/BuildInstructions.md @@ -19,7 +19,7 @@ Run the following command to trigger a full debug build: ### Release build 1. Configure a signing key by following [these instructions](#configure-signing-key). -2. Run the following command after setting the `ANDROID_CREDENTIALS_DIR` enviroment variable to the +2. Run the following command after setting the `ANDROID_CREDENTIALS_DIR` environment variable to the directory configured in step 1: ```bash ../building/containerized-build.sh android --app-bundle @@ -32,7 +32,7 @@ therefore not recommended. *: A container is still used to build `wireguard-go`. -### Setup build enviroment +### Setup build environment These steps explain how to manually setup the build environment on a Linux system. #### 1. Install `podman` diff --git a/audits/2020-06-12-cure53.md b/audits/2020-06-12-cure53.md index 51c9e1920b84..bcc85c1571b9 100644 --- a/audits/2020-06-12-cure53.md +++ b/audits/2020-06-12-cure53.md @@ -39,7 +39,7 @@ For full transparency we insist to publish both versions. The reports are also available directly in this repository: * Final version: [pentest-report_mullvad_2020_v2.pdf](./pentest-report_mullvad_2020_v2.pdf) -* Inital version: [pentest-report_mullvad_2020_v1.pdf](./pentest-report_mullvad_2020_v1.pdf) +* Initial version: [pentest-report_mullvad_2020_v1.pdf](./pentest-report_mullvad_2020_v1.pdf) ## Overview of findings diff --git a/build-windows-modules.sh b/build-windows-modules.sh index 849b80b2d673..82070a95479c 100755 --- a/build-windows-modules.sh +++ b/build-windows-modules.sh @@ -69,7 +69,7 @@ function get_solution_output_path { "x86") echo "$solution_root/bin/Win32-$build_mode";; "x64") echo "$solution_root/bin/x64-$build_mode";; *) - echo "Unkown build target: $build_target" + echo "Unknown build target: $build_target" exit 1 ;; esac diff --git a/building/build-and-publish-container-image.sh b/building/build-and-publish-container-image.sh index 7220d71f30b1..9c7a068c53e7 100755 --- a/building/build-and-publish-container-image.sh +++ b/building/build-and-publish-container-image.sh @@ -78,7 +78,7 @@ fi cp "$tmp_signature_dir/signature-2" "$signature_dir/" -log_header "Commiting container sigstore signatures" +log_header "Committing container sigstore signatures" git add "$signature_dir" GPG_TTY=$(tty) git commit -S -m "Add container signature for $container_name:$tag" diff --git a/docs/architecture.md b/docs/architecture.md index 4837758a4530..41dc9d83579b 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -241,7 +241,7 @@ On Linux, connectivity is inferred by checking if there exists a route to a publ Currently the Mullvad API IP is used, but the actual IP does not matter as long as it's not a local one. This is done via Netlink and the route is queried via the exclusion firewall mark - otherwise, when a tunnel is connected, the address would always be routable as it'd be routed through the -tunnel interface. As such, the offline monitor is somewhat coupled to routing and split tunelling on +tunnel interface. As such, the offline monitor is somewhat coupled to routing and split tunnelling on Linux. #### macOS diff --git a/docs/security.md b/docs/security.md index 9554a1d507f5..0fbfe7845fb6 100644 --- a/docs/security.md +++ b/docs/security.md @@ -119,7 +119,7 @@ The firewall allows traffic to the API regardless of tunnel state, so the daemon keys, fetch account data, etc. In the [Connected] state, API traffic is only allowed inside the tunnel. For the other states, API traffic will bypass the firewall. On Windows, only the Mullvad service and problem report tool are able to communicate with the API in any of the blocking states. On macOS and -Linux all applications runnning as root are able to reach the API in blocking states. +Linux all applications running as root are able to reach the API in blocking states. ### Disconnected diff --git a/graphics/README.md b/graphics/README.md index 2c6451b8f141..5403476c1445 100644 --- a/graphics/README.md +++ b/graphics/README.md @@ -22,7 +22,7 @@ If `icon.svg` is changed. You need to run the following to generate new assets: ### `icon-square.svg` This is the regular mole but instead of being placed in a blue circle the entire background is just blue. -The mole is placed slighty to the right compared to `icon.svg` to appear more centered. And the mole +The mole is placed slightly to the right compared to `icon.svg` to appear more centered. And the mole is a little bit smaller so it fits better when corners are rounded off during icon creation. #### Desktop diff --git a/gui/README.md b/gui/README.md index 30bd14e92ae5..224f8ed54fe8 100644 --- a/gui/README.md +++ b/gui/README.md @@ -18,7 +18,7 @@ The app has unit tests and integration tests located in test/: - **test/e2e/installed** (`npm run e2e:installed `): Tests running against the app at its install path (See [Standalone test executable](#standalone-test-executable) for more info). - **test/e2e/installed/state-dependent** (`npm run e2e:installed state-dependent`): Tests - requireing the daemon to be set into a specific state first. + requiring the daemon to be set into a specific state first. ### Standalone test executable diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 74a69734fd9f..f5f81e33bdde 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -1103,12 +1103,12 @@ msgstr "" #. This error message is shown if the user tries to launch an app that #. doesn't exist. -#. This error message is shown if an application failes during startup. +#. This error message is shown if an application fais during startup. msgctxt "split-tunneling-view" msgid "Please try again or send a problem report." msgstr "" -#. Error message showed in a dialog when an application failes to launch. +#. Error message showed in a dialog when an application fails to launch. msgctxt "split-tunneling-view" msgid "Unable to launch selection. %(detailedErrorMessage)s" msgstr "" diff --git a/gui/scripts/build-logo-icons.sh b/gui/scripts/build-logo-icons.sh index 7002d565eebc..a1e30dd18b40 100755 --- a/gui/scripts/build-logo-icons.sh +++ b/gui/scripts/build-logo-icons.sh @@ -4,13 +4,13 @@ # first if the source SVGs have been updated. More info about how to update them can be found in # the readme. # -# Icon guidlines for macOS: +# Icon guidelines for macOS: # https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/app-icon/ # # Icon templates for macOS: # https://developer.apple.com/design/resources/ # -# Icon guidlines for Windows: +# Icon guidelines for Windows: # https://docs.microsoft.com/en-us/windows/uwp/design/style/app-icons-and-logos#target-size-app-icon-assets # https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-icons diff --git a/gui/scripts/extract-geo-data.py b/gui/scripts/extract-geo-data.py index 5e9427bd35c6..7c6479f2a8fd 100755 --- a/gui/scripts/extract-geo-data.py +++ b/gui/scripts/extract-geo-data.py @@ -35,7 +35,7 @@ # Custom locale mapping between the identifiers in the app and Natural Earth datasets LOCALE_MAPPING = { - # "zh" in Natural Earth Data referes to simplified chinese + # "zh" in Natural Earth Data refers to simplified chinese "zh-CN": "zh" } diff --git a/gui/scripts/integrate-into-app.py b/gui/scripts/integrate-into-app.py index 86eeff63fbc2..9cba7e8dd264 100644 --- a/gui/scripts/integrate-into-app.py +++ b/gui/scripts/integrate-into-app.py @@ -87,7 +87,7 @@ def merge_gettext_catalogues(existing_catalogue_file, generated_catalogue_file): "--output-file", existing_catalogue_file, - # ensure that the first occurence takes precedence in merge conflict + # ensure that the first occurrence takes precedence in merge conflict "--use-first", # sort by msgid diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 1e8214a27770..c30665ffc51f 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -341,7 +341,7 @@ class ApplicationMain } log.info('Disposable logging outputs disposed'); - log.info('Quit preperations finished'); + log.info('Quit preparations finished'); } private detectLocale(): string { diff --git a/gui/src/main/linux-desktop-entry.ts b/gui/src/main/linux-desktop-entry.ts index acac772ce5fb..d6c11c79436d 100644 --- a/gui/src/main/linux-desktop-entry.ts +++ b/gui/src/main/linux-desktop-entry.ts @@ -64,7 +64,7 @@ function parseDesktopEntry( { absolutepath } as Partial, ); - // If the dekstop entry is lacking some of the required keys it's invalid + // If the desktop entry is lacking some of the required keys it's invalid if (isDesktopEntry(parsed)) { return parsed; } else { @@ -78,7 +78,7 @@ function parseDesktopEntryLine( line: string, locale?: string, ): Partial { - // Comments start with `#` and keys and values are seperated by a `=` + // Comments start with `#` and keys and values are separated by a `=` if (!line.startsWith('#') && line.includes('=')) { const firstEqualSign = line.indexOf('='); const keyWithLocale = line.slice(0, firstEqualSign).replace(' ', ''); diff --git a/gui/src/main/linux-split-tunneling.ts b/gui/src/main/linux-split-tunneling.ts index c8e5dd527a43..9a93054590f4 100644 --- a/gui/src/main/linux-split-tunneling.ts +++ b/gui/src/main/linux-split-tunneling.ts @@ -71,7 +71,7 @@ export async function launchApplication( if (code === 1) { resolve({ error: - // TRANSLATORS: This error message is shown if an application failes during startup. + // TRANSLATORS: This error message is shown if an application fails during startup. messages.pgettext('split-tunneling-view', 'Please try again or send a problem report.'), }); } else { diff --git a/gui/src/main/window-controller.ts b/gui/src/main/window-controller.ts index 5cd0857bc445..830f6fd1af20 100644 --- a/gui/src/main/window-controller.ts +++ b/gui/src/main/window-controller.ts @@ -134,7 +134,7 @@ class AttachedToTrayWindowPositioning implements IWindowPositioning { private getWindowMargin() { if (isWindows11OrNewer()) { - // Tray applications are positioned aproximately 10px from the tray in Windows 11. + // Tray applications are positioned approximately 10px from the tray in Windows 11. return 10; } else if (process.platform === 'darwin') { return 5; diff --git a/gui/src/main/windows-split-tunneling.ts b/gui/src/main/windows-split-tunneling.ts index fc6e5d87d9bc..844b74b77bb4 100644 --- a/gui/src/main/windows-split-tunneling.ts +++ b/gui/src/main/windows-split-tunneling.ts @@ -127,7 +127,7 @@ export function removeApplicationFromCache(application: IWindowsApplication): vo } // Reads the start-menu directories and adds all shortcuts, targeting applications using networking, -// to the shortcuts cache. Wheter or not an application use networking is determined by checking for +// to the shortcuts cache. Whether or not an application use networking is determined by checking for // "WS2_32.dll" in it's imports. async function updateShortcutCache(): Promise { const links = await Promise.all(APPLICATION_PATHS.map(findAllLinks)); diff --git a/gui/src/renderer/components/MacOsScrollbarDetection.tsx b/gui/src/renderer/components/MacOsScrollbarDetection.tsx index 79910c3cdd10..de636827bd4d 100644 --- a/gui/src/renderer/components/MacOsScrollbarDetection.tsx +++ b/gui/src/renderer/components/MacOsScrollbarDetection.tsx @@ -15,7 +15,7 @@ const StyledContainer = styled.div({ height: '0px', }); -// This component is used to determine wheter scrollbars should be always visible or only visible +// This component is used to determine whether scrollbars should be always visible or only visible // while scrolling when the system setting for this is set to "Automatic". This is detected by // testing if any space is taken by a scrollbar. export default function MacOsScrollbarDetection() { diff --git a/gui/src/renderer/components/SplitTunnelingSettings.tsx b/gui/src/renderer/components/SplitTunnelingSettings.tsx index bf3b7f58b86a..c8242cdd8881 100644 --- a/gui/src/renderer/components/SplitTunnelingSettings.tsx +++ b/gui/src/renderer/components/SplitTunnelingSettings.tsx @@ -184,7 +184,7 @@ function LinuxSplitTunnelingSettings(props: IPlatformSplitTunnelingSettingsProps type={ModalAlertType.warning} iconColor={colors.red} message={sprintf( - // TRANSLATORS: Error message showed in a dialog when an application failes to launch. + // TRANSLATORS: Error message showed in a dialog when an application fails to launch. messages.pgettext( 'split-tunneling-view', 'Unable to launch selection. %(detailedErrorMessage)s', diff --git a/gui/src/renderer/components/TransitionContainer.tsx b/gui/src/renderer/components/TransitionContainer.tsx index ce9900927fba..53f149ba6a98 100644 --- a/gui/src/renderer/components/TransitionContainer.tsx +++ b/gui/src/renderer/components/TransitionContainer.tsx @@ -180,7 +180,7 @@ export default class TransitionContainer extends React.Component this.state.currentItem.view.props.routePath === candidate.props.routePath ) { // There's no transition in progress and the newest candidate has the same path as the - // current. In this sitation the app should just remain in the same view. + // current. In this situation the app should just remain in the same view. this.setState( { currentItem: TransitionContainer.makeItem(this.props), diff --git a/gui/src/renderer/components/select-location/select-location-hooks.ts b/gui/src/renderer/components/select-location/select-location-hooks.ts index 0cefdecb4f53..188a1c9aefda 100644 --- a/gui/src/renderer/components/select-location/select-location-hooks.ts +++ b/gui/src/renderer/components/select-location/select-location-hooks.ts @@ -24,7 +24,7 @@ export function useOnSelectExitLocation() { return useCallback( async (relayLocation: LocationSelection) => { if (relayLocation.value === undefined) { - throw new Error('relayLocation should never be undefiend'); + throw new Error('relayLocation should never be undefined'); } history.pop(); diff --git a/gui/src/renderer/lib/ip.ts b/gui/src/renderer/lib/ip.ts index 369d66a4794d..2f68b68d78e1 100644 --- a/gui/src/renderer/lib/ip.ts +++ b/gui/src/renderer/lib/ip.ts @@ -25,7 +25,7 @@ export abstract class IpAddress { export abstract class IpRange { public constructor(public readonly groups: G, public readonly prefixSize: number) {} - // Returns whether or not this subnet includes the privided IP + // Returns whether or not this subnet includes the provided IP protected includes>(ip: T, groupSize: number): boolean { return IpRange.match(groupSize, ip.groups, [this.groups, this.prefixSize]); } @@ -159,7 +159,7 @@ export class IPv6Address extends IpAddress { return localSubnets.some((subnet) => subnet.includes(this)); } - // Parses IPv6 addresses where the groups are seperated by ':' and supports shortened addresses. + // Parses IPv6 addresses where the groups are separated by ':' and supports shortened addresses. public static fromString(ip: string): IPv6Address { try { const groups = IPv6Address.groupsFromString(ip); diff --git a/gui/src/shared/gui-settings-state.ts b/gui/src/shared/gui-settings-state.ts index e1286101b72e..d09421c92a91 100644 --- a/gui/src/shared/gui-settings-state.ts +++ b/gui/src/shared/gui-settings-state.ts @@ -21,10 +21,10 @@ export interface IGuiSettingsState { // Tells the app to hide the main window on start. startMinimized: boolean; - // Tells the app wheter or not it should act as a window or a context menu. + // Tells the app whether or not it should act as a window or a context menu. unpinnedWindow: boolean; - // Conains a list of filepaths to applications added to the list of applications, in the split + // Contains a list of filepaths to applications added to the list of applications, in the split // tunneling view, by the user. browsedForSplitTunnelingApplications: Array; diff --git a/gui/standalone-tests.ts b/gui/standalone-tests.ts index 5df16718da6c..d7aae0a415cd 100644 --- a/gui/standalone-tests.ts +++ b/gui/standalone-tests.ts @@ -3,7 +3,7 @@ import fs from 'fs'; import os from 'os'; import path from 'path'; -// This file is bundled into a standalone executable able to run e2e tests agains an installed +// This file is bundled into a standalone executable able to run e2e tests against an installed // version of the app. This file is the entrypoint in the executable and extracts the required // assets and performs the tests. More info in /gui/README.md. diff --git a/ios/MullvadVPN/Classes/ConsolidatedApplicationLog.swift b/ios/MullvadVPN/Classes/ConsolidatedApplicationLog.swift index ad5f53eda028..f04164f9cdd9 100644 --- a/ios/MullvadVPN/Classes/ConsolidatedApplicationLog.swift +++ b/ios/MullvadVPN/Classes/ConsolidatedApplicationLog.swift @@ -9,7 +9,7 @@ import Foundation private let kLogMaxReadBytes: UInt64 = 128 * 1024 -private let kLogDelimeter = "====================" +private let kLogDelimiter = "====================" private let kRedactedPlaceholder = "[REDACTED]" private let kRedactedAccountPlaceholder = "[REDACTED ACCOUNT NUMBER]" private let kRedactedContainerPlaceholder = "[REDACTED CONTAINER PATH]" @@ -81,9 +81,9 @@ class ConsolidatedApplicationLog: TextOutputStreamable { print("", to: &stream) for attachment in logs { - print(kLogDelimeter, to: &stream) + print(kLogDelimiter, to: &stream) print(attachment.label, to: &stream) - print(kLogDelimeter, to: &stream) + print(kLogDelimiter, to: &stream) print(attachment.content, to: &stream) print("", to: &stream) } diff --git a/ios/MullvadVPN/Coordinators/App/ApplicationRouter.swift b/ios/MullvadVPN/Coordinators/App/ApplicationRouter.swift index b407e3127a61..8b52b21044c6 100644 --- a/ios/MullvadVPN/Coordinators/App/ApplicationRouter.swift +++ b/ios/MullvadVPN/Coordinators/App/ApplicationRouter.swift @@ -26,7 +26,7 @@ enum AppRouteGroup: Comparable, Equatable, Hashable { case selectLocation /** - Setings group. + Settings group. */ case settings @@ -124,7 +124,7 @@ struct PendingRoute: Equatable { } /** - Enum type describing an attempt to fullfill the route presentation request. + Enum type describing an attempt to fulfill the route presentation request. **/ enum PendingPresentationResult { /** @@ -174,7 +174,7 @@ enum PendingDismissalResult { } /** - Enum descibing operation over the route. + Enum describing operation over the route. */ enum RouteOperation: Equatable { /** @@ -384,7 +384,7 @@ final class ApplicationRouter { completion: @escaping (PendingPresentationResult) -> Void ) { /** - Pass sub-route for routes suppporting sub-navigation. + Pass sub-route for routes supporting sub-navigation. */ if route.supportsSubNavigation, modalStack.contains(route.routeGroup), var presentedRoute = presentedRoutes[route.routeGroup]?.first diff --git a/ios/MullvadVPN/Notifications/NotificationProviderProtocol.swift b/ios/MullvadVPN/Notifications/NotificationProviderProtocol.swift index ee512e3961ac..76d92ff9c2e7 100644 --- a/ios/MullvadVPN/Notifications/NotificationProviderProtocol.swift +++ b/ios/MullvadVPN/Notifications/NotificationProviderProtocol.swift @@ -14,6 +14,6 @@ protocol NotificationProviderProtocol { /// produced by them. var identifier: String { get } - /// Tell notifcation manager to update the associated notification. + /// Tell notification manager to update the associated notification. func invalidate() } diff --git a/ios/MullvadVPN/View controllers/Login/LoginViewController.swift b/ios/MullvadVPN/View controllers/Login/LoginViewController.swift index c18dfe2a973c..e2770f65bf70 100644 --- a/ios/MullvadVPN/View controllers/Login/LoginViewController.swift +++ b/ios/MullvadVPN/View controllers/Login/LoginViewController.swift @@ -301,7 +301,7 @@ class LoginViewController: UIViewController, RootContainment { case .failure, .default: // Disable "Create account" button on iPad as user types in the account token, // however leave it enabled on iPhone to avoid confusion to why it's being disabled - // since it's likely overlayed by keyboard. + // since it's likely overlaid by keyboard. if case .pad = traitCollection.userInterfaceIdiom { isEnabled = contentView.accountInputGroup.textField.text?.isEmpty ?? true } else { diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift index 328b809d50cb..09fd6bf64f92 100644 --- a/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift +++ b/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift @@ -184,7 +184,7 @@ struct PreferencesViewModel: Equatable { /// Sanitize custom DNS entries. mutating func sanitizeCustomDNSEntries() { - // Santize DNS domains, drop invalid entries. + // Sanitize DNS domains, drop invalid entries. customDNSDomains = customDNSDomains.compactMap { entry in if let canonicalAddress = AnyIPAddress(entry.address) { var newEntry = entry diff --git a/ios/PacketTunnel/TunnelMonitor/Pinger.swift b/ios/PacketTunnel/TunnelMonitor/Pinger.swift index 65d5bd94584d..7588ae1a5042 100644 --- a/ios/PacketTunnel/TunnelMonitor/Pinger.swift +++ b/ios/PacketTunnel/TunnelMonitor/Pinger.swift @@ -267,7 +267,7 @@ final class Pinger { throw Error.malformedResponse(.checksumMismatch(clientChecksum, serverChecksum)) } - // Ensure endianess before returning ICMP packet to delegate. + // Ensure endianness before returning ICMP packet to delegate. var icmpHeader = icmpHeaderPointer.pointee icmpHeader.identifier = icmpHeader.identifier.bigEndian icmpHeader.sequenceNumber = icmpHeader.sequenceNumber.bigEndian diff --git a/ios/convert-assets.rb b/ios/convert-assets.rb index e863f79eef05..669b23fc42b4 100755 --- a/ios/convert-assets.rb +++ b/ios/convert-assets.rb @@ -59,7 +59,7 @@ "IconBackTransitionMask.svg" ] -# SVG convertion tool environment variables. +# SVG conversion tool environment variables. SVG_CONVERT_ENVIRONMENT_VARIABLES = { # Fix PDF "CreationDate" for reproducible output "SOURCE_DATE_EPOCH" => "1596022781" @@ -105,7 +105,7 @@ def generate_resized_assets() end end -def genereate_app_icon() +def generate_app_icon() image_name = File.basename(XCASSETS_APPICON_PATH, ".png") puts "Generate #{image_name} -> #{XCASSETS_APPICON_PATH}" system("rsvg-convert", "--width=#{XCASSETS_APPICON_SIZE}", "--height=#{XCASSETS_APPICON_SIZE}", "--format=png", APPICON_PATH, "--output", XCASSETS_APPICON_PATH) @@ -156,7 +156,7 @@ def command?(name) opts.banner = "Usage: convert-assets.rb [options]" opts.on("--app-icon", "Generate application icon assets") do |v| - genereate_app_icon + generate_app_icon end opts.on("--import-desktop-assets", "Import assets from the desktop app") do |v| diff --git a/mullvad-api/src/rest.rs b/mullvad-api/src/rest.rs index 6d10f389deb6..80bf2becb427 100644 --- a/mullvad-api/src/rest.rs +++ b/mullvad-api/src/rest.rs @@ -264,7 +264,7 @@ impl RequestServiceHandle { let _ = self.tx.unbounded_send(RequestCommand::Reset); } - /// Submits a `RestRequest` for exectuion to the request service. + /// Submits a `RestRequest` for execution to the request service. pub async fn request(&self, request: RestRequest) -> Result { let (completion_tx, completion_rx) = oneshot::channel(); self.tx diff --git a/mullvad-cli/src/cmds/beta_program.rs b/mullvad-cli/src/cmds/beta_program.rs index e211fe969876..77aa73ace3ef 100644 --- a/mullvad-cli/src/cmds/beta_program.rs +++ b/mullvad-cli/src/cmds/beta_program.rs @@ -54,7 +54,7 @@ impl Command for BetaProgram { Ok(()) } _ => { - unreachable!("unhandled comand"); + unreachable!("unhandled command"); } } } diff --git a/mullvad-cli/src/cmds/split_tunnel/linux.rs b/mullvad-cli/src/cmds/split_tunnel/linux.rs index c42b6ae56e93..8b235f10278d 100644 --- a/mullvad-cli/src/cmds/split_tunnel/linux.rs +++ b/mullvad-cli/src/cmds/split_tunnel/linux.rs @@ -21,7 +21,7 @@ impl Command for SplitTunnel { async fn run(&self, matches: &clap::ArgMatches) -> Result<()> { match matches.subcommand() { Some(("pid", pid_matches)) => Self::handle_pid_cmd(pid_matches).await, - _ => unreachable!("unhandled comand"), + _ => unreachable!("unhandled command"), } } } diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs index 1043769f66f8..647c3627d17f 100644 --- a/mullvad-cli/src/cmds/tunnel.rs +++ b/mullvad-cli/src/cmds/tunnel.rs @@ -26,7 +26,7 @@ impl Command for Tunnel { Some(("wireguard", wg_matches)) => Self::handle_wireguard_cmd(wg_matches).await, Some(("ipv6", ipv6_matches)) => Self::handle_ipv6_cmd(ipv6_matches).await, _ => { - unreachable!("unhandled comand"); + unreachable!("unhandled command"); } } } diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 6a71e9d754a7..34336b2c9035 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -2304,7 +2304,7 @@ fn new_selector_config( app_version_info: &Option, ) -> SelectorConfig { // In case of the app not having a version we safety default to OpenVPN to guard against the - // case where some error causes users to not recieve a version and in that case all going to + // case where some error causes users to not receive a version and in that case all going to // wireguard. Magic number 0.0 implies that 0% of users should use Wireguard. // This will be removed in the future when we the migration is done. let wg_migration_threshold = app_version_info diff --git a/mullvad-problem-report/src/lib.rs b/mullvad-problem-report/src/lib.rs index a5b372b90f27..9a9b3476776f 100644 --- a/mullvad-problem-report/src/lib.rs +++ b/mullvad-problem-report/src/lib.rs @@ -22,7 +22,7 @@ const EXTRA_BYTES: usize = 32 * 1024; /// Fit five logs plus some system information in the report. const REPORT_MAX_SIZE: usize = (5 * LOG_MAX_READ_BYTES) + EXTRA_BYTES; -/// Field delimeter in generated problem report +/// Field delimiter in generated problem report const LOG_DELIMITER: &str = "===================="; /// Line separator character sequence diff --git a/mullvad-types/src/auth_failed.rs b/mullvad-types/src/auth_failed.rs index 795bbc24e361..1aa788f6a186 100644 --- a/mullvad-types/src/auth_failed.rs +++ b/mullvad-types/src/auth_failed.rs @@ -66,7 +66,7 @@ impl TryFrom<&ErrorStateCause> for AuthFailed { // The example input string would be split into: // * "INVALID_ACCOUNT" - the ID of the failure reason. // * "This is not a valid Mullvad account" - human-readable message (ignored). -// In the case that the message has preceeding whitespace, it will be trimmed. +// In the case that the message has preceding whitespace, it will be trimmed. fn parse_string(reason: &str) -> Option<&str> { lazy_static! { static ref REASON_REGEX: Regex = Regex::new(r"^\[(\w+)\]\s*").unwrap(); diff --git a/talpid-core/src/dns/linux/resolvconf.rs b/talpid-core/src/dns/linux/resolvconf.rs index dda8a0451849..4c7c066f20fd 100644 --- a/talpid-core/src/dns/linux/resolvconf.rs +++ b/talpid-core/src/dns/linux/resolvconf.rs @@ -27,7 +27,7 @@ pub enum Error { #[error(display = "Using 'resolvconf' to delete a record failed")] DeleteRecord, - #[error(display = "Detected dnsmasq is runing and misconfigured")] + #[error(display = "Detected dnsmasq is running and misconfigured")] DnsmasqMisconfiguration, #[error(display = "Current /etc/resolv.conf is not generated by resolvconf")] diff --git a/talpid-core/src/firewall/macos.rs b/talpid-core/src/firewall/macos.rs index 6ca12d092405..6716e0542d34 100644 --- a/talpid-core/src/firewall/macos.rs +++ b/talpid-core/src/firewall/macos.rs @@ -55,7 +55,7 @@ impl Firewall { pub fn reset_policy(&mut self) -> Result<()> { // Implemented this way to not early return on an error. // We always want all three methods to run, and then return - // the first error it encounterd, if any. + // the first error it encountered, if any. self.remove_rules() .and(self.remove_anchor()) .and(self.restore_state()) @@ -570,7 +570,7 @@ impl Firewall { .build()?, ); - // Outgoing neigbor advertisement to fe80::/10` + // Outgoing neighbor advertisement to fe80::/10` rules.push( ndp_rule_builder .clone() @@ -580,7 +580,7 @@ impl Firewall { .build()?, ); - // Incoming neigbor advertisement from anywhere + // Incoming neighbor advertisement from anywhere rules.push( ndp_rule_builder .clone() diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs index dcd0c2bfb802..5167685a10f5 100644 --- a/talpid-core/src/firewall/mod.rs +++ b/talpid-core/src/firewall/mod.rs @@ -138,7 +138,7 @@ pub enum FirewallPolicy { allow_lan: bool, /// Host that should be reachable while in the blocked state. allowed_endpoint: Option, - /// Desination port for DNS traffic redirection. Traffic destined to `127.0.0.1:53` will be + /// Destination port for DNS traffic redirection. Traffic destined to `127.0.0.1:53` will be /// redirected to `127.0.0.1:$dns_redirect_port`. #[cfg(target_os = "macos")] dns_redirect_port: u16, diff --git a/talpid-core/src/split_tunnel/windows/mod.rs b/talpid-core/src/split_tunnel/windows/mod.rs index 9e091e8f01d5..5210bb98b853 100644 --- a/talpid-core/src/split_tunnel/windows/mod.rs +++ b/talpid-core/src/split_tunnel/windows/mod.rs @@ -306,7 +306,7 @@ impl SplitTunnel { log::error!( "{}", error.display_chain_with_msg( - "get_overlapped_result failed for dequed event" + "get_overlapped_result failed for dequeued event" ), ); } diff --git a/talpid-dbus/src/network_manager.rs b/talpid-dbus/src/network_manager.rs index 40cdf0a656f0..ba614f056319 100644 --- a/talpid-dbus/src/network_manager.rs +++ b/talpid-dbus/src/network_manager.rs @@ -704,7 +704,7 @@ pub fn device_is_ready(device_state: u32) -> bool { READY_STATES.contains(&device_state) } -// Verify that the contents of /etc/resolv.conf match what NM expectes them to be. +// Verify that the contents of /etc/resolv.conf match what NM expects them to be. fn verify_etc_resolv_conf_contents() -> bool { let expected_resolv_conf = "/var/run/NetworkManager/resolv.conf"; let actual_resolv_conf = "/etc/resolv.conf"; diff --git a/talpid-platform-metadata/src/linux.rs b/talpid-platform-metadata/src/linux.rs index e46d139b8df3..6b6b25c6d016 100644 --- a/talpid-platform-metadata/src/linux.rs +++ b/talpid-platform-metadata/src/linux.rs @@ -107,7 +107,7 @@ fn wg_version() -> Option<(String, String)> { Some(("wireguard".to_string(), wireguard_version)) } -/// `systemctl --version` usually outpus two lines - one with the version, and another listing +/// `systemctl --version` usually outputs two lines - one with the version, and another listing /// features: /// > systemd 246 (246) /// > +PAM +AUDIT -SELINUX +IMA +APPARMOR +SMACK -SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT -GNUTLS +ACL diff --git a/talpid-routing/src/lib.rs b/talpid-routing/src/lib.rs index 9eedc6f125a5..e7ba551b31b5 100644 --- a/talpid-routing/src/lib.rs +++ b/talpid-routing/src/lib.rs @@ -26,7 +26,7 @@ pub use imp::{Error, RouteManager}; pub use imp::RouteManagerHandle; -/// A network route with a specific network node, destinaiton and an optional metric. +/// A network route with a specific network node, destination and an optional metric. #[derive(Debug, Hash, Eq, PartialEq, Clone)] pub struct Route { node: Node, diff --git a/talpid-routing/src/unix.rs b/talpid-routing/src/unix.rs index 2a117b9e0753..19edb2783e06 100644 --- a/talpid-routing/src/unix.rs +++ b/talpid-routing/src/unix.rs @@ -44,7 +44,7 @@ pub enum Error { /// Route manager thread may have panicked #[error(display = "The channel sender was dropped")] ManagerChannelDown, - /// Platform specific error occured + /// Platform specific error occurred #[error(display = "Internal route manager error")] PlatformError(#[error(source)] imp::Error), /// Failed to spawn route manager future diff --git a/talpid-routing/src/windows/default_route_monitor.rs b/talpid-routing/src/windows/default_route_monitor.rs index 367541706202..7c3fc0770544 100644 --- a/talpid-routing/src/windows/default_route_monitor.rs +++ b/talpid-routing/src/windows/default_route_monitor.rs @@ -193,7 +193,7 @@ impl DefaultRouteMonitor { // after those notifications are guaranteed to not run. This happens when the // DefaultRouteMonitor is dropped and not before then. It also imposes the requirement that // ContextAndBurstGuard is `Sync` since we will send references to it to other - // threads. This requirement is fullfilled since all fields of `ContextAndBurstGuard` are + // threads. This requirement is fulfilled since all fields of `ContextAndBurstGuard` are // wrapped in either a Arc or Mutex. let context_and_burst = Box::into_raw(Box::new(ContextAndBurstGuard { context, diff --git a/talpid-routing/src/windows/get_best_default_route.rs b/talpid-routing/src/windows/get_best_default_route.rs index 37baf8c44b66..cb06e68a7660 100644 --- a/talpid-routing/src/windows/get_best_default_route.rs +++ b/talpid-routing/src/windows/get_best_default_route.rs @@ -86,7 +86,7 @@ pub fn get_best_default_route(family: AddressFamily) -> Result Result { // let mut matches: Vec<_> = adapters - // SAFETY: We are not allowed to dereference adapter.Head if it has been aquired in a previous iteration of the iterator + // SAFETY: We are not allowed to dereference adapter.Head if it has been acquired in a previous iteration of the iterator // we ensure this is upheld by not saving any references to adapter.Head between iterations. .iter() .filter(|adapter| { @@ -618,7 +618,7 @@ fn interface_luid_from_gateway(gateway: &SOCKADDR_INET) -> Result { }) } -/// SAFETY: adapter.FirstGatewayAddress must be dereferencable and must live as long as adapter +/// SAFETY: adapter.FirstGatewayAddress must be dereferenceable and must live as long as adapter unsafe fn get_first_gateway_address_reference( adapter: &IP_ADAPTER_ADDRESSES_LH, ) -> &IP_ADAPTER_GATEWAY_ADDRESS_LH { @@ -639,7 +639,7 @@ fn adapter_interface_enabled( } /// SAFETY: `head` must be a linked list where each `head.Next` is either null or -/// the it and all of its fields has lifetime 'a and are dereferencable. +/// the it and all of its fields has lifetime 'a and are dereferenceable. unsafe fn isolate_gateway_address<'a>( head: &'a IP_ADAPTER_GATEWAY_ADDRESS_LH, family: ADDRESS_FAMILY, @@ -648,7 +648,7 @@ unsafe fn isolate_gateway_address<'a>( let mut gateway = head; loop { - // SAFETY: The contract states that Address.lpSockaddr is dereferencable if the element is + // SAFETY: The contract states that Address.lpSockaddr is dereferenceable if the element is // non-null if family == (*gateway.Address.lpSockaddr).sa_family { // SAFETY: The contract states that this field must have lifetime 'a @@ -659,7 +659,7 @@ unsafe fn isolate_gateway_address<'a>( break; } - // SAFETY: Gateway.Next is not null here and the contract states it must be dereferencable + // SAFETY: Gateway.Next is not null here and the contract states it must be dereferenceable // if non-null gateway = &*gateway.Next; } @@ -669,7 +669,7 @@ unsafe fn isolate_gateway_address<'a>( fn address_present(hay: Vec<&'_ SOCKET_ADDRESS>, needle: &'_ SOCKADDR_INET) -> Result { for candidate in hay { - // SAFETY: Contract states that needle is dereferencable + // SAFETY: Contract states that needle is dereferenceable if equal_address(needle, candidate)? { return Ok(true); } @@ -811,7 +811,7 @@ impl Adapters { /// SAFETY: You are only allowed to dereference `IP_ADAPTER_ADDRESSES_LH.Next` or any following /// `Next` items in the linked list if they were produced by the latest call to `next()`. Any raw -/// pointers that were aquired before the call to `next()` are not valid to dereference. +/// pointers that were acquired before the call to `next()` are not valid to dereference. struct AdaptersIterator<'a> { _adapters: &'a Adapters, cur: *const IP_ADAPTER_ADDRESSES_LH, diff --git a/talpid-types/src/cgroup.rs b/talpid-types/src/cgroup.rs index 1aeddd728f55..1e1394ffc35e 100644 --- a/talpid-types/src/cgroup.rs +++ b/talpid-types/src/cgroup.rs @@ -15,7 +15,7 @@ fn find_net_cls_mount_inner(mounts: &[u8]) -> Option { } fn parse_mount_line(line: &[u8]) -> Option { - // Each line contains multiple values seperated by space. + // Each line contains multiple values separated by space. // `cgroup /sys/fs/cgroup/net_cls,net_prio cgroup // rw,nosuid,nodev,noexec,relatime,net_cls,net_prio 0 0` Value meanings: // 1. device type diff --git a/talpid-wireguard/build.rs b/talpid-wireguard/build.rs index e43219f1965b..b02f60344047 100644 --- a/talpid-wireguard/build.rs +++ b/talpid-wireguard/build.rs @@ -9,7 +9,7 @@ fn main() { let link_type = match target_os.as_str() { "android" => "", "linux" | "macos" => "=static", - // We would like to avoid panicing on windows even if we can not link correctly + // We would like to avoid panicking on windows even if we can not link correctly // because we would like to be able to run check and clippy. // This does not allow for correct linking or buijding. #[cfg(not(windows))] diff --git a/talpid-wireguard/src/connectivity_check.rs b/talpid-wireguard/src/connectivity_check.rs index 86e1b7730f2e..8f44b9b1c6e6 100644 --- a/talpid-wireguard/src/connectivity_check.rs +++ b/talpid-wireguard/src/connectivity_check.rs @@ -105,7 +105,7 @@ impl ConnectivityMonitor { } // checks if the tunnel has ever worked. Intended to check if a connection to a tunnel is - // successfull at the start of a connection. + // successful at the start of a connection. pub(super) fn establish_connectivity(&mut self, retry_attempt: u32) -> Result { // Send initial ping to prod WireGuard into connecting. self.pinger.send_icmp().map_err(Error::PingError)?; diff --git a/windows/nsis-plugins/src/cleanup/cleaningops.cpp b/windows/nsis-plugins/src/cleanup/cleaningops.cpp index 831cf96bf3f5..d95f275bca29 100644 --- a/windows/nsis-plugins/src/cleanup/cleaningops.cpp +++ b/windows/nsis-plugins/src/cleanup/cleaningops.cpp @@ -176,7 +176,7 @@ void RemoveLogsCacheOtherUsers() // // Determine relative path to "local app data" from home directory. // - // Beware, the local app data path may be overriden from its default location + // Beware, the local app data path may be overridden from its default location // as a node somewhere beneath the home directory. // diff --git a/windows/winfw/src/winfw/fwcontext.cpp b/windows/winfw/src/winfw/fwcontext.cpp index 6f6a73baf4e8..f033830b45ac 100644 --- a/windows/winfw/src/winfw/fwcontext.cpp +++ b/windows/winfw/src/winfw/fwcontext.cpp @@ -32,7 +32,7 @@ namespace { // -// Since the PermitLan rule doesn't specifically address DNS, it will allow DNS requests targetting +// Since the PermitLan rule doesn't specifically address DNS, it will allow DNS requests targeting // a local resolver to leave the machine. From the local resolver the request will either be // resolved from cache, or forwarded out onto the Internet. // diff --git a/wireguard/libwg/build-android.sh b/wireguard/libwg/build-android.sh index 39ae8919e6d8..dcfbb34dff87 100755 --- a/wireguard/libwg/build-android.sh +++ b/wireguard/libwg/build-android.sh @@ -45,7 +45,7 @@ for arch in ${ARCHITECTURES:-armv7 aarch64 x86_64 i686}; do make -f Android.mk clean make -f Android.mk - # Strip and copy the libray to `android/build/extraJni/$ANDROID_ABI` to be able to build the APK + # Strip and copy the library to `android/build/extraJni/$ANDROID_ABI` to be able to build the APK UNSTRIPPED_LIB_PATH="../../build/lib/$RUST_TARGET_TRIPLE/libwg.so" STRIPPED_LIB_PATH="../../android/app/build/extraJni/$ANDROID_ABI/libwg.so"