Several minor fixes

2 files changed, 34 insertions, 16 deletions

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 8e1f60a6..fb3d59e4 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -124,39 +124,56 @@ include   ^{WHITE}*include{WHITE}*\".*\"{WHITE}*;
 }
 
 [02]:{DIGIT}+:{DIGIT}+ {
+  unsigned long int l, len1, len2;
   char *e;
-  unsigned long int l;
 
   if (yytext[0] == '0')
+  {
     cf_lval.i64 = 0;
+    len1 = 16;
+    len2 = 32;
+  }
   else
-    cf_lval.i64 = 0x2000000000000ULL;
+  {
+    cf_lval.i64 = 2ULL << 48;
+    len1 = 32;
+    len2 = 16;
+  }
 
   errno = 0;
   l = strtoul(yytext+2, &e, 10);
-  if (e && (*e != ':') || errno == ERANGE || (yytext[0] == '0') && (l >= (1<<16)))
+  if (e && (*e != ':') || (errno == ERANGE) || (l >> len1))
     cf_error("ASN out of range");
-  cf_lval.i64 |= (((u64) l) << 32);
+  cf_lval.i64 |= ((u64) l) << len2;
+
   errno = 0;
   l = strtoul(e+1, &e, 10);
-  if (e && *e || errno == ERANGE || (yytext[0] == '2') && (l >= (1<<16)))
-    cf_error("Assigned number out of range");
+  if (e && *e || (errno == ERANGE) || (l >> len2))
+    cf_error("Number out of range");
   cf_lval.i64 |= l;
+
   return VPN_RD;
 }
 
 1:{DIGIT}+\.{DIGIT}+\.{DIGIT}+\.{DIGIT}+:{DIGIT}+ {
   unsigned long int l;
-  char *e = strchr(yytext+2, ':');
-  *e++ = '\0';
   ip4_addr ip4;
+  char *e;
+
+  cf_lval.i64 = 1ULL << 48;
+
+  e = strchr(yytext+2, ':');
+  *e++ = '\0';
   if (!ip4_pton(yytext+2, &ip4))
     cf_error("Invalid IPv4 address %s in Route Distinguisher", yytext+2);
+  cf_lval.i64 |= ((u64) ip4_to_u32(ip4)) << 16;
+
   errno = 0;
   l = strtoul(e, &e, 10);
-  if (e && *e || errno == ERANGE || (l >= (1<<16)))
-    cf_error("Assigned number out of range");
-  cf_lval.i64 = (1ULL<<48) | (((u64)ip4_to_u32(ip4)) << 16) | ((u64)l);
+  if (e && *e || (errno == ERANGE) || (l >> 16))
+    cf_error("Number out of range");
+  cf_lval.i64 |= l;
+
   return VPN_RD;
 }
 
diff --git a/conf/confbase.Y b/conf/confbase.Y
index a5b8b692..291dc6a0 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -203,13 +203,13 @@ net_ip6_: IP6 '/' NUM
 net_vpn4_: VPN_RD net_ip4_
 {
   $$ = cfg_alloc(sizeof(net_addr_vpn4));
-  net_fill_vpn4($$, ((net_addr_ip4 *)&$2)->prefix, $2.pxlen, $1);
+  net_fill_vpn4($$, net4_prefix(&$2), net4_pxlen(&$2), $1);
 }
 
 net_vpn6_: VPN_RD net_ip6_
 {
   $$ = cfg_alloc(sizeof(net_addr_vpn6));
-  net_fill_vpn6($$, ((net_addr_ip6 *)&$2)->prefix, $2.pxlen, $1);
+  net_fill_vpn6($$, net6_prefix(&$2), net6_pxlen(&$2), $1);
 }
 
 net_roa4_: net_ip4_ MAX NUM AS NUM
@@ -229,8 +229,8 @@ net_roa6_: net_ip6_ MAX NUM AS NUM
 };
 
 net_ip_: net_ip4_ | net_ip6_ ;
-net_roa_: net_roa4_ | net_roa6_ ;
 net_vpn_: net_vpn4_ | net_vpn6_ ;
+net_roa_: net_roa4_ | net_roa6_ ;
 
 net_:
    net_ip_ { $$ = cfg_alloc($1.length); net_copy($$, &($1)); }
@@ -297,8 +297,9 @@ label_stack:
     label_stack_start
   | label_stack '/' NUM {
     if ($1[0] >= MPLS_MAX_LABEL_STACK)
-      cf_error("Too many labels in stack.");
-    $1[++$1[0]] = $3;
+      cf_error("Too many labels in stack");
+    $1[0]++;
+    $1[*$1] = $3;
     $$ = $1;
   }
 ;