]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
iproute2: use named constants instead of number literals to fill rtnl_rttable_hash
authorMasatake YAMATO <yamato@redhat.com>
Fri, 7 Mar 2014 10:21:37 +0000 (19:21 +0900)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 10 Mar 2014 20:16:08 +0000 (13:16 -0700)
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
lib/rt_names.c

index b005a64e5207afdd34d43f0848a5d06b09173d29..911e4d2752b1c7e2441c40bf762d36c4858e055b 100644 (file)
@@ -314,21 +314,27 @@ int rtnl_rtrealm_a2n(__u32 *id, const char *arg)
 }
 
 
-static struct rtnl_hash_entry dflt_table_entry  = { .id = 253, .name = "default" };
-static struct rtnl_hash_entry main_table_entry  = { .id = 254, .name = "main" };
-static struct rtnl_hash_entry local_table_entry = { .id = 255, .name = "local" };
+static struct rtnl_hash_entry dflt_table_entry  = { .name = "default" };
+static struct rtnl_hash_entry main_table_entry  = { .name = "main" };
+static struct rtnl_hash_entry local_table_entry = { .name = "local" };
 
 static struct rtnl_hash_entry * rtnl_rttable_hash[256] = {
-       [253] = &dflt_table_entry,
-       [254] = &main_table_entry,
-       [255] = &local_table_entry,
+       [RT_TABLE_DEFAULT] = &dflt_table_entry,
+       [RT_TABLE_MAIN]    = &main_table_entry,
+       [RT_TABLE_LOCAL]   = &local_table_entry,
 };
 
 static int rtnl_rttable_init;
 
 static void rtnl_rttable_initialize(void)
 {
+       int i;
+
        rtnl_rttable_init = 1;
+       for (i = 0; i < 256; i++) {
+               if (rtnl_rttable_hash[i])
+                       rtnl_rttable_hash[i]->id = i;
+       }
        rtnl_hash_initialize(CONFDIR "/rt_tables",
                             rtnl_rttable_hash, 256);
 }