Commit 6aaaa635 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Change parser to handle numbers as unsigned 

Lexer always parsed numbers as unsigned, but parser handled them as
signed and grammar contained many unnecessary checks for negativity.
parent 0705a1c5

conf/confbase.Y

+10 −10
Original line number Diff line number Diff line
@@ -27,16 +27,16 @@ CF_HDR 
CF_DEFINES



static void

check_u16(unsigned val)

check_u16(uint val)

{

  if (val > 0xFFFF)

    cf_error("Value %d out of range (0-65535)", val);

    cf_error("Value %u out of range (0-65535)", val);

}



CF_DECLS



%union {

  int i;

  uint i;

  u32 i32;

  u64 i64;

  ip_addr a;
@@ -175,7 +175,7 @@ ipa_scope: 


pxlen4:

   '/' NUM {

     if ($2 < 0 || $2 > IP4_MAX_PREFIX_LENGTH) cf_error("Invalid prefix length %d", $2);

     if ($2 > IP4_MAX_PREFIX_LENGTH) cf_error("Invalid prefix length %u", $2);

     $$ = $2;

   }

 | ':' IP4 {
@@ -196,8 +196,8 @@ net_ip4_: IP4 pxlen4 


net_ip6_: IP6 '/' NUM

{

  if ($3 < 0 || $3 > IP6_MAX_PREFIX_LENGTH)

    cf_error("Invalid prefix length %d", $3);

  if ($3 > IP6_MAX_PREFIX_LENGTH)

    cf_error("Invalid prefix length %u", $3);



  net_fill_ip6(&($$), $1, $3);
@@ -223,16 +223,16 @@ net_roa4_: net_ip4_ MAX NUM AS NUM 
{

  $$ = cfg_alloc(sizeof(net_addr_roa4));

  net_fill_roa4($$, net4_prefix(&$1), net4_pxlen(&$1), $3, $5);

  if ($3 < (int) net4_pxlen(&$1) || $3 > IP4_MAX_PREFIX_LENGTH)

    cf_error("Invalid max prefix length %d", $3);

  if ($3 < net4_pxlen(&$1) || $3 > IP4_MAX_PREFIX_LENGTH)

    cf_error("Invalid max prefix length %u", $3);

};



net_roa6_: net_ip6_ MAX NUM AS NUM

{

  $$ = cfg_alloc(sizeof(net_addr_roa6));

  net_fill_roa6($$, net6_prefix(&$1), net6_pxlen(&$1), $3, $5);

  if ($3 < (int) net6_pxlen(&$1) || $3 > IP6_MAX_PREFIX_LENGTH)

    cf_error("Invalid max prefix length %d", $3);

  if ($3 < net6_pxlen(&$1) || $3 > IP6_MAX_PREFIX_LENGTH)

    cf_error("Invalid max prefix length %u", $3);

};



net_ip_: net_ip4_ | net_ip6_ ;

filter/config.Y

+2 −2
Original line number Diff line number Diff line
@@ -728,8 +728,8 @@ fprefix: 
 | net_ip_ '-'	{ $$.net = $1; $$.lo = 0; $$.hi = $1.pxlen; }

 | net_ip_ '{' NUM ',' NUM '}' {

     $$.net = $1; $$.lo = $3; $$.hi = $5;

     if ((0 > $3) || ($3 > $5) || ($5 > net_max_prefix_length[$1.type]))

       cf_error("Invalid prefix pattern range: {%d, %d}", $3, $5);

     if (($3 > $5) || ($5 > net_max_prefix_length[$1.type]))

       cf_error("Invalid prefix pattern range: {%u, %u}", $3, $5);

   }

 ;

filter/filter.h

+2 −2
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ struct f_inst { /* Instruction */ 
  u16 code;		/* Instruction code, see the interpret() function and P() macro */

  u16 aux;		/* Extension to instruction code, T_*, EA_*, EAF_*  */

  union {

    int i;

    uint i;

    void *p;

  } a1;			/* The first argument */

  union {

    int i;

    uint i;

    void *p;

  } a2;			/* The second argument */

  int lineno;

nest/config.Y

+2 −2
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ iface_patt: 
 ;



tos:

   CLASS expr { $$ = $2 & 0xfc;        if (($2 < 0) || ($2 > 255)) cf_error("TX class must be in range 0-255"); }

 | DSCP expr  { $$ = ($2 & 0x3f) << 2; if (($2 < 0) || ($2 > 63))  cf_error("TX DSCP must be in range 0-63"); }

   CLASS expr { $$ = $2 & 0xfc;        if ($2 > 255) cf_error("TX class must be in range 0-255"); }

 | DSCP expr  { $$ = ($2 & 0x3f) << 2; if ($2 > 63)  cf_error("TX DSCP must be in range 0-63"); }

 ;



/* Direct device route protocol */

proto/ospf/config.Y

+6 −6
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static inline void 
ospf_check_defcost(int cost)

{

  if ((cost <= 0) || (cost >= LSINFINITY))

   cf_error("Default cost must be in range 1-%d", LSINFINITY-1);

   cf_error("Default cost must be in range 1-%u", LSINFINITY-1);

}



static inline void
@@ -185,10 +185,10 @@ ospf_proto_item: 
 | RFC1583COMPAT bool { OSPF_CFG->rfc1583 = $2; }

 | STUB ROUTER bool { OSPF_CFG->stub_router = $3; }

 | ECMP bool { OSPF_CFG->ecmp = $2 ? OSPF_DEFAULT_ECMP_LIMIT : 0; }

 | ECMP bool LIMIT expr { OSPF_CFG->ecmp = $2 ? $4 : 0; if ($4 < 0) cf_error("ECMP limit cannot be negative"); }

 | ECMP bool LIMIT expr { OSPF_CFG->ecmp = $2 ? $4 : 0; }

 | MERGE EXTERNAL bool { OSPF_CFG->merge_external = $3; }

 | TICK expr { OSPF_CFG->tick = $2; if($2 <= 0) cf_error("Tick must be greater than zero"); }

 | INSTANCE ID expr { OSPF_CFG->instance_id = $3; if (($3<0) || ($3>255)) cf_error("Instance ID must be in range 0-255"); }

 | INSTANCE ID expr { OSPF_CFG->instance_id = $3; if ($3 > 255) cf_error("Instance ID must be in range 0-255"); }

 | ospf_area

 ;
@@ -318,7 +318,7 @@ ospf_iface_item: 
 | REAL BROADCAST bool { OSPF_PATT->real_bcast = $3; if (!ospf_cfg_is_v2()) cf_error("Real broadcast option requires OSPFv2"); }

 | PTP NETMASK bool { OSPF_PATT->ptp_netmask = $3; if (!ospf_cfg_is_v2()) cf_error("PtP netmask option requires OSPFv2"); }

 | TRANSMIT DELAY expr { OSPF_PATT->inftransdelay = $3 ; if (($3<=0) || ($3>65535)) cf_error("Transmit delay must be in range 1-65535"); }

 | PRIORITY expr { OSPF_PATT->priority = $2 ; if (($2<0) || ($2>255)) cf_error("Priority must be in range 0-255"); }

 | PRIORITY expr { OSPF_PATT->priority = $2 ; if ($2>255) cf_error("Priority must be in range 0-255"); }

 | STRICT NONBROADCAST bool { OSPF_PATT->strictnbma = $3 ; }

 | STUB bool { OSPF_PATT->stub = $2 ; }

 | CHECK LINK bool { OSPF_PATT->check_link = $3; }
@@ -404,7 +404,7 @@ ospf_iface_start: 


ospf_instance_id:

   /* empty */

 | INSTANCE expr { OSPF_PATT->instance_id = $2; if (($2<0) || ($2>255)) cf_error("Instance ID must be in range 0-255"); }

 | INSTANCE expr { OSPF_PATT->instance_id = $2; if ($2 > 255) cf_error("Instance ID must be in range 0-255"); }

 ;



ospf_iface_patt_list:

CRA Git | Maintained and supported by SUSTech CRA and CCSE