Add neighbor information to link variant 22/195522/2
authorYu <jiung.yu@samsung.com>
Fri, 14 Dec 2018 02:15:19 +0000 (11:15 +0900)
committerYu <jiung.yu@samsung.com>
Fri, 14 Dec 2018 09:08:40 +0000 (18:08 +0900)
Change-Id: Ie86a32b32922ad2e9daf38b0484767775bd5b580
Signed-off-by: Yu Jiung <jiung.yu@samsung.com>
src/inm-rtnl.c

index d7893d7d53d05d60fb5456d2da1b6af2852df50d..d2f8ca16d91763b071c328f1db210e88a4b5b53b 100644 (file)
@@ -1225,6 +1225,98 @@ static GVariant *__inm_rtnl_link_get_addresses(inm_rtnl_link_s *p_link)
        return gvar_addresses;
 }
 
+static GVariant *__inm_rtnl_neigh_get_ll(inm_rtnl_neigh_s *p_neigh)
+{
+       GVariant *ret = NULL;
+
+       ret = g_variant_new_string(p_neigh->ll);
+
+       return ret;
+}
+
+static GVariant *__inm_rtnl_neigh_get_destination(inm_rtnl_neigh_s *p_neigh)
+{
+       GVariant *ret = NULL;
+
+       ret = g_variant_new_string(p_neigh->dest);
+
+       return ret;
+}
+
+static GVariant *__inm_rtnl_neigh_get_ifidx(inm_rtnl_neigh_s *p_neigh)
+{
+       GVariant *ret = NULL;
+
+       ret = g_variant_new_int32(p_neigh->if_idx);
+
+       return ret;
+}
+
+static GVariant *__inm_rtnl_neigh_get_state(inm_rtnl_neigh_s *p_neigh)
+{
+       GVariant *ret = NULL;
+
+       ret = g_variant_new_int32(p_neigh->state);
+
+       return ret;
+}
+
+static void __inm_rtnl_get_neighbor_variant(gpointer data, gpointer user_data)
+{
+       GVariantBuilder *outer = NULL;
+       GVariantBuilder *inner = NULL;
+       inm_rtnl_neigh_s *p_neigh = NULL;
+
+       outer = (GVariantBuilder *)user_data;
+       p_neigh = (inm_rtnl_neigh_s *)data;
+
+       inner = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+
+       if (p_neigh->ll)
+               g_variant_builder_add(inner,
+                                         "{sv}",
+                                         "Ll",
+                                         __inm_rtnl_neigh_get_ll(p_neigh));
+       if (p_neigh->dest)
+               g_variant_builder_add(inner,
+                                         "{sv}",
+                                         "Destination",
+                                         __inm_rtnl_neigh_get_destination(p_neigh));
+       g_variant_builder_add(inner,
+                             "{sv}",
+                             "IfIdx",
+                                 __inm_rtnl_neigh_get_ifidx(p_neigh));
+       g_variant_builder_add(inner,
+                             "{sv}",
+                             "State",
+                                 __inm_rtnl_neigh_get_state(p_neigh));
+
+       g_variant_builder_add(outer,
+                             "(a{sv})",
+                             inner);
+
+       g_variant_builder_unref(inner);
+}
+
+static GVariant *__inm_rtnl_link_get_neighbors(inm_rtnl_link_s *p_link)
+{
+       GVariantBuilder *builder = NULL;
+       GVariant *gvar_neighbors = NULL;
+
+       __INM_FUNC_ENTER__;
+
+       builder = g_variant_builder_new(G_VARIANT_TYPE("a(a{sv})"));
+       g_list_foreach(p_link->list_neigh,
+                       __inm_rtnl_get_neighbor_variant,
+                       builder);
+
+       gvar_neighbors = g_variant_new("(a(a{sv}))", builder);
+       g_variant_builder_unref(builder);
+
+       __INM_FUNC_EXIT__;
+       return gvar_neighbors;
+}
+
 static void __inm_rtnl_link_build(inm_rtnl_link_s *p_link, GVariantBuilder *gb_link)
 {
        if (p_link->iface_name)
@@ -1256,6 +1348,10 @@ static void __inm_rtnl_link_build(inm_rtnl_link_s *p_link, GVariantBuilder *gb_l
                              "{sv}",
                              "Addresses",
                                  __inm_rtnl_link_get_addresses(p_link));
+       g_variant_builder_add(gb_link,
+                             "{sv}",
+                             "Neighbors",
+                                 __inm_rtnl_link_get_neighbors(p_link));
 }
 
 static void __inm_rtnl_get_link_variant(gpointer data, gpointer user_data)