Merge branch 'tonic-management-interface'

1 files changed, 9 insertions, 9 deletions

diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index 1f1779a4b0..78b6f60c17 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -46,14 +46,14 @@ export type ErrorStateCause =
 
 export type AfterDisconnect = 'nothing' | 'block' | 'reconnect';
 
-export type TunnelType = 'wireguard' | 'openvpn';
+export type TunnelType = 'any' | 'wireguard' | 'openvpn';
 export function tunnelTypeToString(tunnel: TunnelType): string {
   switch (tunnel) {
     case 'wireguard':
       return 'WireGuard';
     case 'openvpn':
       return 'OpenVPN';
-    default:
+    case 'any':
       return '';
   }
 }
@@ -235,14 +235,16 @@ export interface IOpenVpnTunnelData {
 }
 
 export interface IWireguardTunnelData {
-  // Port ranges are an array of pairs, such as [[53,53], [10_000, 60_000]],
-  // which in this case translates that the specific tunnel can be connected on
-  // port 53 and ports 10'000 through 60'000.
-  portRanges: Array<[number, number]>;
+  portRanges: Array<IPortRange>;
   // Public key of the tunnel.
   publicKey: string;
 }
 
+export interface IPortRange {
+  first: number;
+  last: number;
+}
+
 export interface IShadowsocksEndpointData {
   port: number;
   cipher: string;
@@ -256,8 +258,6 @@ export interface ITunnelOptions {
   };
   wireguard: {
     mtu?: number;
-    // Only relevant on Linux
-    fwmark?: number;
   };
   generic: {
     enableIpv6: boolean;
@@ -330,7 +330,7 @@ export interface ISocketAddress {
 }
 
 export type VoucherResponse =
-  | { type: 'success'; new_expiry: string }
+  | { type: 'success'; newExpiry: string; secondsAdded: number }
   | { type: 'invalid' | 'already_used' | 'error' };
 
 export enum VoucherErrorCode {