Commit 0edf0c8c authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Support for address family constants 

We already had them defined on BGP level, but they are more general.
parent 08c4c9a3

bird-gdb.py

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ class BIRDFValPrinter(BIRDPrinter): 
            "T_ENUM_ROA": "i",

            "T_ENUM_NETTYPE": "i",

            "T_ENUM_RA_PREFERENCE": "i",

            "T_ENUM_AF": "i",

            "T_IP": "ip",

            "T_NET": "net",

            "T_STRING": "s",

conf/gen_keywords.m4

+4 −2
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ m4_define(CF_CLI, `CF_KEYWORDS(m4_translit($1, [[ ]], [[,]])) 
')



# Enums are translated to C initializers: use CF_ENUM(typename, prefix, values)

m4_define(CF_enum, `m4_divert(1){ "CF_enum_prefix[[]]$1", -((CF_enum_type<<16) | CF_enum_prefix[[]]$1), NULL },

# For different prefix: CF_ENUM_PX(typename, external prefix, C prefix, values)

m4_define(CF_enum, `m4_divert(1){ "CF_enum_prefix_ext[[]]$1", -((CF_enum_type<<16) | CF_enum_prefix_int[[]]$1), NULL },

m4_divert(-1)')

m4_define(CF_ENUM, `m4_define([[CF_enum_type]],$1)m4_define([[CF_enum_prefix]],$2)CF_iterate([[CF_enum]], [[m4_shift(m4_shift($@))]])DNL')

m4_define(CF_ENUM, `m4_define([[CF_enum_type]],$1)m4_define([[CF_enum_prefix_ext]],$2)m4_define([[CF_enum_prefix_int]],$2)CF_iterate([[CF_enum]], [[m4_shift(m4_shift($@))]])DNL')

m4_define(CF_ENUM_PX, `m4_define([[CF_enum_type]],$1)m4_define([[CF_enum_prefix_ext]],$2)m4_define([[CF_enum_prefix_int]],$3)CF_iterate([[CF_enum]], [[m4_shift(m4_shift(m4_shift($@)))]])DNL')



# After all configuration templates end, we generate the 

m4_m4wrap(`

conf/gen_parser.m4

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ m4_define(CF_CLI_HELP, `') 


# ENUM declarations are ignored

m4_define(CF_ENUM, `')

m4_define(CF_ENUM_PX, `')



# After all configuration templates end, we finally generate the grammar file.

m4_m4wrap(`

filter/data.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ enum f_type { 
  T_ENUM_ROA = 0x35,

  T_ENUM_NETTYPE = 0x36,

  T_ENUM_RA_PREFERENCE = 0x37,

  T_ENUM_AF = 0x38,



/* new enums go here */

  T_ENUM_EMPTY = 0x3f,	/* Special hack for atomic_aggr */

lib/ip.h

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ 
#define UDP_HEADER_LENGTH	8





/* IANA Address Family Numbers */

/* https://www.iana.org/assignments/address-family-numbers/address-family-numbers.xhtml */

/* Would use AF_ prefix, but that collides with POSIX address family numbers */

#define AFI_IPV4		1

#define AFI_IPV6		2





#ifdef DEBUGGING



typedef struct ip4_addr {

CRA Git | Maintained and supported by SUSTech CRA and CCSE