mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Filter: Replace T_ENUM_NETTYPE with T_ENUM_NET_TYPE

Browse Source 
To be consistent with other enum type names.
This commit is contained in:
Ondrej Zajicek 2024-10-18 16:49:19 +02:00
parent 80ca0ed279
commit 1002c35bf9
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bird-gdb.py
View File

@ -28,7 +28,7 @@ class BIRDFValPrinter(BIRDPrinter):
"T_ENUM_RTC": "i", "T_ENUM_RTC": "i",
"T_ENUM_RTD": "i", "T_ENUM_RTD": "i",
"T_ENUM_ROA": "i", "T_ENUM_ROA": "i",
"T_ENUM_NETTYPE": "i", "T_ENUM_NET_TYPE": "i",
"T_ENUM_RA_PREFERENCE": "i", "T_ENUM_RA_PREFERENCE": "i",
"T_ENUM_AF": "i", "T_ENUM_AF": "i",
"T_IP": "ip", "T_IP": "ip",

2
filter/data.c
View File

@ -41,7 +41,7 @@ static const char * const f_type_str[] = {
[T_ENUM_RTD] = "enum rtd", [T_ENUM_RTD] = "enum rtd",
[T_ENUM_ROA] = "enum roa", [T_ENUM_ROA] = "enum roa",
[T_ENUM_ASPA] = "enum aspa", [T_ENUM_ASPA] = "enum aspa",
[T_ENUM_NETTYPE] = "enum nettype", [T_ENUM_NET_TYPE] = "enum net_type",
[T_ENUM_RA_PREFERENCE] = "enum ra_preference", [T_ENUM_RA_PREFERENCE] = "enum ra_preference",
[T_ENUM_AF] = "enum af", [T_ENUM_AF] = "enum af",
[T_ENUM_MPLS_POLICY] = "enum mpls_policy", [T_ENUM_MPLS_POLICY] = "enum mpls_policy",

2
filter/data.h
View File

@ -39,7 +39,7 @@ enum f_type {
T_ENUM_RTC = 0x33, T_ENUM_RTC = 0x33,
T_ENUM_RTD = 0x34, T_ENUM_RTD = 0x34,
T_ENUM_ROA = 0x35, T_ENUM_ROA = 0x35,
T_ENUM_NETTYPE = 0x36, T_ENUM_NET_TYPE = 0x36,
T_ENUM_RA_PREFERENCE = 0x37, T_ENUM_RA_PREFERENCE = 0x37,
T_ENUM_AF = 0x38, T_ENUM_AF = 0x38,
T_ENUM_MPLS_POLICY = 0x39, T_ENUM_MPLS_POLICY = 0x39,

2
filter/f-inst.c
View File

@ -496,7 +496,7 @@
RESULT(T_BOOL, i, (v1.type != T_VOID) && !val_is_undefined(v1)); RESULT(T_BOOL, i, (v1.type != T_VOID) && !val_is_undefined(v1));
} }
METHOD_R(T_NET, type, T_ENUM_NETTYPE, i, v1.val.net->type); METHOD_R(T_NET, type, T_ENUM_NET_TYPE, i, v1.val.net->type);
METHOD_R(T_IP, is_v4, T_BOOL, i, ipa_is_ip4(v1.val.ip)); METHOD_R(T_IP, is_v4, T_BOOL, i, ipa_is_ip4(v1.val.ip));
/* Add initialized variable */ /* Add initialized variable */

4
filter/test.conf
View File

@ -477,12 +477,12 @@ function t_enum()
enum roa ev3 = ROA_VALID; enum roa ev3 = ROA_VALID;
enum aspa ev4 = ASPA_VALID; enum aspa ev4 = ASPA_VALID;
enum af ev5 = AF_IPV6; enum af ev5 = AF_IPV6;
enum nettype ev6 = NET_IP6; enum net_type ev6 = NET_IP6;
enum bgp_origin ev7 = ORIGIN_IGP; enum bgp_origin ev7 = ORIGIN_IGP;
enum ra_preference ev8 = RA_PREF_LOW; enum ra_preference ev8 = RA_PREF_LOW;
enum mpls_policy ev9 = MPLS_POLICY_STATIC; enum mpls_policy ev9 = MPLS_POLICY_STATIC;
enum nettype set es = [NET_IP6, NET_VPN6]; enum net_type set es = [NET_IP6, NET_VPN6];
bt_assert(format(RTS_STATIC) = "(enum 30)1"); bt_assert(format(RTS_STATIC) = "(enum 30)1");
bt_assert(format(NET_IP4) = "(enum 36)1"); bt_assert(format(NET_IP4) = "(enum 36)1");

2
nest/config.Y
View File

@ -132,7 +132,7 @@ CF_KEYWORDS(ASPA_PROVIDERS)
/* For r_args_channel */ /* For r_args_channel */
CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC, ASPA) CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC, ASPA)
CF_ENUM(T_ENUM_NETTYPE, NET_, IP4, IP6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, IP6_SADR, MPLS, ASPA) CF_ENUM(T_ENUM_NET_TYPE, NET_, IP4, IP6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, IP6_SADR, MPLS, ASPA)
CF_ENUM(T_ENUM_RTS, RTS_, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT, CF_ENUM(T_ENUM_RTS, RTS_, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL, RPKI, L3VPN, RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL, RPKI, L3VPN,
AGGREGATED) AGGREGATED)