Commit 316ce526 authored by nanahira's avatar nanahira

fix local gateway mark

parent 1d10ad55
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Address = {{address}} Address = {{address}}
PrivateKey = {{key}} PrivateKey = {{key}}
ListenPort = {{conn.localPort}} ListenPort = {{conn.localPort}}
{% if conn.localGatewayMark != "" %} {% if conn.localGatewayMark != 0 %}
FwMark = {{conn.localGatewayMark}} FwMark = {{conn.localGatewayMark}}
{% endif %} {% endif %}
......
...@@ -4,9 +4,6 @@ PrivateKey = {{key}} ...@@ -4,9 +4,6 @@ PrivateKey = {{key}}
{% if conn.frpType == "frpc" %} {% if conn.frpType == "frpc" %}
ListenPort = {{conn.localPort}} ListenPort = {{conn.localPort}}
{% endif %} {% endif %}
{% if conn.localGatewayMark != "" %}
# FwMark = {{conn.localGatewayMark}}
{% endif %}
MTU = {{conn.mtu|int - 80}} MTU = {{conn.mtu|int - 80}}
Table = off Table = off
PostUp = dev=%i localPeerAddress={{conn.localPeerAddress}} remotePeerAddress={{conn.remotePeerAddress}} link6Address={{conn.link6Address}} remoteNextMark={{conn.remoteNextMark}} inbound={{conn.inbound}} outbound={{conn.outbound}} mtu={{conn.mtu|int - 80}} {{ansible_user_dir}}/nextgen-network/scripts/postup.sh PostUp = dev=%i localPeerAddress={{conn.localPeerAddress}} remotePeerAddress={{conn.remotePeerAddress}} link6Address={{conn.link6Address}} remoteNextMark={{conn.remoteNextMark}} inbound={{conn.inbound}} outbound={{conn.outbound}} mtu={{conn.mtu|int - 80}} {{ansible_user_dir}}/nextgen-network/scripts/postup.sh
......
...@@ -146,7 +146,7 @@ class InventoryBuilder { ...@@ -146,7 +146,7 @@ class InventoryBuilder {
const localGatewayName = (cis ? params.lif : params.rif) || params.if; const localGatewayName = (cis ? params.lif : params.rif) || params.if;
const localGateway = localGatewayName ? this.gateways[local.name][localGatewayName] : _.find(this.gateways[local.name]); const localGateway = localGatewayName ? this.gateways[local.name][localGatewayName] : _.find(this.gateways[local.name]);
//console.log(local.name, paramsString, params, localGatewayName, localGateway.name) //console.log(local.name, paramsString, params, localGatewayName, localGateway.name)
const localGatewayMark = localGateway.selectionMark; const localGatewayMark = parseInt(localGateway.selectionMark);
const remoteGatewayName = (cis ? params.rif : params.lif) || params.if; const remoteGatewayName = (cis ? params.rif : params.lif) || params.if;
const remoteGateway = remoteGatewayName ? this.gateways[remote.name][remoteGatewayName] : _.find(this.gateways[remote.name]); const remoteGateway = remoteGatewayName ? this.gateways[remote.name][remoteGatewayName] : _.find(this.gateways[remote.name]);
//const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined; //const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment