summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2024-02-14 15:07:47 +0100
committerOskar Nyberg <oskar@mullvad.net>2024-02-15 16:04:29 +0100
commit8ab10682e57bf4f42f4a789ee8566af69e5b161f (patch)
treee4f4f0bc9468c7333eb7ea8a5b3248e96502579b /gui/src/shared
parentd0650acef1db8ed2f2f2e1423f7567efcdc09802 (diff)
downloadmullvadvpn-8ab10682e57bf4f42f4a789ee8566af69e5b161f.tar.xz
mullvadvpn-8ab10682e57bf4f42f4a789ee8566af69e5b161f.zip
Add rpc and ipc calls for IP override along with redux additions
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/daemon-rpc-types.ts7
-rw-r--r--gui/src/shared/ipc-schema.ts3
2 files changed, 10 insertions, 0 deletions
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index f048549b7a..e24c124f4c 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -435,6 +435,7 @@ export interface ISettings {
obfuscationSettings: ObfuscationSettings;
customLists: CustomLists;
apiAccessMethods: ApiAccessMethodSettings;
+ relayOverrides: Array<RelayOverride>;
}
export type BridgeState = 'auto' | 'on' | 'off';
@@ -539,6 +540,12 @@ export type ApiAccessMethodSettings = {
custom: Array<AccessMethodSetting>;
};
+export interface RelayOverride {
+ hostname: string;
+ ipv4AddrIn?: string;
+ ipv6AddrIn?: string;
+}
+
export function parseSocketAddress(socketAddrStr: string): ISocketAddress {
const re = new RegExp(/(.+):(\d+)$/);
const matches = socketAddrStr.match(re);
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index f0e7777539..b94fe0a701 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -169,6 +169,8 @@ export const ipcSchema = {
},
settings: {
'': notifyRenderer<ISettings>(),
+ importFile: invoke<string, void>(),
+ importText: invoke<string, void>(),
apiAccessMethodSettingChange: notifyRenderer<AccessMethodSetting>(),
setAllowLan: invoke<boolean, void>(),
setShowBetaReleases: invoke<boolean, void>(),
@@ -188,6 +190,7 @@ export const ipcSchema = {
setApiAccessMethod: invoke<string, void>(),
testApiAccessMethodById: invoke<string, boolean>(),
testCustomApiAccessMethod: invoke<CustomProxy, boolean>(),
+ clearAllRelayOverrides: invoke<void, void>(),
},
guiSettings: {
'': notifyRenderer<IGuiSettingsState>(),