frp

src/inventory.ts

@@ -71,7 +71,7 @@ class InventoryBuilder {
     const params = Object.fromEntries(new URLSearchParams(_params).entries());
     const name = `mc${!outbound ? 'i' : '-'}${remote.name}`;
     const localGatewayName = (cis ? params.lif : params.rif) || params.if;
-    const localGateway = localGatewayName ? this.gateways[local.name][localGatewayName] : undefined;
+    const localGateway = localGatewayName ? this.gateways[local.name][localGatewayName] : _.find(this.gateways[local.name]);
     const localGatewayMark = localGatewayName ? localGateway.mark : undefined;
     const remoteGatewayName = (cis ? params.rif : params.lif) || params.if;
     const remoteGateway = remoteGatewayName ? this.gateways[remote.name][remoteGatewayName] : _.find(this.gateways[remote.name]);
@@ -84,7 +84,7 @@ class InventoryBuilder {
     const localPeerAddress = primary ? `10.200.${local.id}.${remote.id}` : `10.201.${local.id}.${remote.id}`;
     const remotePeerAddress = primary ? `10.200.${remote.id}.${local.id}` : `10.201.${remote.id}.${local.id}`;
 
-    const frpType = protocol === 'frp' ? (this.gatewayCompare(local, remote) ? 'frps' : 'frpc') : undefined;
+    const frpType = protocol === 'wgfrp' ? (this.gatewayCompare(localGateway, remoteGateway) ? 'frps' : 'frpc') : undefined;
 
     return {
       name,