From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sat, 18 Jul 2015 17:30:35 +0000 (+0200)
Subject: Nest: Fixes symbols in router id
X-Git-Tag: v1.6.0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17661ff934a80d517284c96756357d4ed5af9a64;p=thirdparty%2Fbird.git

Nest: Fixes symbols in router id

Thanks to Peter Hudec for noticing the problem.
---

diff --git a/nest/config.Y b/nest/config.Y
index 375518022..7ad6c712e 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -94,6 +94,7 @@ rtrid:
 
 idval:
    NUM { $$ = $1; }
+ | '(' term ')' { $$ = f_eval_int($2); }
  | RTRID
  | IPA {
 #ifndef IPV6
@@ -102,6 +103,16 @@ idval:
      cf_error("Router IDs must be entered as hexadecimal numbers or IPv4 addresses in IPv6 version");
 #endif
    }
+ | SYM {
+     if ($1->class == (SYM_CONSTANT | T_INT) || $1->class == (SYM_CONSTANT | T_QUAD))
+       $$ = SYM_VAL($1).i;
+#ifndef IPV6
+     else if ($1->class == (SYM_CONSTANT | T_IP))
+       $$ = SYM_VAL($1).px.ip;
+#endif
+     else
+       cf_error("Number of IPv4 address constant expected");
+   }
  ;