Replaced imsi to subscriber ID

[platform/core/connectivity/stc-manager.git] / src / monitor / stc-monitor.c

diff --git a/src/monitor/stc-monitor.c b/src/monitor/stc-monitor.c
index ed8af13..734620b 100755 (executable)
--- a/src/monitor/stc-monitor.c
+++ b/src/monitor/stc-monitor.c
@@ -248,7 +248,7 @@ static int __rstns_tree_key_compare(gconstpointer a, gconstpointer b,
        if (ret != 0)
                return ret;
 
-       ret = g_strcmp0(key_a->imsi, key_b->imsi);
+       ret = g_strcmp0(key_a->subscriber_id, key_b->subscriber_id);
        if (ret != 0)
                return ret;
 
@@ -272,7 +272,7 @@ static void __rstns_tree_key_free(gpointer data)
 
        FREE(key->app_id);
        FREE(key->ifname);
-       FREE(key->imsi);
+       FREE(key->subscriber_id);
        FREE(key);
 }
 
@@ -456,14 +456,14 @@ static void __print_rstn(stc_rstn_key_s *rstn_key, stc_rstn_value_s *rstn_value)
                 "limit [ (%lld) bytes], "
                 "warn_limit [ (%lld) bytes], "
                 "counter [ (%lld) bytes], "
-                "roaming [%d], imsi [%s]",
+                "roaming [%d], subscriber_id [%s]",
                 rstn_value->restriction_id,
                 rstn_key->app_id, rstn_value->classid , rstn_key->ifname,
                 rstn_key->iftype, rstn_value->rst_state,
                 rstn_value->data_limit,
                 rstn_value->data_warn_limit,
                 rstn_value->data_counter,
-                rstn_key->roaming, rstn_key->imsi);
+                rstn_key->roaming, rstn_key->subscriber_id);
 }
 
 static void __process_restriction(enum traffic_restriction_type rst_type,
@@ -880,9 +880,9 @@ static gboolean __update_app_statistics(gpointer key, gpointer value,
        stat_key.iftype = default_connection->type;
 
        if (STC_IFACE_DATACALL == stat_key.iftype)
-               stat_key.imsi = g_strdup(default_connection->imsi);
+               stat_key.subscriber_id = g_strdup(default_connection->subscriber_id);
        else
-               stat_key.imsi = g_strdup("noneimsi");
+               stat_key.subscriber_id = g_strdup("none_subid");
 
        g_strlcpy(stat_key.ifname, default_connection->ifname,
                  MAX_IFACE_LENGTH);
@@ -899,7 +899,7 @@ static gboolean __update_app_statistics(gpointer key, gpointer value,
        app_value->counter.in_bytes = 0;
 
        FREE(stat.app_id);
-       FREE(stat_key.imsi);
+       FREE(stat_key.subscriber_id);
 
        return FALSE;
 }
@@ -1298,7 +1298,7 @@ static stc_error_e __rstn_tree_add(stc_rstn_key_s *key,
 
                rstn_key->app_id = g_strdup(key->app_id);
                rstn_key->ifname = g_strdup(key->ifname);
-               rstn_key->imsi = g_strdup(key->imsi);
+               rstn_key->subscriber_id = g_strdup(key->subscriber_id);
                rstn_key->iftype = key->iftype;
                rstn_key->roaming = key->roaming;
 
@@ -1335,7 +1335,7 @@ static stc_cb_ret_e __insert_restriction_cb(const table_restrictions_info *info,
 
        key.app_id = g_strdup(info->app_id);
        key.ifname = g_strdup(info->ifname);
-       key.imsi = g_strdup(info->imsi);
+       key.subscriber_id = g_strdup(info->subscriber_id);
        key.iftype = info->iftype;
        key.roaming = info->roaming;
 
@@ -1355,7 +1355,7 @@ static stc_cb_ret_e __insert_restriction_cb(const table_restrictions_info *info,
 
        FREE(key.app_id);
        FREE(key.ifname);
-       FREE(key.imsi);
+       FREE(key.subscriber_id);
        return ret;
 }
 
@@ -1510,11 +1510,13 @@ static void __excn_hash_foreach_print(gpointer key, gpointer value,
                process_name, exe_type);
 }
 
+#if 0
 static void __excn_hash_printall(void)
 {
        g_hash_table_foreach(g_system->excns_hash,
                __excn_hash_foreach_print, NULL);
 }
+#endif
 
 static gboolean __remove_exception_app(gpointer key, gpointer value,
                                        gpointer data)
@@ -1880,7 +1882,7 @@ stc_error_e stc_monitor_rstns_tree_add(const table_restrictions_info *info)
 
        key.app_id = g_strdup(info->app_id);
        key.ifname = g_strdup(info->ifname);
-       key.imsi = g_strdup(info->imsi);
+       key.subscriber_id = g_strdup(info->subscriber_id);
        key.iftype = info->iftype;
        key.roaming = info->roaming;
 
@@ -1905,7 +1907,7 @@ stc_error_e stc_monitor_rstns_tree_add(const table_restrictions_info *info)
 
        FREE(key.app_id);
        FREE(key.ifname);
-       FREE(key.imsi);
+       FREE(key.subscriber_id);
        return ret;
 }
 
@@ -1916,7 +1918,7 @@ stc_error_e stc_monitor_rstns_tree_remove(const table_restrictions_info *info)
        stc_rstn_key_s key = {
                .app_id = g_strdup(info->app_id),
                .ifname = g_strdup(info->ifname),
-               .imsi = g_strdup(info->imsi),
+               .subscriber_id = g_strdup(info->subscriber_id),
                .iftype = info->iftype,
                .roaming = info->roaming,
        };
@@ -1931,7 +1933,7 @@ stc_error_e stc_monitor_rstns_tree_remove(const table_restrictions_info *info)
 
        FREE(key.app_id);
        FREE(key.ifname);
-       FREE(key.imsi);
+       FREE(key.subscriber_id);
        return ret;
 }