Changeset 10590 in hybrid

Timestamp:

Apr 26, 2012, 2:54:48 PM (13 years ago)

Author:

rick

Message:

We are going todo musical chairs over here to auto-magically reload the pf
firewall allowing to make the normal proxy work properly (saves us from
specifing the gateway standardly).

Related-To: nodefactory#129

Location:

branches/releng-9.0/nanobsd/files/etc

Files:

• dhclient-exit-hooks (modified) (1 diff)
• rc.conf (modified) (1 diff)

branches/releng-9.0/nanobsd/files/etc/dhclient-exit-hooks

@@ -8 +8 @@
 . /etc/rc.subr
 
-: ${service_proxy="NO"}
-: ${service_ileiden="NO"}
+: ${service_proxy_normal="NO"}
+: ${service_accesspoint="NO"}
 
 load_rc_config 'ileiden'
 
-if checkyesno "service_proxy_normal" && checkyesno "service_accesspoint"; then
-  warn "Removing default route as machine is marked as service_proxy AND service_accesspoint"
-  route -q del default
-fi
+# Little hack to load the available functions in case we are running this as an
+# standalone script (for testing mostly).
+[ -z "$exit_status" ] && . /sbin/dhclient-script
+
+
+update_pf_conf() {
+  if checkyesno "service_proxy_normal" && checkyesno "service_accesspoint"; then
+    if is_default_interface; then
+      new_ext_if_gw=`route -n get default | awk '/gateway/ {print $2}'`
+      if [ -n "$new_ext_if_gw" ]; then
+        if [ -a "$new_ext_if_gw" != "$ext_if_gw" ];  then
+         info "Reloading PF firewall to load new ext_if_gw=$ext_if_gw"
+         { grep -v '^ext_if_gw=' $rc_conf_running; echo "ext_if_gw=$new_ext_if_gw"; } > $rc_conf_running
+         /etc/rc.d/pf reload
+        fi
+  
+        warn "Removing default route as machine is marked as service_proxy AND service_accesspoint"
+        route -q del default
+      fi
+    fi
+  fi
+}
+
+case $reason in
+  BOUND|RENEW|REBIND|REBOOT)
+    update_pf_conf 
+    ;;
+  TIMEOUT)
+    update_pf_conf 
+    ;;
+esac
+  

branches/releng-9.0/nanobsd/files/etc/rc.conf

@@ -70 +70 @@
 #pf_rules="/etc/pf.hybrid.conf"
 #pf_flags="-D ext_if=vr0 -D captive_portal_interfaces=wlan0 -D publicnat=80,443"
+
+# Autogenerated flags are used during runtime
+rc_conf_running='/etc/rc.conf.running'
+if [ -r $rc_conf_running ]; then
+  . $rc_conf_running
+else
+  touch $rc_conf_running
+fi