Filter: Replace T_ENUM_NETTYPE with T_ENUM_NET_TYPE

To be consistent with other enum type names.

diff --git a/bird-gdb.py b/bird-gdb.py
index 262035dc393a9aed925a9cbac5d13349069f9d0a..7b31904f1a96ba01682079de85258e686e782b5a 100644 (file)
--- a/bird-gdb.py
+++ b/bird-gdb.py
@@ -28,7 +28,7 @@ class BIRDFValPrinter(BIRDPrinter):
             "T_ENUM_RTC": "i",
             "T_ENUM_RTD": "i",
             "T_ENUM_ROA": "i",
-            "T_ENUM_NETTYPE": "i",
+            "T_ENUM_NET_TYPE": "i",
             "T_ENUM_RA_PREFERENCE": "i",
             "T_ENUM_AF": "i",
             "T_IP": "ip",

diff --git a/filter/data.c b/filter/data.c
index 100844481d1d2e82bb1ddded7d1ff2c35dfd8d7b..2a73461a96ab9209024fdcad75201eb12177102e 100644 (file)
--- a/filter/data.c
+++ b/filter/data.c
@@ -41,7 +41,7 @@ static const char * const f_type_str[] = {
   [T_ENUM_RTD] = "enum rtd",
   [T_ENUM_ROA] = "enum roa",
   [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_AF]  = "enum af",
   [T_ENUM_MPLS_POLICY] = "enum mpls_policy",

diff --git a/filter/data.h b/filter/data.h
index bd1fa9a008487116f65de7920507efd0cdb92de3..07163bb4f3286d47e3c84b791aa16af109e85bda 100644 (file)
--- a/filter/data.h
+++ b/filter/data.h
@@ -39,7 +39,7 @@ enum f_type {
   T_ENUM_RTC = 0x33,
   T_ENUM_RTD = 0x34,
   T_ENUM_ROA = 0x35,
-  T_ENUM_NETTYPE = 0x36,
+  T_ENUM_NET_TYPE = 0x36,
   T_ENUM_RA_PREFERENCE = 0x37,
   T_ENUM_AF = 0x38,
   T_ENUM_MPLS_POLICY = 0x39,

diff --git a/filter/f-inst.c b/filter/f-inst.c
index bebd13c539bee761a5746ba3af6b96758653a8b4..455dd9bbbae8dcc8a4345479b73499ffd2282e8a 100644 (file)
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -496,7 +496,7 @@
     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));
 
   /* Add initialized variable */

diff --git a/filter/test.conf b/filter/test.conf
index c27c04edb1256adbb4453c5369f926f33d683f62..37f93516adaf483ac170b882db9684123f650604 100644 (file)
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -477,12 +477,12 @@ function t_enum()
        enum roa ev3 = ROA_VALID;
        enum aspa ev4 = ASPA_VALID;
        enum af ev5 = AF_IPV6;
-       enum nettype ev6 = NET_IP6;
+       enum net_type ev6 = NET_IP6;
        enum bgp_origin ev7 = ORIGIN_IGP;
        enum ra_preference ev8 = RA_PREF_LOW;
        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(NET_IP4) = "(enum 36)1");

diff --git a/nest/config.Y b/nest/config.Y
index 118c112e421335343a60b7d5ecf2a7320b8314f0..05f5799fd17fc68572a030dbf3793a906640a55d 100644 (file)
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -132,7 +132,7 @@ CF_KEYWORDS(ASPA_PROVIDERS)
 /* 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_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,
        RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL, RPKI, L3VPN,
        AGGREGATED)