Changeset 11540 in genesis

Timestamp:

Oct 10, 2012, 8:01:25 PM (12 years ago)

Author:

rick

Message:

Technically speaking is the concentrator only an extention of an ileiden proxy.

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -732 +732 @@
   #
 
-  {% if service_concentrator %}
-    pf_rules="/etc/pf.hybrid-with-concentrator.conf"
-    pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
-    pf_flags="$pf_flags -D publicnat=80,443"
-  {% elif service_proxy_ileiden %}
+  {% if service_proxy_ileiden %}
     pf_rules="/etc/pf.hybrid.conf"
-    pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
+    {% if service_concentrator %}
+      pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D inet_if=tun0 -D inet_ip='(tun0:0)' -D masterip=$masterip"
+    {% else %}
+      pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D inet_if=$externalif -D inet_ip='($externalif:0)' -D masterip=$masterip"
+    {% endif %}
     pf_flags="$pf_flags -D publicnat=80,443"
   {% elif service_proxy_normal or service_incoming_rdr %}