#include "table-statistics.h"
#include "table-counters.h"
#include "stc-monitor.h"
+#include "stc-time.h"
#include "stc-manager-plugin-appstatus.h"
#include "stc-manager-plugin-exception.h"
+#define GRANULARITY 10
#define MAX_INT_LENGTH 128
#define VCONFKEY_STC_BACKGROUND_STATE "db/stc/background_state"
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;
stc_process_key_s *proc_key;
gboolean entry_removed;
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;
STC_LOGI("rstn info => rstn_id [%llu], "
"app_id [%s], classid [%u], ifname [%s], "
"iftype [%d], rstn_state [%d], rstn_type [%d], "
- "limit [ (%lld) bytes], "
+ "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->rstn_state, rstn_value->rstn_type,
- rstn_value->data_limit,
- rstn_value->data_warn_limit,
- rstn_value->data_counter,
+ 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);
}
__del_ip6tables_out(&counter);
}
+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_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;
if (rstn_value->classid <= STC_UNKNOWN_CLASSID)
return;
- effective_data_limit = rstn_value->data_limit;
- effective_data_warn_limit = rstn_value->data_warn_limit;
-
- if (rstn_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));
- table_counters_get(rstn_value->restriction_id, &info);
-
- effective_data_limit -= info.data_counter;
- effective_data_warn_limit -= info.data_counter;
-
- if (effective_data_limit < 0) {
- effective_data_limit = 0; //LCOV_EXCL_LINE
- rstn_value->data_limit_reached = TRUE; //LCOV_EXCL_LINE
+ 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.week_start_ts = g_system->last_day_ts;
+
+ memset(&rule, 0, sizeof(table_statistics_select_rule));
+ rule.from = rstn_value->month_start_ts;
+ time(¤t_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;
}
- if (effective_data_warn_limit < 0)
- effective_data_warn_limit = 0; //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];
- STC_LOGD("datausage [%lld] bytes", info.data_counter);
- }
+ if (effective_limit[i] < 0)
+ rstn_value->limit_exceeded |= (1 << i);
+ }
+ }
- 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);
+ STC_LOGD("rstn_id [%llu], datausage [%llu] bytes",
+ rstn_value->restriction_id, info.data_counter);
- switch (rstn_type) {
- case RST_SET:
- if (effective_data_limit <= 0)
- __add_iptables_rule(rstn_value->classid, NFACCT_BLOCK,
- rstn_key->iftype);
+ 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);
+ }
rstn_value->rstn_state = STC_RSTN_STATE_ACTIVATED;
- rstn_value->data_limit_reached = FALSE;
- break;
+ }
+ 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->data_limit_reached = TRUE;
+ rstn_value->limit_exceeded = 0;
+ rstn_value->limit_notified = 0;
break;
case RST_UNSET:
+ {
+ int i;
+
if (rstn_value->classid == STC_TETHERING_APP_CLASSID)
__del_iptables_rule(rstn_value->classid, NFACCT_BLOCK,
rstn_key->iftype);
rstn_key->iftype);
rstn_value->rstn_state = STC_RSTN_STATE_DEACTIVATED;
- rstn_value->data_limit_reached = FALSE;
- break;
+ 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
}
return STC_ERROR_NONE;
}
+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)
+{
+ gboolean rv;
+ char iftype[MAX_INT_LENGTH];
+ char byte[MAX_INT_LENGTH];
+ const char *signal_name;
+ stc_s *stc = (stc_s *)stc_get_manager();
+
+ if (stc == NULL) {
+ STC_LOGE("Failed to get stc data");
+ return;
+ }
+
+ switch (limit_type) {
+ case STC_RSTN_LIMIT_TYPE_DATA_WARN:
+ {
+ signal_name = "WarnThresholdCrossed";
+
+ snprintf(iftype, MAX_INT_LENGTH, "%d", rstn_key->iftype);
+ snprintf(byte, MAX_INT_LENGTH, "%lld", rstn_value->limit[limit_type]);
+ stc_plugin_appstatus_send_warn_message("warn threshold crossed",
+ "warning_noti",
+ rstn_key->app_id,
+ iftype, byte);
+ }
+ 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";
+
+ /* block immediately */
+ context->counter->intend = NFACCT_BLOCK;
+ __del_iptables_in(context->counter);
+ __del_iptables_out(context->counter);
+ __add_iptables_in(context->counter);
+ __add_iptables_out(context->counter);
+
+ __del_ip6tables_in(context->counter);
+ __del_ip6tables_out(context->counter);
+ __add_ip6tables_in(context->counter);
+ __add_ip6tables_out(context->counter);
+ context->counter->intend = NFACCT_COUNTER;
+
+ rstn_value->limit_exceeded |= (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_restriction_message("restriction threshold crossed",
+ "restriction_noti",
+ rstn_key->app_id,
+ iftype, byte);
+ }
+ break;
+ default:
+ break;
+ }
+
+ /* 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);
+}
+
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:
- 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_plugin_appstatus_send_warn_message("warn threshold crossed",
- "warning_noti",
- rstn_key->app_id,
- iftype, byte);
+ 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;
}
- if (rstn_value->data_counter >= rstn_value->data_limit &&
- rstn_value->rstn_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");
-
- /* block immediately */
- context->counter->intend = NFACCT_BLOCK;
- __del_iptables_in(context->counter);
- __del_iptables_out(context->counter);
- __add_iptables_in(context->counter);
- __add_iptables_out(context->counter);
-
- __del_ip6tables_in(context->counter);
- __del_ip6tables_out(context->counter);
- __add_ip6tables_in(context->counter);
- __add_ip6tables_out(context->counter);
- context->counter->intend = NFACCT_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_plugin_appstatus_send_restriction_message("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;
if (context->counter->intend != NFACCT_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
}
static gboolean __flush_apps_stats_to_database(gpointer user_data)
{
time_t current_time = 0;
- time(¤t_time);
+ 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;
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);
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;
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},
classid_bytes_context_s context = {
.counter = &counter,
.bytes = bytes,
- .data_limit_reached = FALSE,
+ .data_limit_exceeded = FALSE,
};
if (!recreate_counter_by_name(cnt_name, &counter)) {
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);
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
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);
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;
__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);
projects / platform / core / connectivity / stc-manager.git / blobdiff