Attachment 151030 Details for Bug 183198 – pf inline anchor optimization fix

[patch] pf inline anchor optimization fix

freebsd.pfctl.anchor.optimize.patch (text/plain), 1.20 KB, created by krichy on 2014-12-28 11:17:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: krichy

Created: 2014-12-28 11:17:46 UTC

Size: 1.20 KB

patch

obsolete

>--- sbin/pfctl/pfctl.c.orig	2014-12-28 00:00:12.872084395 +0100
>+++ sbin/pfctl/pfctl.c	2014-12-28 07:18:03.282892183 +0100
>@@ -1258,6 +1258,9 @@
> 	if (pfctl_trans(pf->dev, pf->trans, DIOCXBEGIN, osize))
> 		return (5);
> 
>+	if (pf->loadopt & PFCTL_FLAG_TABLE)
>+		pf->anchor->ruleset.tticket =
>+		    pfctl_get_ticket(pf->trans, PF_RULESET_TABLE, path);
> 	return (0);
> }
> 
>@@ -1470,9 +1473,6 @@
> 		if (altqsupport && (pf.loadopt & PFCTL_FLAG_ALTQ))
> 			pa.ticket =
> 			    pfctl_get_ticket(t, PF_RULESET_ALTQ, anchorname);
>-		if (pf.loadopt & PFCTL_FLAG_TABLE)
>-			pf.astack[0]->ruleset.tticket =
>-			    pfctl_get_ticket(t, PF_RULESET_TABLE, anchorname);
> 	}
> 
> 	if (parse_config(filename, &pf) < 0) {
>--- sbin/pfctl/pfctl_optimize.c.orig	2014-12-27 23:50:44.352099062 +0100
>+++ sbin/pfctl/pfctl_optimize.c	2014-12-28 07:17:23.315185286 +0100
>@@ -1322,9 +1322,9 @@
> 
> 
> 	if (pfctl_define_table(tbl->pt_name, PFR_TFLAG_CONST, 1,
>-	    pf->astack[0]->name, tbl->pt_buf, pf->astack[0]->ruleset.tticket)) {
>+	    pf->anchor->path, tbl->pt_buf, pf->anchor->ruleset.tticket)) {
> 		warn("failed to create table %s in %s",
>-		    tbl->pt_name, pf->astack[0]->name);
>+		    tbl->pt_name, pf->anchor->path);
> 		return (1);
> 	}
> 	return (0);

Actions: View | Diff

Attachments on bug 183198: 151017 | 151030 | 151074 | 151094