Added Network Prefix Length for Static IP.

Used IDS values for IPv4 & IPv6 labels.

Change-Id: Ib8e931ceb301b8b3394c8796e6666b3c61aa2f0e
Signed-off-by: Priya Kohli <priya.kohli@samsung.com>

diff --git a/sources/libraries/Common/common_ip_info.c b/sources/libraries/Common/common_ip_info.c
index 0829366..b51948e 100755 (executable)
--- a/sources/libraries/Common/common_ip_info.c
+++ b/sources/libraries/Common/common_ip_info.c
@@ -25,8 +25,6 @@
 #include "i18nmanager.h"
 
 #define DEFAULT_PROXY_ADDR             "0.0.0.0:80"
-#define IPV4_LABEL             "IPv4"
-#define IPV6_LABEL             "IPv6"
 #define IPV4_DEFAULT_ADDR      "0.0.0.0"
 #define IPV6_DEFAULT_ADDR      "::"
 
@@ -655,6 +653,20 @@ static void _create_static_ip_table(full_ip_info_t *ip_data)
        if (ip_data->is_first_create == TRUE)
                prev_ip_info->gateway_addr = g_strdup(txt);
 
+       /* Network Prefix Length */
+       Elm_Object_Item* item = NULL;
+       ret = wifi_manager_ap_get_subnet_mask(ap, WIFI_MANAGER_ADDRESS_FAMILY_IPV6, &txt);
+       INFO_LOG(UG_NAME_ERR, "Prefix Length =  [%s]", txt);
+       if (ret != WIFI_MANAGER_ERROR_NONE)
+               INFO_LOG(UG_NAME_ERR, "Failed to get prefix length! [%d]", ret);
+
+       item = _add_description(ip_info_list_data->genlist,
+                       "IDS_ST_BODY_NETWORK_PREFIX_LENGTH", txt, ip_info_list_data->gateway_addr_item);
+       ip_info_list_data->prefix_length_item = item;
+
+       g_free(txt);
+       txt = NULL;
+
        /* DNS 1 */
        ret = wifi_manager_ap_get_dns_address(ap, 1, WIFI_MANAGER_ADDRESS_FAMILY_IPV4, &txt);
        if (ret != WIFI_MANAGER_ERROR_NONE)
@@ -673,7 +685,7 @@ static void _create_static_ip_table(full_ip_info_t *ip_data)
        edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data;
        edit_box_details->item = elm_genlist_item_insert_after(
                        ip_info_list_data->genlist, ip_entry_itc,
-                       edit_box_details, NULL, ip_info_list_data->gateway_addr_item,
+                       edit_box_details, NULL, ip_info_list_data->prefix_length_item,
                        ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL);
 #ifdef ACCESSIBLITY_FEATURE
        ao = elm_object_item_access_object_get(edit_box_details->item);
@@ -740,6 +752,9 @@ static void _delete_static_ip_table(ip_info_list_t *ip_info_list_data)
        elm_object_item_del(ip_info_list_data->gateway_addr_item);
        ip_info_list_data->gateway_addr_item = NULL;
 
+       elm_object_item_del(ip_info_list_data->prefix_length_item);
+       ip_info_list_data->prefix_length_item = NULL;
+
        _ip_info_entry_del_callbacks(ip_info_list_data->dns_1_item);
        elm_object_item_del(ip_info_list_data->dns_1_item);
        ip_info_list_data->dns_1_item = NULL;
@@ -898,7 +913,7 @@ static void __ip_info_toggle_item_sel_cb(void* data,
                if (g_strcmp0(ip_addr, IPV4_DEFAULT_ADDR) || (!g_strcmp0(ip_addr, IPV4_DEFAULT_ADDR) && !g_strcmp0(ipv6_addr, IPV6_DEFAULT_ADDR)))
                        ip_info_list_data->ipv4_addr_item = _add_description(
                                        ip_info_list_data->genlist,
-                                       IPV4_LABEL,
+                                       "IDS_ST_BODY_IPV4",
                                        ip_addr,
                                        ip_info_list_data->ip_addr_item);
 
@@ -906,13 +921,13 @@ static void __ip_info_toggle_item_sel_cb(void* data,
                        if (ip_info_list_data->ipv4_addr_item)
                                ip_info_list_data->ipv6_addr_item = _add_description(
                                                ip_info_list_data->genlist,
-                                               IPV6_LABEL,
+                                               "IDS_ST_BODY_IPV6",
                                                ipv6_addr,
                                                ip_info_list_data->ipv4_addr_item);
                        else
                                ip_info_list_data->ipv6_addr_item = _add_description(
                                                ip_info_list_data->genlist,
-                                               IPV6_LABEL,
+                                               "IDS_ST_BODY_IPV6",
                                                ipv6_addr,
                                                ip_info_list_data->ip_addr_item);
 
@@ -1199,11 +1214,11 @@ full_ip_info_t *ip_info_append_items(wifi_manager_ap_h ap, const char *pkg_name,
 
                if (g_strcmp0(ip_addr, IPV4_DEFAULT_ADDR) || (!g_strcmp0(ip_addr, IPV4_DEFAULT_ADDR) && !g_strcmp0(ipv6_addr, IPV6_DEFAULT_ADDR)))
                        ip_info_list_data->ipv4_addr_item = _add_description(genlist,
-                                       IPV4_LABEL, ip_addr, NULL);
+                                       "IDS_ST_BODY_IPV4", ip_addr, NULL);
 
                if (g_strcmp0(ipv6_addr, IPV6_DEFAULT_ADDR))
                        ip_info_list_data->ipv6_addr_item = _add_description(genlist,
-                                       IPV6_LABEL, ipv6_addr, NULL);
+                                       "IDS_ST_BODY_IPV6", ipv6_addr, NULL);
 
                g_free(ip_addr);
                ip_addr = NULL;

diff --git a/sources/libraries/Common/include/common_ip_info.h b/sources/libraries/Common/include/common_ip_info.h
index 06a5a01..b5db9f1 100755 (executable)
--- a/sources/libraries/Common/include/common_ip_info.h
+++ b/sources/libraries/Common/include/common_ip_info.h
@@ -45,6 +45,7 @@ typedef struct ip_info_list {
        Elm_Object_Item *mac_addr_item;
        Elm_Object_Item *subnet_mask_item;
        Elm_Object_Item *gateway_addr_item;
+       Elm_Object_Item *prefix_length_item;
        Elm_Object_Item *dns_1_item;
        Elm_Object_Item *dns_2_item;
        Elm_Object_Item *proxy_addr_item;