Revision 62e64905 conf/confbase.Y

View differences:

conf/confbase.Y
203 203
net_vpn4_: VPN_RD net_ip4_
204 204
{
205 205
  $$ = cfg_alloc(sizeof(net_addr_vpn4));
206
  net_fill_vpn4($$, ((net_addr_ip4 *)&$2)->prefix, $2.pxlen, $1);
206
  net_fill_vpn4($$, net4_prefix(&$2), net4_pxlen(&$2), $1);
207 207
}
208 208

  
209 209
net_vpn6_: VPN_RD net_ip6_
210 210
{
211 211
  $$ = cfg_alloc(sizeof(net_addr_vpn6));
212
  net_fill_vpn6($$, ((net_addr_ip6 *)&$2)->prefix, $2.pxlen, $1);
212
  net_fill_vpn6($$, net6_prefix(&$2), net6_pxlen(&$2), $1);
213 213
}
214 214

  
215 215
net_roa4_: net_ip4_ MAX NUM AS NUM
......
229 229
};
230 230

  
231 231
net_ip_: net_ip4_ | net_ip6_ ;
232
net_roa_: net_roa4_ | net_roa6_ ;
233 232
net_vpn_: net_vpn4_ | net_vpn6_ ;
233
net_roa_: net_roa4_ | net_roa6_ ;
234 234

  
235 235
net_:
236 236
   net_ip_ { $$ = cfg_alloc($1.length); net_copy($$, &($1)); }
......
297 297
    label_stack_start
298 298
  | label_stack '/' NUM {
299 299
    if ($1[0] >= MPLS_MAX_LABEL_STACK)
300
      cf_error("Too many labels in stack.");
301
    $1[++$1[0]] = $3;
300
      cf_error("Too many labels in stack");
301
    $1[0]++;
302
    $1[*$1] = $3;
302 303
    $$ = $1;
303 304
  }
304 305
;

Also available in: Unified diff