Re: patch to support labels in scrub rules ( 3.4 current ).

[Hector A. Paterno]

On Thu, Oct 09, 2003 at 01:13:05AM +0200, Henning Brauer wrote:

Sorry, this is the correct one.

Best Regards.

Hector.

> On Wed, Oct 08, 2003 at 02:52:57PM -0300, Hector A. Paterno wrote:
> > +           | label {
> > +                   if (filter_opts.label) {
> > +                           yyerror("label cannot be redefined");
> > +                           YYERROR;
> > +                   }
> > +                   scrub_opts.label = $1;
> 
> eh, no ;-)
> 
> also, diff -u is preferred ;-)
> 
> -- 
> Henning Brauer, BS Web Services, http://bsws.de
> [EMAIL PROTECTED] - [EMAIL PROTECTED]
> Unix is very simple, but it takes a genius to understand the simplicity.
> (Dennis Ritchie)
> 

-- 

--- parse.y.orig        Fri Sep 26 18:06:31 2003
+++ parse.y     Thu Oct  9 00:06:43 2003
@@ -189,6 +189,7 @@
        int                     fragcache;
        int                     randomid;
        int                     reassemble_tcp;
+       char                    *label; 
 } scrub_opts;
 
 struct queue_opts {
@@ -688,6 +689,11 @@
                                }
                                r.rule_flag |= PFRULE_REASSEMBLE_TCP;
                        }
+                       
+                       if (rule_label(&r, $8.label))
+                               YYERROR;
+                       free($8.label);
+
                        if ($8.minttl)
                                r.min_ttl = $8.minttl;
                        if ($8.maxmss)
@@ -764,6 +770,13 @@
                        }
                        scrub_opts.reassemble_tcp = 1;
                }
+               | label {
+                       if (scrub_opts.label) {
+                               yyerror("label cannot be redefined");
+                               YYERROR;
+                       }
+                       scrub_opts.label = $1;
+               }               
                | RANDOMID {
                        if (scrub_opts.randomid) {
                                yyerror("random-id cannot be respecified");