rbgarga

diff --git a/etc/inc/filter_log.inc b/etc/inc/filter_log.inc
index 330cc09..31aa76b 100644
--- a/etc/inc/filter_log.inc
+++ b/etc/inc/filter_log.inc
@@ -47,22 +47,17 @@ function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "", $fil
 	if ($filtertext)
 		$tail = 5000;
 
-	/* FreeBSD 8 splits pf log lines into two lines, so we need to at least
-	 * tail twice as many, plus some extra to account for unparseable lines */

rbgarga

May 30 10:28:24 pfs22amd64 php-fpm[246]: /rc.newwanip: rc.newwanip: Informational is starting vtnet0.
May 30 10:28:24 pfs22amd64 kernel: done.
May 30 10:28:24 pfs22amd64 php-fpm[246]: /rc.newwanip: rc.newwanip: on (IP address: 10.0.2.15) (interface: WAN[wan]) (real interface: vtnet0).
May 30 10:28:24 pfs22amd64 php-fpm[246]: /rc.newwanip: ROUTING: setting default route to 10.0.2.2
May 30 10:28:24 pfs22amd64 kernel: pflog0: promiscuous mode enabled
May 30 10:28:25 pfs22amd64 kernel: ...
May 30 10:28:26 pfs22amd64 kernel: .done.
May 30 10:28:26 pfs22amd64 php-fpm[246]: /rc.newwanip: Resyncing OpenVPN instances for interface WAN.
May 30 10:28:26 pfs22amd64 kernel: done.
May 30 10:28:26 pfs22amd64 php-fpm[246]: /rc.newwanip: Creating rrd update script

rbgarga

Keybase proof

I hereby claim:

• I am rbgarga on github.
• I am garga (https://keybase.io/garga) on keybase.
• I have a public key whose fingerprint is E3DA 9B2A 6160 99CB 4B31 7641 F1F0 E7A1 9F62 5790

To claim this, I am signing this object:

rbgarga

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index dda8765..3619bda 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2399,7 +2399,7 @@ function filter_generate_user_rule($rule) {
 			case 'cs5': $aline['dscp'] = " dscp 40 "; break;
 			case 'cs6': $aline['dscp'] = " dscp 48 "; break;
 			case 'cs7': $aline['dscp'] = " dscp 56 "; break;
-			default:    $aline['dscp'] = " dscp " . preg_replace('/\s.*$/', '', $rule['dscp']) . " "; break;
+			default:    $aline['dscp'] = " dscp " . $rule['dscp'] . " "; break;

rbgarga

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 6be3e27..6ece099 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1241,18 +1241,20 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
 		unlink_if_exists("{$g['varetc_path']}/dhclient_{$interface}.conf");
 		if(does_interface_exist("$realif")) {
 			mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " delete", true);
-			interface_ipalias_cleanup($interface);
-			if ($destroy == true)

rbgarga

diff --git a/pfPorts/filterdns/files/filterdns.c b/pfPorts/filterdns/files/filterdns.c
index 6216ea4..258a64a 100644
--- a/pfPorts/filterdns/files/filterdns.c
+++ b/pfPorts/filterdns/files/filterdns.c
@@ -70,6 +70,7 @@ static int host_dns(struct thread_data *, int);
 static int filterdns_clean_table(struct thread_data *, int);
 static void clear_config(struct thread_list *);
 static void clear_hostname_addresses(struct thread_data *);
+static int filterdns_check_sameip_diff_hostname(struct thread_data *, struct table *);
 

rbgarga

diff --git a/pfPorts/filterdns/files/filterdns.c b/pfPorts/filterdns/files/filterdns.c
index 6216ea4..099da5c 100644
--- a/pfPorts/filterdns/files/filterdns.c
+++ b/pfPorts/filterdns/files/filterdns.c
@@ -70,6 +70,7 @@ static int host_dns(struct thread_data *, int);
 static int filterdns_clean_table(struct thread_data *, int);
 static void clear_config(struct thread_list *);
 static void clear_hostname_addresses(struct thread_data *);
+static int filterdns_check_sameip_diff_hostname(struct thread_data *, struct table *);
 

rbgarga

diff --git a/pfPorts/filterdns/files/filterdns.c b/pfPorts/filterdns/files/filterdns.c
index 6216ea4..099da5c 100644
--- a/pfPorts/filterdns/files/filterdns.c
+++ b/pfPorts/filterdns/files/filterdns.c
@@ -70,6 +70,7 @@ static int host_dns(struct thread_data *, int);
 static int filterdns_clean_table(struct thread_data *, int);
 static void clear_config(struct thread_list *);
 static void clear_hostname_addresses(struct thread_data *);
+static int filterdns_check_sameip_diff_hostname(struct thread_data *, struct table *);
 

rbgarga

diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 28b7090..26a0834 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -197,6 +197,9 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface
 		}
 	}
 	
+	filter_configure();
+	sleep(1);

rbgarga

Index: sbin/ifconfig/carp.c
===================================================================
--- sbin/ifconfig/carp.c	(revision 276358)
+++ sbin/ifconfig/carp.c	(working copy)
@@ -62,7 +62,7 @@
 
 static int carpr_vhid = -1;
 static int carpr_advskew = -1;
-static int carpr_advbase = -1;
+static int carpr_advbase = 1;