Add tethering client data limitation
[platform/core/connectivity/stc-manager.git] / src / monitor / stc-monitor.c
index 62a2c5c..8037c53 100755 (executable)
 #include "counter.h"
 #include "table-statistics.h"
 #include "table-counters.h"
-#include "stc-exception.h"
 #include "stc-monitor.h"
-#include "stc-manager-plugin.h"
+#include "stc-time.h"
+#include "stc-manager-plugin-appstatus.h"
+#include "stc-manager-plugin-exception.h"
+#include "stc-manager-plugin-tether.h"
 
+#define GRANULARITY 10
 #define MAX_INT_LENGTH 128
+
+#ifndef VCONFKEY_STC_BACKGROUND_STATE
 #define VCONFKEY_STC_BACKGROUND_STATE "db/stc/background_state"
+#endif
+
+#ifndef VCONFKEY_SETAPPL_DATA_RESTRICTION_INT
+#define VCONFKEY_SETAPPL_DATA_RESTRICTION_INT "db/setting/data_restriction"
+#endif
+
+typedef struct {
+       time_t now;
+       time_t month_start_ts;
+       time_t week_start_ts;
+       time_t day_start_ts;
+       int is_updated;
+} reset_time_limits_context_s;
 
 typedef struct {
        stc_app_key_s *app_key;
@@ -43,21 +61,151 @@ typedef struct {
 typedef struct {
        struct nfacct_rule *counter;
        int64_t bytes;
-       gboolean data_limit_reached;
+       gboolean data_limit_exceeded;
 } classid_bytes_context_s;
 
 static stc_system_s *g_system = NULL;
 
+//LCOV_EXCL_START
+static int __vconf_get_int(const char *key, int *value)
+{
+       int ret = 0;
+
+       ret = vconf_get_int(key, value);
+       if (ret != VCONF_OK) {
+               STC_LOGE("Failed to get vconfkey [%s] value", key); //LCOV_EXCL_LINE
+               return -1; //LCOV_EXCL_LINE
+       }
+
+       return 0;
+}
+
+static int __vconf_set_int(const char *key, int value)
+{
+       int ret = 0;
+
+       ret = vconf_set_int(key, value);
+       if (ret != VCONF_OK) {
+               STC_LOGE("Failed to set vconfkey [%s] value", key); //LCOV_EXCL_LINE
+               return -1; //LCOV_EXCL_LINE
+       }
+
+       return 0;
+}
+//LCOV_EXCL_STOP
+
 static nfacct_rule_jump __get_jump_by_intend(struct nfacct_rule *counter)
 {
        if (counter->intend == NFACCT_WARN)
                return NFACCT_JUMP_ACCEPT;
        else if (counter->intend == NFACCT_BLOCK)
                return NFACCT_JUMP_REJECT;
+       else if (counter->intend == NFACCT_ALLOW)
+               return NFACCT_JUMP_ACCEPT;
+       else if (counter->intend == NFACCT_TETH_BLOCK)
+               return NFACCT_JUMP_REJECT;
+       else if (counter->intend == NFACCT_TETH_ALLOW)
+               return NFACCT_JUMP_ACCEPT;
 
        return NFACCT_JUMP_UNKNOWN;
 }
 
+static stc_error_e __add_iptables_tether_in(struct nfacct_rule *counter,
+               const gchar *ipaddr)
+{
+       int ret;
+
+       if (counter == NULL || ipaddr == NULL)
+               return STC_ERROR_INVALID_PARAMETER;
+
+       counter->action = NFACCT_ACTION_INSERT;
+       counter->iotype = NFACCT_COUNTER_IN;
+       counter->jump = __get_jump_by_intend(counter);
+       counter->iptype = NFACCT_TYPE_IPV4;
+       counter->send_limit = 0;
+       counter->rcv_limit = 0;
+       counter->src_iprange_type = NFACCT_IPRANGE_TYPE_SINGLE;
+       counter->src_ip1 = g_strdup(ipaddr);
+
+       ret = produce_net_rule(counter);
+
+       FREE(counter->src_ip1);
+       counter->src_iprange_type = NFACCT_IPRANGE_TYPE_NONE;
+       return ret;
+}
+
+static stc_error_e __add_iptables_tether_out(struct nfacct_rule *counter,
+               const gchar *ipaddr)
+{
+       int ret;
+
+       if (counter == NULL || ipaddr == NULL)
+               return STC_ERROR_INVALID_PARAMETER;
+
+       counter->action = NFACCT_ACTION_INSERT;
+       counter->iotype = NFACCT_COUNTER_OUT;
+       counter->jump = __get_jump_by_intend(counter);
+       counter->iptype = NFACCT_TYPE_IPV4;
+       counter->send_limit = 0;
+       counter->rcv_limit = 0;
+       counter->dst_iprange_type = NFACCT_IPRANGE_TYPE_SINGLE;
+       counter->dst_ip1 = g_strdup(ipaddr);
+
+       ret = produce_net_rule(counter);
+
+       FREE(counter->dst_ip1);
+       counter->dst_iprange_type = NFACCT_IPRANGE_TYPE_NONE;
+       return ret;
+}
+
+static stc_error_e __del_iptables_tether_in(struct nfacct_rule *counter,
+               const gchar *ipaddr)
+{
+       int ret;
+
+       if (counter == NULL || ipaddr == NULL)
+               return STC_ERROR_INVALID_PARAMETER;
+
+       counter->action = NFACCT_ACTION_DELETE;
+       counter->iotype = NFACCT_COUNTER_IN;
+       counter->jump = __get_jump_by_intend(counter);
+       counter->iptype = NFACCT_TYPE_IPV4;
+       counter->send_limit = 0;
+       counter->rcv_limit = 0;
+       counter->src_iprange_type = NFACCT_IPRANGE_TYPE_SINGLE;
+       counter->src_ip1 = g_strdup(ipaddr);
+
+       ret = produce_net_rule(counter);
+
+       FREE(counter->src_ip1);
+       counter->src_iprange_type = NFACCT_IPRANGE_TYPE_NONE;
+       return ret;
+}
+
+static stc_error_e __del_iptables_tether_out(struct nfacct_rule *counter,
+               const gchar *ipaddr)
+{
+       int ret;
+
+       if (counter == NULL || ipaddr == NULL)
+               return STC_ERROR_INVALID_PARAMETER;
+
+       counter->action = NFACCT_ACTION_DELETE;
+       counter->iotype = NFACCT_COUNTER_OUT;
+       counter->jump = __get_jump_by_intend(counter);
+       counter->iptype = NFACCT_TYPE_IPV4;
+       counter->send_limit = 0;
+       counter->rcv_limit = 0;
+       counter->dst_iprange_type = NFACCT_IPRANGE_TYPE_SINGLE;
+       counter->dst_ip1 = g_strdup(ipaddr);
+
+       ret = produce_net_rule(counter);
+
+       FREE(counter->dst_ip1);
+       counter->dst_iprange_type = NFACCT_IPRANGE_TYPE_NONE;
+       return ret;
+}
+
 static stc_error_e __add_iptables_in(struct nfacct_rule *counter)
 {
        if (counter == NULL)
@@ -257,6 +405,10 @@ static int __rstns_tree_key_compare(gconstpointer a, gconstpointer b,
        if (ret != 0)
                return ret;
 
+       ret = key_a->roaming - key_b->roaming;
+       if (ret != 0)
+               return ret;
+
        return 0;
 }
 
@@ -277,6 +429,7 @@ static void __rstns_tree_key_free(gpointer data)
        FREE(key);
 }
 
+/*
 //LCOV_EXCL_START
 static gboolean __processes_tree_foreach_print(gpointer key, gpointer value,
                                               gpointer data)
@@ -316,6 +469,7 @@ static void __apps_tree_printall(void)
        g_tree_foreach(g_system->apps, __apps_tree_foreach_print, NULL);
 }
 //LCOV_EXCL_STOP
+*/
 
 static gboolean __apps_tree_foreach_remove_pid(gpointer key, gpointer value,
                                               gpointer data)
@@ -323,11 +477,8 @@ static gboolean __apps_tree_foreach_remove_pid(gpointer key, gpointer value,
        remove_pid_context_s *context = (remove_pid_context_s *)data;
        stc_app_value_s *app_value = (stc_app_value_s *)value;
 
-       if (!g_tree_remove(app_value->processes, context->proc_key)) {
-               if (STC_DEBUG_LOG)
-                       STC_LOGD("key not found"); //LCOV_EXCL_LINE
+       if (!g_tree_remove(app_value->processes, context->proc_key))
                return FALSE;
-       }
 
        context->entry_removed = TRUE;
        context->app_key = (stc_app_key_s *)key;
@@ -369,10 +520,112 @@ static gboolean __processes_tree_check_empty(gpointer key, gpointer value,
 }
 //LCOV_EXCL_STOP
 
+static gboolean __add_application_monitor_for_tethering(gpointer key,
+                                   gpointer value, gpointer data)
+{
+       stc_app_value_s *app_value = (stc_app_value_s *)value;
+       stc_app_key_s *app_key = (stc_app_key_s *)key;
+       default_connection_s *connection = (default_connection_s *)data;
+       stc_s *stc = stc_get_manager();
+       struct nfacct_rule counter;
+       char *ipaddr = NULL;
+       int ret;
+
+       STC_LOGI("add appid(%s) classid(%d)", app_key->app_id,
+                       app_value->classid);
+
+       if (stc == NULL || connection == NULL)
+               return FALSE;
+
+       if (!stc->carg) {
+               stc->carg = MALLOC0(counter_arg_s, 1);
+               if (stc->carg == NULL)
+                       return FALSE;
+
+               stc->carg->sock = stc_monitor_get_counter_socket();
+       }
+
+       memset(&counter, 0, sizeof(struct nfacct_rule));
+
+       counter.carg = stc->carg;
+       counter.classid = app_value->classid;
+       counter.intend = NFACCT_TETH_COUNTER;
+
+       if (connection->tether_state != TRUE ||
+                       connection->tether_iface.ifname == NULL)
+               return FALSE;
+
+       counter.iftype = connection->tether_iface.type;
+       g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+
+       /* get the ip address of the station based on its mac address */
+       ret = stc_plugin_tether_get_station_ip(app_value->mac, &ipaddr);
+       if (ret != STC_ERROR_NONE)
+               return FALSE;
+
+       /* tethering iptables rule */
+       __add_iptables_tether_in(&counter, ipaddr);
+       __add_iptables_tether_out(&counter, ipaddr);
+
+       g_free(ipaddr);
+       return FALSE;
+}
+
+static gboolean __remove_application_monitor_for_tethering(gpointer key, gpointer value,
+                                   gpointer data)
+{
+       stc_app_value_s *app_value = (stc_app_value_s *)value;
+       stc_app_key_s *app_key = (stc_app_key_s *)key;
+       default_connection_s *connection = (default_connection_s *)data;
+       stc_s *stc = stc_get_manager();
+       struct nfacct_rule counter;
+       char *ipaddr = NULL;
+       int ret;
+
+       STC_LOGI("remove appid(%s) classid(%d)", app_key->app_id,
+                       app_value->classid);
+
+       if (stc == NULL || connection == NULL)
+               return FALSE;
+
+       if (!stc->carg) {
+               stc->carg = MALLOC0(counter_arg_s, 1);
+               if (stc->carg == NULL)
+                       return FALSE;
+
+               stc->carg->sock = stc_monitor_get_counter_socket();
+       }
+
+       memset(&counter, 0, sizeof(struct nfacct_rule));
+
+       counter.carg = stc->carg;
+       counter.classid = app_value->classid;
+       counter.intend = NFACCT_TETH_COUNTER;
+
+       if (connection->tether_state != TRUE ||
+                       connection->tether_iface.ifname == NULL)
+               return FALSE;
+
+       counter.iftype = connection->tether_iface.type;
+       g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+
+       /* get the ip address of the station based on its mac address */
+       ret = stc_plugin_tether_get_station_ip(app_value->mac, &ipaddr);
+       if (ret != STC_ERROR_NONE)
+               return FALSE;
+
+       __del_iptables_tether_in(&counter, ipaddr);
+       __del_iptables_tether_out(&counter, ipaddr);
+
+       g_free(ipaddr);
+       return FALSE;
+}
+
 static gboolean __add_application_monitor(gpointer key, gpointer value,
                                          gpointer data)
 {
        stc_app_value_s *app_value = (stc_app_value_s *)value;
+       stc_app_key_s *app_key = (stc_app_key_s *)key;
        default_connection_s *connection = (default_connection_s *)data;
        stc_s *stc = stc_get_manager();
 
@@ -397,10 +650,21 @@ static gboolean __add_application_monitor(gpointer key, gpointer value,
                counter.carg = stc->carg;
                counter.classid = app_value->classid;
                counter.intend = NFACCT_COUNTER;
-               counter.iftype = connection->type;
-               g_strlcpy(counter.ifname, connection->ifname, MAX_IFACE_LENGTH);
 
-               if (app_value->classid == STC_TOTAL_IPV4_CLASSID) {
+               if (connection->tether_state == TRUE &&
+                       connection->tether_iface.ifname != NULL &&
+                       app_value->classid == STC_TETHERING_APP_CLASSID) {
+                       counter.iftype = connection->tether_iface.type;
+                       g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+               } else {
+                       counter.iftype = connection->type;
+                       g_strlcpy(counter.ifname, connection->ifname, MAX_IFACE_LENGTH);
+               }
+
+               if (g_str_has_suffix(app_key->app_id, STC_TETHERING_APP_SUFFIX) &&
+                               app_value->classid != STC_TETHERING_APP_CLASSID) {
+                       __add_application_monitor_for_tethering(key, value, data);
+               } else if (app_value->classid == STC_TOTAL_IPV4_CLASSID) {
                        __add_iptables_in(&counter);
                        __add_iptables_out(&counter);
                } else if (app_value->classid == STC_TOTAL_IPV6_CLASSID) {
@@ -421,6 +685,7 @@ static gboolean __remove_application_monitor(gpointer key, gpointer value,
                                             gpointer data)
 {
        stc_app_value_s *app_value = (stc_app_value_s *)value;
+       stc_app_key_s *app_key = (stc_app_key_s *)key;
        default_connection_s *connection = (default_connection_s *)data;
        stc_s *stc = stc_get_manager();
 
@@ -440,8 +705,20 @@ static gboolean __remove_application_monitor(gpointer key, gpointer value,
                counter.carg = stc->carg;
                counter.classid = app_value->classid;
                counter.intend = NFACCT_COUNTER;
-               counter.iftype = connection->type;
-               g_strlcpy(counter.ifname, connection->ifname, MAX_IFACE_LENGTH);
+
+               if (g_str_has_suffix(app_key->app_id, STC_TETHERING_APP_SUFFIX) &&
+                               app_value->classid != STC_TETHERING_APP_CLASSID) {
+                       __remove_application_monitor_for_tethering(key, value, data);
+                       return FALSE;
+               } else if (connection->tether_state == FALSE &&
+                       connection->tether_iface.ifname != NULL &&
+                       app_value->classid == STC_TETHERING_APP_CLASSID) {
+                       counter.iftype = connection->tether_iface.type;
+                       g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+               } else {
+                       counter.iftype = connection->type;
+                       g_strlcpy(counter.ifname, connection->ifname, MAX_IFACE_LENGTH);
+               }
 
                __del_iptables_in(&counter);
                __del_iptables_out(&counter);
@@ -455,164 +732,526 @@ static gboolean __remove_application_monitor(gpointer key, gpointer value,
 static void __print_rstn(stc_rstn_key_s *rstn_key, stc_rstn_value_s *rstn_value)
 {
        STC_LOGI("rstn info => rstn_id [%llu], "
-                "app_id [%s], classid [%lu], ifname [%s], "
-                "iftype [%d], rst_state [%d], "
-                "limit [ (%lld) bytes], "
+                "app_id [%s], classid [%u], ifname [%s], "
+                "iftype [%d], rstn_state [%d], rstn_type [%d], "
+                "month_start_date [%d], limit [ (%lld) bytes], "
                 "warn_limit [ (%lld) bytes], "
-                "counter [ (%lld) bytes], "
+                "monthly_limit [ (%lld) bytes], "
+                "weekly_limit [ (%lld) bytes], "
+                "daily_limit [ (%lld) bytes], "
+                "data_counter [ (%lld) bytes], "
+                "warn_counter [ (%lld) bytes], "
+                "monthly_counter [ (%lld) bytes], "
+                "weekly_counter [ (%lld) bytes], "
+                "daily_counter [ (%lld) bytes], "
                 "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->iftype, rstn_value->rstn_state, rstn_value->rstn_type,
+                rstn_value->month_start_date,
+                rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA],
+                rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA_WARN],
+                rstn_value->limit[STC_RSTN_LIMIT_TYPE_MONTHLY],
+                rstn_value->limit[STC_RSTN_LIMIT_TYPE_WEEKLY],
+                rstn_value->limit[STC_RSTN_LIMIT_TYPE_DAILY],
+                rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA],
+                rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN],
+                rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY],
+                rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY],
+                rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY],
                 rstn_key->roaming, rstn_key->subscriber_id);
 }
 
-static void __process_restriction(enum traffic_restriction_type rst_type,
-                                 stc_rstn_key_s *rstn_key,
-                                 stc_rstn_value_s *rstn_value, void *data)
+static void __add_iptables_rule(int64_t classid, nfacct_rule_intend intend,
+                               stc_iface_type_e iftype)
+{
+       char *default_ifname = stc_default_connection_get_ifname();
+       default_connection_s *connection = stc_get_default_connection();
+       struct nfacct_rule counter;
+       stc_s *stc = stc_get_manager();
+       if (!stc) {
+               g_free(default_ifname); //LCOV_EXCL_LINE
+               return; //LCOV_EXCL_LINE
+       }
+
+       if (!stc->carg) {
+               stc->carg = MALLOC0(counter_arg_s, 1); //LCOV_EXCL_LINE
+               if (stc->carg == NULL) { //LCOV_EXCL_LINE
+                       g_free(default_ifname); //LCOV_EXCL_LINE
+                       return; //LCOV_EXCL_LINE
+               }
+
+               stc->carg->sock = stc_monitor_get_counter_socket(); //LCOV_EXCL_LINE
+       }
+
+       counter.carg = stc->carg;
+       counter.classid = classid;
+       counter.intend = intend;
+
+       if (connection && connection->tether_iface.ifname != NULL &&
+               classid == STC_TETHERING_APP_CLASSID) {
+               counter.iftype = connection->tether_iface.type;
+               g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+       } else {
+               counter.iftype = iftype;
+               g_strlcpy(counter.ifname, default_ifname, MAX_IFACE_LENGTH);
+       }
+
+       g_free(default_ifname);
+
+       /* iptables rule */
+       __add_iptables_in(&counter);
+       __add_iptables_out(&counter);
+
+       /* ip6tables rule */
+       __add_ip6tables_in(&counter);
+       __add_ip6tables_out(&counter);
+}
+
+static void __add_tethering_iptables_rule(int64_t classid, gchar *mac,
+               nfacct_rule_intend intend, stc_iface_type_e iftype)
+{
+       default_connection_s *connection = stc_get_default_connection();
+       struct nfacct_rule counter;
+       stc_s *stc = stc_get_manager();
+       char *ipaddr = NULL;
+       int ret;
+
+       if (!stc || !mac)
+               return;
+
+       if (!stc->carg) {
+               stc->carg = MALLOC0(counter_arg_s, 1);
+               if (stc->carg == NULL)
+                       return;
+
+               stc->carg->sock = stc_monitor_get_counter_socket();
+       }
+
+       memset(&counter, 0, sizeof(struct nfacct_rule));
+
+       counter.carg = stc->carg;
+       counter.classid = classid;
+       counter.intend = intend;
+
+       if (connection->tether_state != TRUE ||
+               connection->tether_iface.ifname == NULL)
+       return;
+
+       counter.iftype = connection->tether_iface.type;
+       g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+
+       /* get connected station ip based on its mac */
+       ret = stc_plugin_tether_get_station_ip(mac, &ipaddr);
+       if (ret != STC_ERROR_NONE)
+               return;
+
+       /* tethering iptables rule */
+       __add_iptables_tether_in(&counter, ipaddr);
+       __add_iptables_tether_out(&counter, ipaddr);
+       g_free(ipaddr);
+}
+
+static void __del_tethering_iptables_rule(int64_t classid, gchar *mac,
+               nfacct_rule_intend intend, stc_iface_type_e iftype)
+{
+       default_connection_s *connection = stc_get_default_connection();
+       struct nfacct_rule counter;
+       stc_s *stc = stc_get_manager();
+       char *ipaddr = NULL;
+       int ret;
+
+       if (!stc || !mac)
+               return;
+
+       if (!stc->carg) {
+               stc->carg = MALLOC0(counter_arg_s, 1);
+               if (stc->carg == NULL)
+                       return;
+
+               stc->carg->sock = stc_monitor_get_counter_socket();
+       }
+
+       memset(&counter, 0, sizeof(struct nfacct_rule));
+
+       counter.carg = stc->carg;
+       counter.classid = classid;
+       counter.intend = intend;
+
+       if (connection->tether_state != TRUE ||
+               connection->tether_iface.ifname == NULL)
+       return;
+
+       counter.iftype = connection->tether_iface.type;
+       g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+
+       /* get connected station ip based on its mac */
+       ret = stc_plugin_tether_get_station_ip(mac, &ipaddr);
+       if (ret != STC_ERROR_NONE) {
+               STC_LOGE("Error: no IP found for station mac(%s)", mac);
+               return;
+       }
+
+       /* tethering iptables rule */
+       __del_iptables_tether_in(&counter, ipaddr);
+       __del_iptables_tether_out(&counter, ipaddr);
+       g_free(ipaddr);
+}
+
+static void __del_iptables_rule(int64_t classid, nfacct_rule_intend intend,
+                               stc_iface_type_e iftype)
+{
+       char *default_ifname = stc_default_connection_get_ifname();
+       default_connection_s *connection = stc_get_default_connection();
+       struct nfacct_rule counter;
+       stc_s *stc = stc_get_manager();
+       if (!stc) {
+               g_free(default_ifname); //LCOV_EXCL_LINE
+               return; //LCOV_EXCL_LINE
+       }
+
+       if (!stc->carg) {
+               stc->carg = MALLOC0(counter_arg_s, 1); //LCOV_EXCL_LINE
+               if (stc->carg == NULL) { //LCOV_EXCL_LINE
+                       g_free(default_ifname); //LCOV_EXCL_LINE
+                       return; //LCOV_EXCL_LINE
+               }
+
+               stc->carg->sock = stc_monitor_get_counter_socket(); //LCOV_EXCL_LINE
+       }
+
+       counter.carg = stc->carg;
+       counter.classid = classid;
+       counter.intend = intend;
+
+       if (connection && connection->tether_iface.ifname != NULL &&
+               classid == STC_TETHERING_APP_CLASSID) {
+               counter.iftype = connection->tether_iface.type;
+               g_strlcpy(counter.ifname, connection->tether_iface.ifname, MAX_IFACE_LENGTH);
+       } else {
+               counter.iftype = iftype;
+               g_strlcpy(counter.ifname, default_ifname, MAX_IFACE_LENGTH);
+       }
+
+       g_free(default_ifname);
+
+       /* iptables rule */
+       __del_iptables_in(&counter);
+       __del_iptables_out(&counter);
+
+       /* ip6tables rule */
+       __del_ip6tables_in(&counter);
+       __del_ip6tables_out(&counter);
+}
+
+static void __set_rstn_noti_state(int value)
+{
+       int state = STC_RSTN_STATE_INIT;
+
+       if (__vconf_get_int(VCONFKEY_SETAPPL_DATA_RESTRICTION_INT, &state))
+               return;
+
+       if (state == value) {
+               STC_LOGI("No need to change a restriction status: %d", state);
+               return;
+       }
+
+       vconf_set_int(VCONFKEY_SETAPPL_DATA_RESTRICTION_INT, value);
+       return;
+}
+
+typedef struct {
+       time_t month_start_ts;
+       time_t week_start_ts;
+       time_t day_start_ts;
+       int64_t monthly_stat;
+       int64_t weekly_stat;
+       int64_t daily_stat;
+} cumulative_data_s;
+
+static stc_cb_ret_e __statistics_info_cb(const table_statistics_info *info,
+                                       void *user_data)
+{
+       cumulative_data_s *stat = (cumulative_data_s *)user_data;
+       int64_t counters = 0;
+
+       counters = info->cnt.in_bytes + info->cnt.out_bytes;
+
+       stat->monthly_stat += counters;
+       if (stat->week_start_ts <= info->interval->from)
+               stat->weekly_stat += counters;
+       if (stat->day_start_ts <= info->interval->from)
+               stat->daily_stat += counters;
+
+       return STC_CONTINUE;
+}
+
+static void __process_tethering_restriction(enum traffic_restriction_type rstn_type,
+               stc_rstn_key_s *rstn_key, stc_rstn_value_s *rstn_value, void *data)
 {
-       int64_t effective_data_limit, effective_data_warn_limit;
        default_connection_s *old_connection = (default_connection_s *)data;
        default_connection_s *connection = NULL;
+       char *mac_str = NULL;
 
        if (old_connection != NULL)
                connection = old_connection;
        else
                connection = stc_get_default_connection();
 
-       /* no default ifname */
-       if (connection->ifname == NULL)
+       /* in case tethering is not active */
+       if (connection->tether_state == FALSE)
                return;
 
        /* rstn not applicable for this interface */
        if (rstn_key->ifname != NULL && g_strcmp0("", rstn_key->ifname) != 0 &&
-           g_strcmp0(connection->ifname, rstn_key->ifname) != 0)
+                       (g_strcmp0(connection->tether_iface.ifname, rstn_key->ifname) != 0))
                return;
 
-       /* classid is invalid */
-       if (rstn_value->classid == STC_UNKNOWN_CLASSID)
+       /* in case appid not a tethering app */
+       if (!g_str_has_suffix(rstn_key->app_id, STC_TETHERING_APP_SUFFIX))
+               return;
+
+       /* Ignore TOTAL_TETHERING,
+        * Process only station appids */
+       if (rstn_value->classid == STC_TETHERING_APP_CLASSID)
                return;
 
-       effective_data_limit = rstn_value->data_limit;
-       effective_data_warn_limit = rstn_value->data_warn_limit;
+       /* get the station mac based on classid */
+       stc_plugin_tether_get_station_by_classid(rstn_value->classid, &mac_str);
+       if (!mac_str) {
+               STC_LOGE("station not found for classid(%d)", rstn_value->classid);
+               return;
+       }
 
-       if (rst_type == RST_SET) {
-               /* TODO: Change this to runtime memory */
+       switch (rstn_type) {
+       case RST_SET:
+       {
+               int i;
                table_counters_info info;
+               int64_t effective_limit[STC_RSTN_LIMIT_TYPE_MAX] = { 0, };
+
+                       memset(&info, 0, sizeof(table_counters_info));
+                       rstn_value->limit_exceeded = 0;
+
+                       if ((rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA] == 0 &&
+                                               rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA] >= 0) ||
+                                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN] == 0 &&
+                                        rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA_WARN] >= 0) ||
+                                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY] == 0 &&
+                                        rstn_value->limit[STC_RSTN_LIMIT_TYPE_MONTHLY] >= 0) ||
+                                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY] == 0 &&
+                                        rstn_value->limit[STC_RSTN_LIMIT_TYPE_WEEKLY] >= 0) ||
+                                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY] == 0 &&
+                                        rstn_value->limit[STC_RSTN_LIMIT_TYPE_DAILY] >= 0)) {
+                               table_counters_get(rstn_value->restriction_id, &info);
+
+                               time_t current_time = 0;
+                               cumulative_data_s stat;
+                               table_statistics_select_rule rule;
+
+                               memset(&stat, 0, sizeof(cumulative_data_s));
+                               stat.month_start_ts = rstn_value->month_start_ts;
+                               stat.week_start_ts = g_system->last_week_ts;
+                               stat.day_start_ts = g_system->last_day_ts;
+
+                               memset(&rule, 0, sizeof(table_statistics_select_rule));
+                               rule.from = rstn_value->month_start_ts;
+                               time(&current_time);
+                               rule.to = current_time;
+                               rule.iftype = rstn_key->iftype;
+                               rule.granularity = GRANULARITY;
+
+                               table_statistics_per_app(rstn_key->app_id, &rule, __statistics_info_cb, &stat);
+
+                               rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA] = info.data_counter;
+                               rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN] = info.warn_counter;
+                               rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY] = info.monthly_counter + stat.monthly_stat;
+                               rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY] = info.weekly_counter + stat.weekly_stat;
+                               rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY] = info.daily_counter + stat.daily_stat;
+                       }
 
-               memset(&info, 0, sizeof(table_counters_info));
-               table_counters_get(rstn_value->restriction_id, &info);
+                       for (i = 0; i < STC_RSTN_LIMIT_TYPE_MAX; i++) {
+                               if (rstn_value->limit[i] >= 0) {
+                                       effective_limit[i] = rstn_value->limit[i] - rstn_value->counter[i];
 
-               effective_data_limit -= info.data_counter;
-               effective_data_warn_limit -= info.data_counter;
+                                       if (effective_limit[i] < 0)
+                                               rstn_value->limit_exceeded |= (1 << i);
+                               }
+                       }
 
-               if (effective_data_limit < 0) {
-                       effective_data_limit = 0; //LCOV_EXCL_LINE
-                       rstn_value->data_limit_reached = TRUE; //LCOV_EXCL_LINE
-               }
+                       STC_LOGD("rstn_id [%llu], datausage [%llu] bytes",
+                                       rstn_value->restriction_id, info.data_counter);
 
-               if (effective_data_warn_limit < 0)
-                       effective_data_warn_limit = 0; //LCOV_EXCL_LINE
+                       if (rstn_value->limit_exceeded != 0 &&
+                                       rstn_value->limit_exceeded != (1 << STC_RSTN_LIMIT_TYPE_DATA_WARN)) {
+                               __add_tethering_iptables_rule(rstn_value->classid, mac_str,
+                                               NFACCT_TETH_BLOCK, rstn_key->iftype);
+                       }
 
-               STC_LOGD("datausage [%lld] bytes", info.data_counter);
+                       rstn_value->rstn_state = STC_RSTN_STATE_ACTIVATED;
        }
+       break;
+       case RST_EXCLUDE:
+       {
+               __add_tethering_iptables_rule(rstn_value->classid, mac_str,
+                                       NFACCT_TETH_ALLOW, rstn_key->iftype);
 
-       STC_LOGD("rstn_id [%llu], effective_data_limit [%lld] bytes, "
-                "effective_data_warn_limit [%lld] bytes",
-                rstn_value->restriction_id, effective_data_limit,
-                effective_data_warn_limit);
+                       rstn_value->rstn_state = STC_RSTN_STATE_ACTIVATED;
+                       rstn_value->limit_exceeded = 0;
+                       rstn_value->limit_notified = 0;
+       }
+       break;
+       case RST_UNSET:
+       {
+                       int i;
+                       __del_tethering_iptables_rule(rstn_value->classid, mac_str,
+                                       NFACCT_TETH_BLOCK, rstn_key->iftype);
+
+                       rstn_value->rstn_state = STC_RSTN_STATE_DEACTIVATED;
+                       rstn_value->limit_exceeded = 0;
+                       rstn_value->limit_notified = 0;
+
+                       for (i = 0; i < STC_RSTN_LIMIT_TYPE_MAX; i++)
+                               if (rstn_value->limit[i] >= 0)
+                                       rstn_value->counter[i] = 0;
+       }
+       break;
+       default:
+                       ;//Do Nothing
+       }
+       FREE(mac_str);
+}
 
-       switch (rst_type) {
-       case RST_SET:
-               if (effective_data_limit <= 0) {
-                       char *default_ifname = stc_default_connection_get_ifname();
-                       struct nfacct_rule counter;
-                       stc_s *stc = stc_get_manager();
-                       if (!stc) {
-                               g_free(default_ifname); //LCOV_EXCL_LINE
-                               return; //LCOV_EXCL_LINE
-                       }
+static void __process_restriction(enum traffic_restriction_type rstn_type,
+                                 stc_rstn_key_s *rstn_key,
+                                 stc_rstn_value_s *rstn_value, void *data)
+{
+       default_connection_s *old_connection = (default_connection_s *)data;
+       default_connection_s *connection = NULL;
 
-                       if (!stc->carg) {
-                               stc->carg = MALLOC0(counter_arg_s, 1); //LCOV_EXCL_LINE
-                               if (stc->carg == NULL) { //LCOV_EXCL_LINE
-                                       g_free(default_ifname); //LCOV_EXCL_LINE
-                                       return; //LCOV_EXCL_LINE
-                               }
+       if (old_connection != NULL)
+               connection = old_connection;
+       else
+               connection = stc_get_default_connection();
 
-                               stc->carg->sock = stc_monitor_get_counter_socket(); //LCOV_EXCL_LINE
-                       }
+       /* no default ifname */
+       if (connection->ifname == NULL)
+               return;
 
-                       counter.carg = stc->carg;
-                       counter.classid = rstn_value->classid;
-                       counter.intend = NFACCT_BLOCK;
-                       counter.iftype = rstn_key->iftype;
-                       g_strlcpy(counter.ifname, default_ifname,
-                                 MAX_IFACE_LENGTH);
+       /* rstn not applicable for this interface */
+       if (rstn_key->ifname != NULL && g_strcmp0("", rstn_key->ifname) != 0 &&
+           (g_strcmp0(connection->ifname, rstn_key->ifname) != 0) &&
+               (g_strcmp0(connection->tether_iface.ifname, rstn_key->ifname) != 0))
+               return;
 
-                       generate_counter_name(&counter);
-                       g_free(default_ifname);
+       /* classid is invalid */
+       if (rstn_value->classid <= STC_UNKNOWN_CLASSID)
+               return;
 
-                       /* iptables rule */
-                       __add_iptables_in(&counter);
-                       __add_iptables_out(&counter);
+       /* Do not proceed for tethering station appid if found here,
+        * for tethering station apps __process_tethering_restriction() call
+        * will handle it */
+       if (g_str_has_suffix(rstn_key->app_id, STC_TETHERING_APP_SUFFIX) &&
+                       rstn_value->classid != STC_TETHERING_APP_CLASSID)
+               return;
 
-                       /* ip6tables rule */
-                       __add_ip6tables_in(&counter);
-                       __add_ip6tables_out(&counter);
+       switch (rstn_type) {
+       case RST_SET:
+       {
+               int i;
+               table_counters_info info;
+               int64_t effective_limit[STC_RSTN_LIMIT_TYPE_MAX] = { 0, };
+
+               memset(&info, 0, sizeof(table_counters_info));
+               rstn_value->limit_exceeded = 0;
+
+               if ((rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA_WARN] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_MONTHLY] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_WEEKLY] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_DAILY] >= 0)) {
+                       table_counters_get(rstn_value->restriction_id, &info);
+
+                       time_t current_time = 0;
+                       cumulative_data_s stat;
+                       table_statistics_select_rule rule;
+
+                       memset(&stat, 0, sizeof(cumulative_data_s));
+                       stat.month_start_ts = rstn_value->month_start_ts;
+                       stat.week_start_ts = g_system->last_week_ts;
+                       stat.day_start_ts = g_system->last_day_ts;
+
+                       memset(&rule, 0, sizeof(table_statistics_select_rule));
+                       rule.from = rstn_value->month_start_ts;
+                       time(&current_time);
+                       rule.to = current_time;
+                       rule.iftype = rstn_key->iftype;
+                       rule.granularity = GRANULARITY;
+
+                       table_statistics_per_app(rstn_key->app_id, &rule, __statistics_info_cb, &stat);
+
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA] = info.data_counter;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN] = info.warn_counter;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY] = info.monthly_counter + stat.monthly_stat;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY] = info.weekly_counter + stat.weekly_stat;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY] = info.daily_counter + stat.daily_stat;
                }
 
-               rstn_value->rst_state = STC_RESTRICTION_ACTIVATED;
-               rstn_value->data_limit_reached = FALSE;
-               break;
-       case RST_EXCLUDE:
-               ;//Do Nothing
-               break;
-       case RST_UNSET:
-               {
-                       char *default_ifname = stc_default_connection_get_ifname();
-                       struct nfacct_rule counter;
-                       stc_s *stc = stc_get_manager();
-                       if (!stc) {
-                               g_free(default_ifname); //LCOV_EXCL_LINE
-                               return; //LCOV_EXCL_LINE
+               for (i = 0; i < STC_RSTN_LIMIT_TYPE_MAX; i++) {
+                       if (rstn_value->limit[i] >= 0) {
+                               effective_limit[i] = rstn_value->limit[i] - rstn_value->counter[i];
+
+                               if (effective_limit[i] < 0)
+                                       rstn_value->limit_exceeded |= (1 << i);
                        }
+               }
 
-                       if (!stc->carg) {
-                               stc->carg = MALLOC0(counter_arg_s, 1); //LCOV_EXCL_LINE
-                               if (stc->carg == NULL) { //LCOV_EXCL_LINE
-                                       g_free(default_ifname); //LCOV_EXCL_LINE
-                                       return; //LCOV_EXCL_LINE
-                               }
+               STC_LOGD("rstn_id [%llu], datausage [%llu] bytes",
+                       rstn_value->restriction_id, info.data_counter);
 
-                               stc->carg->sock = stc_monitor_get_counter_socket(); //LCOV_EXCL_LINE
-                       }
+               if (rstn_value->limit_exceeded != 0 &&
+                       rstn_value->limit_exceeded != (1 << STC_RSTN_LIMIT_TYPE_DATA_WARN)) {
+                       __add_iptables_rule(rstn_value->classid, NFACCT_BLOCK, rstn_key->iftype);
+               }
 
-                       counter.carg = stc->carg;
-                       counter.classid = rstn_value->classid;
-                       counter.intend = NFACCT_BLOCK;
-                       counter.iftype = rstn_key->iftype;
-                       g_strlcpy(counter.ifname, default_ifname,
-                                 MAX_IFACE_LENGTH);
+               rstn_value->rstn_state = STC_RSTN_STATE_ACTIVATED;
+       }
+       break;
+       case RST_EXCLUDE:
+               __add_iptables_rule(rstn_value->classid, NFACCT_ALLOW,
+                                   rstn_key->iftype);
+
+               rstn_value->rstn_state = STC_RSTN_STATE_ACTIVATED;
+               rstn_value->limit_exceeded = 0;
+               rstn_value->limit_notified = 0;
+               break;
+       case RST_UNSET:
+       {
+               int i;
 
-                       generate_counter_name(&counter);
-                       g_free(default_ifname);
+               if (rstn_value->classid == STC_TETHERING_APP_CLASSID)
+                       __del_iptables_rule(rstn_value->classid, NFACCT_BLOCK,
+                                           rstn_key->iftype);
+               else
+                       __del_iptables_rule(rstn_value->classid, rstn_value->rstn_type,
+                                           rstn_key->iftype);
 
-                       /* iptables rule */
-                       __del_iptables_in(&counter);
-                       __del_iptables_out(&counter);
+               rstn_value->rstn_state = STC_RSTN_STATE_DEACTIVATED;
+               rstn_value->limit_exceeded = 0;
+               rstn_value->limit_notified = 0;
 
-                       /* ip6tables rule */
-                       __del_ip6tables_in(&counter);
-                       __del_ip6tables_out(&counter);
+               for (i = 0; i < STC_RSTN_LIMIT_TYPE_MAX; i++)
+                       if (rstn_value->limit[i] >= 0)
+                               rstn_value->counter[i] = 0;
 
-                       rstn_value->rst_state = STC_RESTRICTION_REMOVED;
-                       rstn_value->data_limit_reached = FALSE;
-               }
-               break;
+               __set_rstn_noti_state(STC_RSTN_STATE_UNSET);
+       }
+       break;
        default:
                ;//Do Nothing
        }
@@ -636,11 +1275,14 @@ static gboolean __remove_rstns_foreach_application(gpointer key,
                goto out;
 
        /* rstn rule is already removed */
-       if (rstn_value->rst_state == STC_RESTRICTION_REMOVED)
+       if (rstn_value->rstn_state == STC_RSTN_STATE_DEACTIVATED)
                goto out;
 
        /* remove restriction from system */
-       __process_restriction(RST_UNSET, rstn_key, rstn_value, data);
+       __process_restriction(RST_UNSET, rstn_key, rstn_value, NULL);
+
+       /* remove tethering restriction from system*/
+       __process_tethering_restriction(RST_UNSET, rstn_key, rstn_value, NULL);
 
        __print_rstn(rstn_key, rstn_value);
 out:
@@ -733,60 +1375,92 @@ static stc_error_e __close_and_reopen_contr_sock(stc_system_s *system)
                return STC_ERROR_FAIL;
        }
 
-       gio = g_io_channel_unix_new(system->contr_sock);
-       system->contr_gsource_id =
-               g_io_add_watch(gio, G_IO_IN | G_IO_ERR | G_IO_HUP,
-                              (GIOFunc) __process_contr_reply,
-                              NULL);
-       g_io_channel_unref(gio);
+       gio = g_io_channel_unix_new(system->contr_sock);
+       system->contr_gsource_id =
+               g_io_add_watch(gio, G_IO_IN | G_IO_ERR | G_IO_HUP,
+                              (GIOFunc) __process_contr_reply,
+                              NULL);
+       g_io_channel_unref(gio);
+
+       return STC_ERROR_NONE;
+}
+
+static void __action_when_rstn_limit_exceeded_tethering(stc_rstn_key_s *rstn_key,
+               stc_rstn_value_s *rstn_value, classid_bytes_context_s *context)
+{
+       char *mac_str = NULL;
+       struct nfacct_rule *counter = context->counter;
+
+       /* get the station mac based on classid */
+       stc_plugin_tether_get_station_by_classid(counter->classid, &mac_str);
+       if (!mac_str) {
+               STC_LOGE("station not found for classid(%d)", counter->classid);
+               return;
+       }
+
+       STC_LOGI("station mac %s, classid %u, iftype %u, iotype %d, \
+                       intend %d, ifname %s, bytes %lld", mac_str,
+                       counter->classid, counter->iftype, counter->iotype,
+                       counter->intend, counter->ifname, context->bytes);
+
+       /* Block tethering station immediately */
+       counter->intend = NFACCT_TETH_BLOCK;
+       __del_tethering_iptables_rule(counter->classid, mac_str,
+                       NFACCT_TETH_BLOCK, rstn_key->iftype);
 
-       return STC_ERROR_NONE;
+       __add_tethering_iptables_rule(counter->classid, mac_str,
+                       NFACCT_TETH_BLOCK, rstn_key->iftype);
+       counter->intend = NFACCT_TETH_COUNTER;
+
+       g_free(mac_str);
 }
 
-static gboolean __rstn_counter_update(stc_rstn_key_s *rstn_key,
-                                     stc_rstn_value_s *rstn_value,
-                                     classid_bytes_context_s *context)
+static void __action_when_rstn_limit_exceeded(stc_rstn_limit_type_e limit_type,
+                                               stc_rstn_key_s *rstn_key,
+                                               stc_rstn_value_s *rstn_value,
+                                               classid_bytes_context_s *context)
 {
-       switch (context->counter->iotype) {
-       case NFACCT_COUNTER_IN:
-       case NFACCT_COUNTER_OUT:
-               rstn_value->data_counter += context->bytes;
-
-               if (rstn_value->data_counter >= rstn_value->data_warn_limit &&
-                   rstn_value->warn_limit_crossed_notified == FALSE) {
-
-                       gboolean rv;
-                       char iftype[MAX_INT_LENGTH];
-                       char byte[MAX_INT_LENGTH];
-                       stc_s *stc = (stc_s *)stc_get_manager();
-                       ret_value_msg_if(stc == NULL, FALSE, "failed to get stc data");
-
-                       /* emit signal */
-                       rv = stc_manager_dbus_emit_signal(stc->connection,
-                                                         STC_DBUS_SERVICE_RESTRICTION_PATH,
-                                                         STC_DBUS_INTERFACE_RESTRICTION,
-                                                         "WarnThresholdCrossed",
-                                                         g_variant_new("(si)", rstn_key->app_id, rstn_key->iftype));
-                       if (rv == TRUE)
-                               rstn_value->warn_limit_crossed_notified = TRUE;
-
-                       snprintf(iftype, MAX_INT_LENGTH, "%d", rstn_key->iftype);
-                       snprintf(byte, MAX_INT_LENGTH, "%lld", rstn_value->data_warn_limit);
-                       stc_send_warn_message_to_net_popup("warn threshold crossed",
-                                                          "warning_noti",
-                                                          rstn_key->app_id,
-                                                          iftype, byte);
-               }
+       gboolean rv;
+       char iftype[MAX_INT_LENGTH] = { 0, };
+       char byte[MAX_INT_LENGTH] = { 0, };
+       const char *signal_name = NULL;
+       const char *net_popup_content = NULL;
+       const char *net_popup_type = NULL;
+       stc_s *stc = (stc_s *)stc_get_manager();
 
-               if (rstn_value->data_counter >= rstn_value->data_limit &&
-                   rstn_value->rstn_limit_crossed_notified == FALSE) {
+       if (stc == NULL) {
+               STC_LOGE("Failed to get stc data");
+               return;
+       }
 
-                       gboolean rv;
-                       char iftype[MAX_INT_LENGTH];
-                       char byte[MAX_INT_LENGTH];
-                       stc_s *stc = (stc_s *)stc_get_manager();
-                       ret_value_msg_if(stc == NULL, FALSE, "failed to get stc data");
+       switch (limit_type) {
+       case STC_RSTN_LIMIT_TYPE_DATA_WARN:
+       {
+               signal_name = "WarnThresholdCrossed";
+               net_popup_content = "warn threshold crossed";
+               net_popup_type = "warning_noti";
+       }
+       break;
+       case STC_RSTN_LIMIT_TYPE_DATA:
+       case STC_RSTN_LIMIT_TYPE_MONTHLY:
+       case STC_RSTN_LIMIT_TYPE_WEEKLY:
+       case STC_RSTN_LIMIT_TYPE_DAILY:
+       {
+               signal_name = "RestrictionThresholdCrossed";
+               net_popup_content = "restriction threshold crossed";
+               net_popup_type = "restriction_noti";
+
+               /* Apply restriction for tethering apps if app_id is of tethering client
+                * otherwise do the normal iptables rule */
+               if (context->counter->intend == NFACCT_TETH_COUNTER) {
+
+                       if (g_str_has_suffix(rstn_key->app_id, STC_TETHERING_APP_SUFFIX) &&
+                                       rstn_value->classid != STC_TETHERING_APP_CLASSID) {
+                               __action_when_rstn_limit_exceeded_tethering(rstn_key, rstn_value,
+                                               context);
+                       }
 
+               } else {
                        /* block immediately */
                        context->counter->intend = NFACCT_BLOCK;
                        __del_iptables_in(context->counter);
@@ -799,23 +1473,79 @@ static gboolean __rstn_counter_update(stc_rstn_key_s *rstn_key,
                        __add_ip6tables_in(context->counter);
                        __add_ip6tables_out(context->counter);
                        context->counter->intend = NFACCT_COUNTER;
+               }
+
+               rstn_value->limit_exceeded |= (1 << limit_type);
+
+               __set_rstn_noti_state(STC_RSTN_STATE_SET);
+       }
+       break;
+       default:
+               break;
+       }
+
+       if (signal_name == NULL) {
+               STC_LOGE("Invalid parameter: limit_type");
+               return;
+       }
+
+       /* emit signal */
+       rv = stc_manager_dbus_emit_signal(stc->connection,
+                                                 STC_DBUS_SERVICE_RESTRICTION_PATH,
+                                                 STC_DBUS_INTERFACE_RESTRICTION,
+                                                 signal_name,
+                                                 g_variant_new("(si)",
+                                                 rstn_key->app_id,
+                                                 rstn_key->iftype));
+
+       if (rv == TRUE)
+               rstn_value->limit_notified |= (1 << limit_type);
+
+       snprintf(iftype, MAX_INT_LENGTH, "%d", rstn_key->iftype);
+       snprintf(byte, MAX_INT_LENGTH, "%lld", rstn_value->limit[limit_type]);
+       stc_plugin_appstatus_send_message(net_popup_content,
+                       net_popup_type, rstn_key->app_id, iftype, byte);
+}
+
+static gboolean __rstn_counter_update(stc_rstn_key_s *rstn_key,
+                                     stc_rstn_value_s *rstn_value,
+                                     classid_bytes_context_s *context)
+{
+       int i;
+       switch (context->counter->iotype) {
+       case NFACCT_COUNTER_IN:
+       case NFACCT_COUNTER_OUT:
+               if ((rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_DATA_WARN] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_MONTHLY] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_WEEKLY] >= 0) ||
+                       (rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY] == 0 &&
+                       rstn_value->limit[STC_RSTN_LIMIT_TYPE_DAILY] >= 0)) {
+                       table_counters_info info;
+                       memset(&info, 0, sizeof(table_counters_info));
+                       table_counters_get(rstn_value->restriction_id, &info);
+
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA] = info.data_counter;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN] = info.warn_counter;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY] = info.monthly_counter;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY] = info.weekly_counter;
+                       rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY] = info.daily_counter;
+               }
 
-                       rstn_value->data_limit_reached = TRUE;
-
-                       /* emit signal */
-                       rv = stc_manager_dbus_emit_signal(stc->connection,
-                                                         STC_DBUS_SERVICE_RESTRICTION_PATH,
-                                                         STC_DBUS_INTERFACE_RESTRICTION,
-                                                         "RestrictionThresholdCrossed",
-                                                         g_variant_new("(si)", rstn_key->app_id, rstn_key->iftype));
-                       if (rv == TRUE)
-                               rstn_value->rstn_limit_crossed_notified = TRUE;
-
-                       snprintf(iftype, MAX_INT_LENGTH, "%d", rstn_key->iftype);
-                       snprintf(byte, MAX_INT_LENGTH, "%lld", rstn_value->data_limit);
-                       stc_send_restriction_message_to_net_popup("restriction threshold crossed",
-                                                                 "restriction_noti", rstn_key->app_id,
-                                                                 iftype, byte);
+               for (i = 0; i < STC_RSTN_LIMIT_TYPE_MAX; i++) {
+                       if (rstn_value->limit[i] >= 0 &&
+                               !(rstn_value->limit_notified & (1 << i))) {
+                               rstn_value->counter[i] += context->bytes;
+                               if (rstn_value->limit[i] <= rstn_value->counter[i])
+                                       __action_when_rstn_limit_exceeded(i,
+                                                                               rstn_key,
+                                                                               rstn_value,
+                                                                               context);
+                       }
                }
 
                g_system->rstns_tree_updated = TRUE;
@@ -833,11 +1563,19 @@ static gboolean __interface_rstn_counter_update(stc_rstn_key_s *rstn_key,
                                                classid_bytes_context_s *context)
 {
        if ((rstn_value->classid == STC_TOTAL_DATACALL_CLASSID &&
-            context->counter->iftype == STC_IFACE_DATACALL) ||
-           (rstn_value->classid == STC_TOTAL_WIFI_CLASSID &&
-            context->counter->iftype == STC_IFACE_WIFI) ||
-           (rstn_value->classid == STC_TOTAL_BLUETOOTH_CLASSID &&
-            context->counter->iftype == STC_IFACE_BLUETOOTH)) {
+               context->counter->iftype == STC_IFACE_DATACALL) ||
+               (rstn_value->classid == STC_TOTAL_WIFI_CLASSID &&
+               context->counter->iftype == STC_IFACE_WIFI) ||
+               (rstn_value->classid == STC_TOTAL_BLUETOOTH_CLASSID &&
+               context->counter->iftype == STC_IFACE_BLUETOOTH) ||
+               (rstn_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_WIFI) ||
+               (rstn_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_BLUETOOTH) ||
+               (rstn_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_USB) ||
+               (rstn_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_P2P)) {
                context->counter->classid = rstn_value->classid;
                return __rstn_counter_update(rstn_key, rstn_value, context);
        }
@@ -855,11 +1593,12 @@ static gboolean __rstn_counter_update_foreach_classid(gpointer key,
        classid_bytes_context_s *context = (classid_bytes_context_s *)data;
        uint32_t classid;
 
-       if (context->counter->intend != NFACCT_COUNTER)
+       if (context->counter->intend != NFACCT_COUNTER &&
+                       context->counter->intend != NFACCT_TETH_COUNTER)
                goto try_next_callback;
 
-       if (rstn_value->data_limit_reached == TRUE) {
-               context->data_limit_reached = TRUE; //LCOV_EXCL_LINE
+       if (rstn_value->limit_exceeded == TRUE) {
+               context->data_limit_exceeded = TRUE; //LCOV_EXCL_LINE
                goto try_next_callback; //LCOV_EXCL_LINE
        }
 
@@ -890,16 +1629,45 @@ static gboolean __update_app_statistics(gpointer key, gpointer value,
        memset(&stat_key, 0, sizeof(stc_db_classid_iftype_key));
        memset(&stat, 0 , sizeof(stc_db_app_stats));
 
+       /* Do not update statistics for Tethering
+        * if tethering is in-active found */
+       if (default_connection &&
+               default_connection->tether_state == FALSE &&
+               !strcmp(app_key->app_id, STC_TOTAL_TETHERING))
+               return FALSE;
+
+       /* Do not update statistics for Wi-Fi
+        * if tethering is active on wlan0 iface */
+       if (default_connection && default_connection->tether_state &&
+               default_connection->tether_iface.type == STC_IFACE_WIFI &&
+               !strcmp(app_key->app_id, STC_TOTAL_WIFI))
+               return FALSE;
+
        stat_key.classid = app_value->classid;
-       stat_key.iftype = default_connection->type;
+
+       if (app_value->classid == STC_TETHERING_APP_CLASSID &&
+               default_connection->tether_state == TRUE)
+               stat_key.iftype = default_connection->tether_iface.type;
+       else if (g_str_has_suffix(app_key->app_id, STC_TETHERING_APP_SUFFIX))
+               stat_key.iftype = default_connection->tether_iface.type;
+       else
+               stat_key.iftype = default_connection->type;
 
        if (STC_IFACE_DATACALL == stat_key.iftype)
                stat_key.subscriber_id = g_strdup(default_connection->subscriber_id);
        else
                stat_key.subscriber_id = g_strdup("none_subid"); //LCOV_EXCL_LINE
 
-       g_strlcpy(stat_key.ifname, default_connection->ifname,
-                 MAX_IFACE_LENGTH);
+       if (app_value->classid == STC_TETHERING_APP_CLASSID &&
+               default_connection->tether_state == TRUE)
+               g_strlcpy(stat_key.ifname, default_connection->tether_iface.ifname,
+                         MAX_IFACE_LENGTH);
+       else if (g_str_has_suffix(app_key->app_id, STC_TETHERING_APP_SUFFIX))
+               g_strlcpy(stat_key.ifname, default_connection->tether_iface.ifname,
+                         MAX_IFACE_LENGTH);
+       else
+               g_strlcpy(stat_key.ifname, default_connection->ifname,
+                         MAX_IFACE_LENGTH);
 
        stat.app_id = g_strdup(app_key->app_id);
        stat.snd_count = app_value->counter.out_bytes;
@@ -928,7 +1696,11 @@ static gboolean __update_app_statistics(gpointer key, gpointer value,
 
 static gboolean __flush_apps_stats_to_database(gpointer user_data)
 {
-       time_t current_time = time(0);
+       time_t current_time = 0;
+       stc_s *stc = stc_get_manager();
+
+       if (stc && stc->carg)
+               current_time = stc->carg->last_run_time;
 
        if (g_system->apps_tree_updated == FALSE)
                return G_SOURCE_REMOVE;
@@ -951,7 +1723,11 @@ static gboolean __update_counter_statistics(gpointer key, gpointer value,
        stc_rstn_value_s *rstn_value = (stc_rstn_value_s *)value;
        table_counters_info info = {
                .restriction_id = rstn_value->restriction_id,
-               .data_counter = rstn_value->data_counter
+               .data_counter = rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA],
+               .warn_counter = rstn_value->counter[STC_RSTN_LIMIT_TYPE_DATA_WARN],
+               .monthly_counter = rstn_value->counter[STC_RSTN_LIMIT_TYPE_MONTHLY],
+               .weekly_counter = rstn_value->counter[STC_RSTN_LIMIT_TYPE_WEEKLY],
+               .daily_counter = rstn_value->counter[STC_RSTN_LIMIT_TYPE_DAILY]
        };
 
        table_counters_update_counters(&info);
@@ -961,7 +1737,11 @@ static gboolean __update_counter_statistics(gpointer key, gpointer value,
 
 static gboolean __flush_rstns_counter_to_database(gpointer user_data)
 {
-       time_t current_time = time(0);
+       time_t current_time = 0;
+       stc_s *stc = stc_get_manager();
+
+       if (stc && stc->carg)
+               current_time = stc->carg->last_run_time;
 
        if (g_system->rstns_tree_updated == FALSE)
                return G_SOURCE_REMOVE;
@@ -988,16 +1768,18 @@ static void __app_counter_update(stc_app_key_s *app_key,
                app_value->counter.in_bytes = context->bytes;
                g_system->apps_tree_updated = TRUE;
 
-               if (STC_DEBUG_LOG)
-                       __apps_tree_foreach_print(app_key, app_value, NULL); //LCOV_EXCL_LINE
+               /*
+               __apps_tree_foreach_print(app_key, app_value, NULL); //LCOV_EXCL_LINE
+               */
                break;
        case NFACCT_COUNTER_OUT:
                app_value->data_usage.out_bytes += context->bytes;
                app_value->counter.out_bytes = context->bytes;
                g_system->apps_tree_updated = TRUE;
 
-               if (STC_DEBUG_LOG)
-                       __apps_tree_foreach_print(app_key, app_value, NULL); //LCOV_EXCL_LINE
+               /*
+               __apps_tree_foreach_print(app_key, app_value, NULL); //LCOV_EXCL_LINE
+               */
                break;
        default:
                STC_LOGE("unknown iotype"); //LCOV_EXCL_LINE
@@ -1013,8 +1795,16 @@ static void __interface_counter_update(stc_app_key_s *app_key,
            (app_value->classid == STC_TOTAL_WIFI_CLASSID &&
             context->counter->iftype == STC_IFACE_WIFI) ||
            (app_value->classid == STC_TOTAL_BLUETOOTH_CLASSID &&
-            context->counter->iftype == STC_IFACE_BLUETOOTH))
-               __app_counter_update(app_key, app_value, context);
+            context->counter->iftype == STC_IFACE_BLUETOOTH) ||
+               (app_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_WIFI) ||
+               (app_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_BLUETOOTH) ||
+               (app_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_USB) ||
+               (app_value->classid == STC_TETHERING_APP_CLASSID &&
+                context->counter->iftype == STC_IFACE_P2P))
+                __app_counter_update(app_key, app_value, context);
 }
 
 
@@ -1026,7 +1816,8 @@ static gboolean __apps_counter_update_foreach_classid(gpointer key,
        stc_app_value_s *app_value = (stc_app_value_s *)value;
        classid_bytes_context_s *context = (classid_bytes_context_s *)data;
 
-       if (context->counter->intend != NFACCT_COUNTER)
+       if (context->counter->intend != NFACCT_COUNTER &&
+                       context->counter->intend != NFACCT_TETH_COUNTER)
                goto try_next_callback;
 
        __interface_counter_update(app_key, app_value, context);
@@ -1040,9 +1831,146 @@ try_next_callback:
        return FALSE;
 }
 
+static gboolean __reset_time_counter_foreach_rstn(gpointer key,
+                                                 gpointer value,
+                                                 gpointer data)
+{
+       stc_rstn_key_s *rstn_key = (stc_rstn_key_s *)key;
+       stc_rstn_value_s *rstn_value = (stc_rstn_value_s *)value;
+       reset_time_limits_context_s *context = (reset_time_limits_context_s *)data;
+       int i;
+       time_t now_month_start_ts;
+
+       if (rstn_value->month_start_date == 0) {
+               table_counters_info info;
+               memset(&info, 0, sizeof(table_counters_info));
+               table_counters_get_timestamps(rstn_value->restriction_id, &info);
+
+               if (info.month_start_date == 0)
+                       rstn_value->month_start_date = 1;
+               else
+                       rstn_value->month_start_date = info.month_start_date;
+               rstn_value->month_start_ts = info.month_start_ts;
+       }
+
+       now_month_start_ts =
+               stc_time_get_month_start(context->now,
+                                        rstn_value->month_start_date);
+
+       if (rstn_value->month_start_ts != now_month_start_ts) {
+               rstn_value->month_start_ts = now_month_start_ts;
+               context->month_start_ts = now_month_start_ts;
+               context->is_updated |= (1 << STC_RSTN_LIMIT_TYPE_MONTHLY);
+       }
+
+       if (context->is_updated) {
+               table_counters_info info;
+               memset(&info, 0, sizeof(table_counters_info));
+
+               info.restriction_id = rstn_value->restriction_id;
+               info.month_start_date = rstn_value->month_start_date;
+               info.month_start_ts = rstn_value->month_start_ts;
+               info.week_start_ts = context->week_start_ts;
+               info.day_start_ts = context->day_start_ts;
+
+               table_counters_update_timestamps(&info);
+       }
+
+       for (i = STC_RSTN_LIMIT_TYPE_MONTHLY; i < STC_RSTN_LIMIT_TYPE_MAX; i++) {
+
+               if ((context->is_updated) & (1 << i)) {
+                       /* reset limit */
+                       rstn_value->counter[i] = 0;
+
+                       if (rstn_value->limit_exceeded & (1 << i)) {
+                               /* remove iptables rule */
+                               char *default_ifname = stc_default_connection_get_ifname();
+                               struct nfacct_rule counter;
+                               stc_s *stc = stc_get_manager();
+                               if (stc == NULL) {
+                                       STC_LOGE("Can't get stc data");
+                                       g_free(default_ifname);
+                                       goto try_next_callback;
+                               }
+
+                               if (!stc->carg) {
+                                       stc->carg = MALLOC0(counter_arg_s, 1);
+                                       if (stc->carg == NULL) {
+                                               g_free(default_ifname);
+                                               goto try_next_callback;
+                                       }
+
+                                       stc->carg->sock =
+                                               stc_monitor_get_counter_socket();
+                               }
+
+                               counter.carg = stc->carg;
+                               counter.classid = rstn_value->classid;
+                               counter.intend = NFACCT_BLOCK;
+                               counter.iftype = rstn_key->iftype;
+                               g_strlcpy(counter.ifname, default_ifname,
+                                         MAX_IFACE_LENGTH);
+
+                               g_free(default_ifname);
+
+                               /* iptables rule */
+                               __del_iptables_in(&counter);
+                               __del_iptables_out(&counter);
+
+                               /* ip6tables rule */
+                               __del_ip6tables_in(&counter);
+                               __del_ip6tables_out(&counter);
+
+                               rstn_value->rstn_state = STC_RSTN_STATE_DEACTIVATED;
+                               rstn_value->limit_exceeded &= ~(1 << i);
+                               rstn_value->limit_notified &= ~(1 << i);
+                       }
+               }
+       }
+
+try_next_callback:
+       return FALSE;
+}
+
+static void __reset_time_counters_if_required(void)
+{
+       reset_time_limits_context_s context;
+
+       if (g_system == NULL) {
+               STC_LOGE("stc monitor not initialized!");
+               return;
+       }
+
+       context.now = time(NULL);
+       context.week_start_ts = stc_time_get_week_start(context.now);
+       context.day_start_ts = stc_time_get_day_start(context.now);
+       context.is_updated = 0;
+
+       if (g_system->last_week_ts != context.week_start_ts) {
+               g_system->last_week_ts = context.week_start_ts;
+               context.is_updated |= (1 << STC_RSTN_LIMIT_TYPE_WEEKLY);
+       }
+
+       if (g_system->last_day_ts != context.day_start_ts) {
+               g_system->last_day_ts = context.day_start_ts;
+               context.is_updated |= (1 << STC_RSTN_LIMIT_TYPE_DAILY);
+       }
+
+       if (g_system->rstns) {
+               g_tree_foreach(g_system->rstns,
+                              __reset_time_counter_foreach_rstn,
+                              &context);
+               if (context.is_updated)
+                       STC_LOGD("Counter reset completed month_start [%ld], week_start [%ld], day_start [%ld]",
+                                context.month_start_ts, g_system->last_week_ts, g_system->last_day_ts);
+       }
+}
+
 static void __fill_nfacct_result(char *cnt_name, int64_t bytes,
                                 struct counter_arg *carg)
 {
+       __reset_time_counters_if_required();
+
        struct nfacct_rule counter = {
                .carg = carg,
                .name = {0},
@@ -1053,21 +1981,19 @@ static void __fill_nfacct_result(char *cnt_name, int64_t bytes,
        classid_bytes_context_s context = {
                .counter = &counter,
                .bytes = bytes,
-               .data_limit_reached = FALSE,
+               .data_limit_exceeded = FALSE,
        };
 
-       if (STC_DEBUG_LOG)
-               STC_LOGD("cnt_name %s", cnt_name); //LCOV_EXCL_LINE
-
        if (!recreate_counter_by_name(cnt_name, &counter)) {
                STC_LOGE("Can't parse counter name %s", cnt_name); //LCOV_EXCL_LINE
                return; //LCOV_EXCL_LINE
        }
 
-       STC_LOGI("classid %lu, iftype %u, iotype %d, intend %d, ifname %s, bytes %lld",
-                context.counter->classid, context.counter->iftype,
-                context.counter->iotype, context.counter->intend,
-                context.counter->ifname, context.bytes);
+       if (STC_DEBUG_LOG)
+               STC_LOGI("classid %u, iftype %u, iotype %d, intend %d, ifname %s, bytes %lld",
+                       context.counter->classid, context.counter->iftype,
+                       context.counter->iotype, context.counter->intend,
+                       context.counter->ifname, context.bytes);
 
        if (g_system->rstns)
                g_tree_foreach(g_system->rstns,
@@ -1154,7 +2080,7 @@ static gboolean __process_contr_reply(GIOChannel *source,
                /* G_IO_ERR/G_IO_HUP/G_IO_NVAL received */
 
                STC_LOGE("Counter socket received G_IO event, closing socket." //LCOV_EXCL_LINE
-                        "G_IO_ERR [%d], G_IO_HUP [%d], G_IO_NVAL [%s]",
+                        "G_IO_ERR [%u], G_IO_HUP [%u], G_IO_NVAL [%u]",
                         (condition & G_IO_ERR), (condition & G_IO_HUP),
                         (condition & G_IO_NVAL));
                __close_and_reopen_contr_sock(g_system); //LCOV_EXCL_LINE
@@ -1178,6 +2104,8 @@ static gboolean __process_contr_reply(GIOChannel *source,
                goto out;
 
        stc->carg->ans_len = ret;
+       stc->carg->last_run_time = time(NULL);
+
        __process_network_counter(ans, stc->carg);
 
        g_idle_add(__flush_apps_stats_to_database, NULL);
@@ -1212,7 +2140,9 @@ static gboolean __update_contr_cb(void *user_data)
        /* we need to continue the timer */
        return TRUE;
 }
-#if 0
+
+/*
+//LCOV_EXCL_START
 static gboolean __rstn_tree_foreach_print(gpointer key, gpointer value,
                                          gpointer data)
 {
@@ -1227,7 +2157,9 @@ static void __rstn_tree_printall(void)
 {
        g_tree_foreach(g_system->rstns, __rstn_tree_foreach_print, NULL);
 }
-#endif
+//LCOV_EXCL_STOP
+*/
+
 static stc_rstn_value_s * __rstn_lookup(GTree *rstns_tree,
                                        const stc_rstn_key_s *key)
 {
@@ -1246,11 +2178,8 @@ static gboolean __remove_restriction(gpointer key, gpointer value,
        stc_rstn_key_s *rstn_key = (stc_rstn_key_s *)key;
        stc_rstn_value_s *rstn_value = (stc_rstn_value_s *)value;
 
-       /* rstn rule is already removed */
-       if (rstn_value->rst_state == STC_RESTRICTION_REMOVED)
-               return FALSE;
-
        __process_restriction(RST_UNSET, rstn_key, rstn_value, data);
+       __process_tethering_restriction(RST_UNSET, rstn_key, rstn_value, data);
        __print_rstn(rstn_key, rstn_value);
        return FALSE;
 }
@@ -1262,13 +2191,16 @@ static gboolean __add_restriction_debug(gpointer key, gpointer value,
        stc_rstn_value_s *rstn_value = (stc_rstn_value_s *)value;
 
        /* rstn rule is activated */
-       if (rstn_value->rst_state == STC_RESTRICTION_ACTIVATED)
+       if (rstn_value->rstn_state == STC_RSTN_STATE_ACTIVATED)
                return FALSE;
 
-       if (rstn_value->rst_state == STC_RESTRICTION_EXCLUDED)
+       if (rstn_value->rstn_type == STC_RSTN_TYPE_ACCEPT) {
                __process_restriction(RST_EXCLUDE, rstn_key, rstn_value, data);
-       else
+               __process_tethering_restriction(RST_EXCLUDE, rstn_key, rstn_value, data);
+       } else {
                __process_restriction(RST_SET, rstn_key, rstn_value, data);
+               __process_tethering_restriction(RST_SET, rstn_key, rstn_value, data);
+       }
 
        __print_rstn(rstn_key, rstn_value);
 
@@ -1282,13 +2214,16 @@ static gboolean __add_restriction(gpointer key, gpointer value, gpointer data)
        stc_rstn_value_s *rstn_value = (stc_rstn_value_s *)value;
 
        /* rstn rule is activated */
-       if (rstn_value->rst_state == STC_RESTRICTION_ACTIVATED)
+       if (rstn_value->rstn_state == STC_RSTN_STATE_ACTIVATED)
                return FALSE;
 
-       if (rstn_value->rst_state == STC_RESTRICTION_EXCLUDED)
+       if (rstn_value->rstn_type == STC_RSTN_TYPE_ACCEPT) {
                __process_restriction(RST_EXCLUDE, rstn_key, rstn_value, data);
-       else
+               __process_tethering_restriction(RST_EXCLUDE, rstn_key, rstn_value, data);
+       } else {
                __process_restriction(RST_SET, rstn_key, rstn_value, data);
+               __process_tethering_restriction(RST_SET, rstn_key, rstn_value, data);
+       }
 
        return FALSE;
 }
@@ -1306,10 +2241,9 @@ static stc_error_e __rstn_tree_remove(stc_rstn_key_s *key)
                return STC_ERROR_NO_DATA; //LCOV_EXCL_LINE
        }
 
-       __remove_restriction(key, lookup_value, NULL);
-
        /* remove counter also */
        table_counters_delete(lookup_value->restriction_id);
+       __remove_restriction(key, lookup_value, NULL);
 
        if (!g_tree_remove(g_system->rstns, key)) {
                STC_LOGD("key not found"); //LCOV_EXCL_LINE
@@ -1322,42 +2256,52 @@ static stc_error_e __rstn_tree_remove(stc_rstn_key_s *key)
 static stc_error_e __rstn_tree_add(stc_rstn_key_s *key,
                                   stc_rstn_value_s *value, gboolean debug)
 {
+       stc_rstn_key_s *rstn_key;
        stc_rstn_value_s *rstn_value;
 
        ret_value_msg_if(g_system == NULL, STC_ERROR_FAIL, "stc monitor not initialized!");
 
        rstn_value = __rstn_lookup(g_system->rstns, key);
-       if (!rstn_value) {
-               stc_rstn_key_s *rstn_key = MALLOC0(stc_rstn_key_s, 1);
-               if (!rstn_key) {
-                       STC_LOGE("rstn_key allocation failed"); //LCOV_EXCL_LINE
-                       return STC_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
-               }
-
-               rstn_value = MALLOC0(stc_rstn_value_s, 1);
-               if (!rstn_value) {
-                       STC_LOGE("rstn_value allocation failed"); //LCOV_EXCL_LINE
-                       FREE(rstn_key); //LCOV_EXCL_LINE
-                       return STC_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
-               }
+       if (rstn_value)
+               __rstn_tree_remove(key);
 
-               rstn_key->app_id = g_strdup(key->app_id);
-               rstn_key->ifname = g_strdup(key->ifname);
-               rstn_key->subscriber_id = g_strdup(key->subscriber_id);
-               rstn_key->iftype = key->iftype;
-               rstn_key->roaming = key->roaming;
+       rstn_key = MALLOC0(stc_rstn_key_s, 1);
+       if (!rstn_key) {
+               STC_LOGE("rstn_key allocation failed"); //LCOV_EXCL_LINE
+               return STC_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+       }
 
-               g_tree_insert(g_system->rstns, rstn_key, rstn_value);
+       rstn_value = MALLOC0(stc_rstn_value_s, 1);
+       if (!rstn_value) {
+               STC_LOGE("rstn_value allocation failed"); //LCOV_EXCL_LINE
+               FREE(rstn_key); //LCOV_EXCL_LINE
+               return STC_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
        }
 
+       rstn_key->app_id = g_strdup(key->app_id);
+       rstn_key->ifname = g_strdup(key->ifname);
+       rstn_key->mac = g_strdup(key->mac);
+       rstn_key->subscriber_id = g_strdup(key->subscriber_id);
+       rstn_key->iftype = key->iftype;
+       rstn_key->roaming = key->roaming;
+
+       g_tree_insert(g_system->rstns, rstn_key, rstn_value);
+
        rstn_value->restriction_id = value->restriction_id;
-       rstn_value->rst_state = value->rst_state;
+       rstn_value->rstn_state = value->rstn_state;
+       rstn_value->rstn_type = value->rstn_type;
        rstn_value->classid = value->classid;
-       rstn_value->data_limit = value->data_limit;
-       rstn_value->data_warn_limit = value->data_warn_limit;
-       rstn_value->data_counter = 0;
-       rstn_value->warn_limit_crossed_notified = FALSE;
-       rstn_value->rstn_limit_crossed_notified = FALSE;
+
+       int i;
+       for (i = 0; i < STC_RSTN_LIMIT_TYPE_MAX; i++) {
+               rstn_value->limit[i] = value->limit[i];
+               rstn_value->counter[i] = 0;
+       }
+
+       rstn_value->limit_exceeded = 0;
+       rstn_value->limit_notified = 0;
+       rstn_value->month_start_date = value->month_start_date;
+       rstn_value->month_start_ts = value->month_start_ts;
 
        if (debug == TRUE)
                __add_restriction_debug(key, rstn_value, NULL);
@@ -1385,16 +2329,20 @@ static stc_cb_ret_e __insert_restriction_cb(const table_restrictions_info *info,
        key.iftype = info->iftype;
        key.roaming = info->roaming;
 
-       value.rst_state = info->rst_state;
+       value.rstn_type = info->rstn_type;
+       value.rstn_state = STC_RSTN_STATE_UNKNOWN;
        value.restriction_id = info->restriction_id;
 
-       if (value.rst_state != STC_RESTRICTION_EXCLUDED && info->app_id)
+       if (info->app_id)
                value.classid = get_classid_by_app_id(info->app_id, TRUE);
        else
                value.classid = STC_UNKNOWN_CLASSID;
 
-       value.data_limit = info->data_limit;
-       value.data_warn_limit = info->data_warn_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_DATA] = info->data_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_DATA_WARN] = info->data_warn_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_MONTHLY] = info->monthly_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_WEEKLY] = info->weekly_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_DAILY] = info->daily_limit;
 
        if (__rstn_tree_add(&key, &value, FALSE) != STC_ERROR_NONE)
                ret = STC_CANCEL;
@@ -1408,7 +2356,8 @@ static stc_cb_ret_e __insert_restriction_cb(const table_restrictions_info *info,
 static void __fill_restritions_list(void)
 {
        table_restrictions_foreach(__insert_restriction_cb, NULL);
-       //__rstn_tree_printall();
+
+       /* __rstn_tree_printall(); */
 }
 
 static gboolean __add_rstn_foreach_application(gpointer key,
@@ -1428,14 +2377,17 @@ static gboolean __add_rstn_foreach_application(gpointer key,
                goto out;
 
        /* rstn rule is already applied */
-       if (rstn_value->rst_state == STC_RESTRICTION_ACTIVATED)
+       if (rstn_value->rstn_state == STC_RSTN_STATE_ACTIVATED)
                goto out;
 
        /* add restriction to system */
-       if (rstn_value->rst_state == STC_RESTRICTION_EXCLUDED)
-               __process_restriction(RST_EXCLUDE, rstn_key, rstn_value, data);
-       else
-               __process_restriction(RST_SET, rstn_key, rstn_value, data);
+       if (rstn_value->rstn_type == STC_RSTN_TYPE_ACCEPT) {
+               __process_restriction(RST_EXCLUDE, rstn_key, rstn_value, NULL);
+               __process_tethering_restriction(RST_EXCLUDE, rstn_key, rstn_value, NULL);
+       } else {
+               __process_restriction(RST_SET, rstn_key, rstn_value, NULL);
+               __process_tethering_restriction(RST_SET, rstn_key, rstn_value, NULL);
+       }
 
        __print_rstn(rstn_key, rstn_value);
 out:
@@ -1474,33 +2426,6 @@ static void __add_application_by_interface(const char *app_id)
        FREE(app_key.app_id);
 }
 
-static int __vconf_get_int(const char *key, int *value)
-{
-       int ret = 0;
-
-       ret = vconf_get_int(key, value);
-       if (ret != VCONF_OK) {
-               STC_LOGE("Failed to get vconfkey [%s] value", key); //LCOV_EXCL_LINE
-               return -1; //LCOV_EXCL_LINE
-       }
-
-       return 0;
-}
-
-//LCOV_EXCL_START
-static int __vconf_set_int(const char *key, int value)
-{
-       int ret = 0;
-
-       ret = vconf_set_int(key, value);
-       if (ret != VCONF_OK) {
-               STC_LOGE("Failed to set vconfkey [%s] value", key); //LCOV_EXCL_LINE
-               return -1; //LCOV_EXCL_LINE
-       }
-
-       return 0;
-}
-
 static guint __get_background_state(void)
 {
        return g_system->background_state;;
@@ -1549,75 +2474,10 @@ static stc_error_e __process_update_background(void)
 }
 //LCOV_EXCL_STOP
 
-#if 0
-static void __excn_hash_foreach_print(gpointer key, gpointer value,
-                                         gpointer data)
-{
-       const char *process_name = key;
-       const char *exe_type = value;
-
-       STC_LOGI("excn info => process_name [%s] exe_type [%s]",
-               process_name, exe_type);
-}
-
-static void __excn_hash_printall(void)
-{
-       g_hash_table_foreach(g_system->excns_hash,
-               __excn_hash_foreach_print, NULL);
-}
-#endif
-
-//LCOV_EXCL_START
-static gboolean __remove_exception_app(gpointer key, gpointer value,
-                                       gpointer data)
-{
-       const char *exe_type = value;
-
-       if (g_strcmp0(exe_type, EXE_TYPE_APPLICATION) == 0)
-               return TRUE;
-
-       return FALSE;
-}
-//LCOV_EXCL_STOP
-
-static void __remove_exception_appall(void)
-{
-       g_hash_table_foreach_remove(g_system->excns_hash, //LCOV_EXCL_LINE
-               __remove_exception_app, NULL);
-}
-
-static stc_cb_ret_e __insert_exception_cb(const stc_exceptions_info *info,
-                                           void *user_data)
-{
-       stc_cb_ret_e ret = STC_CONTINUE;
-
-       if (g_hash_table_insert(g_system->excns_hash,
-                       g_strdup(info->process_name),
-                       g_strdup(info->exe_type)) != TRUE)
-               ret = STC_CANCEL; //LCOV_EXCL_LINE
-
-       return ret;
-}
-
 static void __fill_exceptions_list(void)
 {
-       table_exceptions_foreach(__insert_exception_cb, NULL);
-       pkginfo_exceptions_foreach(__insert_exception_cb, NULL);
-
-       /* __excn_hash_printall(); */
-}
-
-//LCOV_EXCL_START
-static gboolean __update_exceptions_app_list(void *user_data)
-{
-       __remove_exception_appall();
-       pkginfo_exceptions_foreach(__insert_exception_cb, NULL);
-
-       /* __excn_hash_printall(); */
-
-       return TRUE;
+       stc_plugin_fill_exception_list();
 }
-//LCOV_EXCL_STOP
 
 stc_error_e stc_monitor_init(void)
 {
@@ -1641,9 +2501,6 @@ stc_error_e stc_monitor_init(void)
                                        __rstns_tree_key_free,
                                        __rstns_tree_value_free);
 
-       system->excns_hash = g_hash_table_new_full(g_str_hash,
-                                       g_str_equal, g_free, g_free);
-
        /* create netlink socket for updating kernel counters */
        system->contr_sock = create_netlink(NETLINK_NETFILTER, 0);
        if (system->contr_sock < 0) {
@@ -1666,6 +2523,7 @@ stc_error_e stc_monitor_init(void)
        __add_application_by_interface(STC_TOTAL_BLUETOOTH);
        __add_application_by_interface(STC_TOTAL_IPV4);
        __add_application_by_interface(STC_TOTAL_IPV6);
+       __add_application_by_interface(STC_TOTAL_TETHERING);
 
        /* creating restriction rules tree */
        __update_contr_cb(NULL);
@@ -1686,10 +2544,6 @@ stc_error_e stc_monitor_init(void)
        __fill_exceptions_list();
        __fill_restritions_list();
 
-       g_system->excns_timer_id = g_timeout_add_seconds(EXCNS_TIMER_INTERVAL,
-                                                        __update_exceptions_app_list,
-                                                        NULL);
-
        return STC_ERROR_NONE;
 }
 
@@ -1706,12 +2560,6 @@ stc_error_e stc_monitor_deinit(void)
                g_system->contr_timer_id = 0;
        }
 
-       /* remove exceptions app list update timer */
-       if (g_system->excns_timer_id > 0) {
-               g_source_remove(g_system->excns_timer_id);
-               g_system->excns_timer_id = 0;
-       }
-
        /* destroy monitored application tree */
        g_tree_destroy(g_system->apps);
        g_system->apps = NULL;
@@ -1720,16 +2568,12 @@ stc_error_e stc_monitor_deinit(void)
        g_tree_destroy(g_system->rstns);
        g_system->rstns = NULL;
 
-       /* destroy exception hash table */
-       g_hash_table_destroy(g_system->excns_hash);
-       g_system->excns_hash = NULL;
-
        FREE(g_system);
 
        return STC_ERROR_NONE;
 }
 
-stc_error_e stc_monitor_application_add(const stc_app_key_s app_key,
+API stc_error_e stc_monitor_application_add(const stc_app_key_s app_key,
                                        const stc_app_value_s app_value)
 {
        stc_error_e ret = STC_ERROR_NONE;
@@ -1740,10 +2584,8 @@ stc_error_e stc_monitor_application_add(const stc_app_key_s app_key,
        ret_value_msg_if(g_system == NULL, STC_ERROR_FAIL, "stc monitor not initialized!");
 
        lookup = __application_lookup(g_system->apps, &app_key);
-       if (lookup) {
-               STC_LOGD("app_key already present"); //LCOV_EXCL_LINE
+       if (lookup)
                return STC_ERROR_NONE; //LCOV_EXCL_LINE
-       }
 
        key = MALLOC0(stc_app_key_s, 1);
        if (!key) {
@@ -1764,6 +2606,7 @@ stc_error_e stc_monitor_application_add(const stc_app_key_s app_key,
        value->type = app_value.type;
        value->data_usage.in_bytes = app_value.data_usage.in_bytes;
        value->data_usage.out_bytes = app_value.data_usage.out_bytes;
+       g_strlcpy(value->mac, app_value.mac, MAC_ADDRESS_LEN);
 
        value->processes = g_tree_new_full(__processes_tree_key_compare, NULL,
                                           __processes_tree_key_free,
@@ -1772,6 +2615,11 @@ stc_error_e stc_monitor_application_add(const stc_app_key_s app_key,
        /* create cgroup and update classid */
        value->classid = get_classid_by_app_id(app_key.app_id, TRUE);
 
+       /* update classid for tethering station based on its mac address */
+       if (g_str_has_suffix(app_key.app_id, STC_TETHERING_APP_SUFFIX) &&
+                               value->classid != STC_TETHERING_APP_CLASSID)
+               stc_plugin_tether_set_station_classid(value->mac, value->classid);
+
        g_tree_insert(g_system->apps, key, value);
 
        /* add nfacct rule for this classid */
@@ -1781,7 +2629,37 @@ stc_error_e stc_monitor_application_add(const stc_app_key_s app_key,
        return ret;
 }
 
-stc_error_e stc_monitor_process_add(const stc_app_key_s app_key,
+API stc_error_e stc_monitor_application_remove(const stc_app_key_s app_key)
+{
+       stc_error_e ret = STC_ERROR_NONE;
+       stc_app_value_s *app_lookup;
+
+       ret_value_msg_if(g_system == NULL, STC_ERROR_FAIL, "stc monitor not initialized!");
+
+       app_lookup = __application_lookup(g_system->apps, &app_key);
+       if (!app_lookup) {
+               if (STC_DEBUG_LOG)
+                       STC_LOGD("app_key not found"); //LCOV_EXCL_LINE
+               return STC_ERROR_FAIL; //LCOV_EXCL_LINE
+       }
+
+       /* remove nfacct rule for this classid */
+       __remove_application_monitor((gpointer) &app_key, app_lookup,
+                                    stc_get_default_connection());
+
+       /* remove ristrictions if any */
+       __remove_rstns_for_application(app_key.app_id);
+
+       /* remove app_key from the stc-manager */
+       if (!g_tree_remove(g_system->apps, &app_key)) {
+               ret = STC_ERROR_NO_DATA;
+               STC_LOGE("key not found");
+       }
+
+       return ret;
+}
+
+API stc_error_e stc_monitor_process_add(const stc_app_key_s app_key,
                                    const stc_process_key_s proc_key,
                                    const stc_process_value_s proc_value)
 {
@@ -1795,15 +2673,14 @@ stc_error_e stc_monitor_process_add(const stc_app_key_s app_key,
 
        app_lookup = __application_lookup(g_system->apps, &app_key);
        if (!app_lookup) {
-               STC_LOGD("app_key not found"); //LCOV_EXCL_LINE
+               if (STC_DEBUG_LOG)
+                       STC_LOGD("app_key not found"); //LCOV_EXCL_LINE
                return STC_ERROR_FAIL; //LCOV_EXCL_LINE
        }
 
        proc_lookup = __process_lookup(app_lookup->processes, &proc_key);
-       if (proc_lookup) {
-               STC_LOGD("proc_key already present"); //LCOV_EXCL_LINE
+       if (proc_lookup)
                return STC_ERROR_NONE; //LCOV_EXCL_LINE
-       }
 
        key = MALLOC0(stc_process_key_s, 1);
        if (!key) {
@@ -1827,13 +2704,14 @@ stc_error_e stc_monitor_process_add(const stc_app_key_s app_key,
        /* add pid to application cgroup */
        place_pids_to_net_cgroup(proc_key.pid, app_key.app_id);
 
-       if (STC_DEBUG_LOG)
-               __apps_tree_printall(); //LCOV_EXCL_LINE
+       /*
+       __apps_tree_printall(); //LCOV_EXCL_LINE
+       */
 
        return ret;
 }
 
-stc_error_e stc_monitor_process_remove(pid_t pid)
+API stc_error_e stc_monitor_process_remove(pid_t pid)
 {
        stc_error_e ret = STC_ERROR_NONE;
        stc_process_key_s proc_key = {
@@ -1854,14 +2732,15 @@ stc_error_e stc_monitor_process_remove(pid_t pid)
        if (context.entry_removed)
                __application_remove_if_empty(context.app_key);
 
-       if (STC_DEBUG_LOG)
-               __apps_tree_printall(); //LCOV_EXCL_LINE
+       /*
+       __apps_tree_printall(); //LCOV_EXCL_LINE
+       */
 
        return ret;
 }
 
 //LCOV_EXCL_START
-stc_error_e stc_monitor_process_update_ground(const stc_app_key_s app_key,
+API stc_error_e stc_monitor_process_update_ground(const stc_app_key_s app_key,
                                              const stc_process_key_s proc_key,
                                              stc_app_state_e ground)
 {
@@ -1918,8 +2797,11 @@ void stc_monitor_update_rstn_by_default_connection(void *data)
 
        FREE(old_connection.path);
        FREE(old_connection.ifname);
+       FREE(old_connection.tether_iface.ifname);
        old_connection.type = 0;
        old_connection.roaming = 0;
+       old_connection.tether_state = FALSE;
+       old_connection.tether_iface.type = 0;
 
        if (new_connection != NULL && new_connection->path != NULL) {
                if (g_system->apps)
@@ -1933,8 +2815,11 @@ void stc_monitor_update_rstn_by_default_connection(void *data)
 
                old_connection.path = g_strdup(new_connection->path);
                old_connection.ifname = g_strdup(new_connection->ifname);
+               old_connection.tether_iface.ifname = g_strdup(new_connection->tether_iface.ifname);
                old_connection.type = new_connection->type;
                old_connection.roaming = new_connection->roaming;
+               old_connection.tether_state = new_connection->tether_state;
+               old_connection.tether_iface.type = new_connection->tether_iface.type;
        }
 }
 
@@ -1950,14 +2835,16 @@ 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.mac = g_strdup(info->mac);
        key.subscriber_id = g_strdup(info->subscriber_id);
        key.iftype = info->iftype;
        key.roaming = info->roaming;
 
-       value.rst_state = info->rst_state;
+       value.rstn_type = info->rstn_type;
+       value.rstn_state = STC_RSTN_STATE_UNKNOWN;
        value.restriction_id = info->restriction_id;
 
-       if (value.rst_state != STC_RESTRICTION_EXCLUDED && info->app_id)
+       if (info->app_id)
                value.classid = get_classid_by_app_id(info->app_id, TRUE);
        else
                value.classid = STC_UNKNOWN_CLASSID;
@@ -1968,13 +2855,20 @@ stc_error_e stc_monitor_rstns_tree_add(const table_restrictions_info *info)
                __process_update_background(); //LCOV_EXCL_LINE
        }
 
-       value.data_limit = info->data_limit;
-       value.data_warn_limit = info->data_warn_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_DATA] = info->data_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_DATA_WARN] = info->data_warn_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_MONTHLY] = info->monthly_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_WEEKLY] = info->weekly_limit;
+       value.limit[STC_RSTN_LIMIT_TYPE_DAILY] = info->daily_limit;
+       value.month_start_date = info->month_start_date;
+       value.month_start_ts = stc_time_get_month_start(time(NULL),
+                                                                               info->month_start_date);
 
        ret = __rstn_tree_add(&key, &value, TRUE);
 
        FREE(key.app_id);
        FREE(key.ifname);
+       FREE(key.mac);
        FREE(key.subscriber_id);
        return ret;
 }
@@ -2005,17 +2899,9 @@ stc_error_e stc_monitor_rstns_tree_remove(const table_restrictions_info *info)
        return ret;
 }
 
-stc_error_e stc_monitor_check_excn_by_cmdline(char *cmdline)
+API stc_error_e stc_monitor_check_excn_by_cmdline(char *cmdline)
 {
-       ret_value_msg_if(g_system == NULL, STC_ERROR_FAIL, "stc monitor not initialized!");
-
-       char *exe_type = NULL;
-
-       exe_type = g_hash_table_lookup(g_system->excns_hash, cmdline);
-       if (!exe_type)
-               return STC_ERROR_NO_DATA;
-
-       return STC_ERROR_NONE;
+       return stc_plugin_check_exception_by_cmdline(cmdline);
 }
 
 int stc_monitor_get_counter_socket(void)