diff --git a/frameworks/js/napi/netstats/src/net_stats_service.cpp b/frameworks/js/napi/netstats/src/net_stats_service.cpp index 2af8ff1d5197e62060129635809301f524e38776..478da25329a5efc3d32f9cc4e652490f59dbdf02 100644 --- a/frameworks/js/napi/netstats/src/net_stats_service.cpp +++ b/frameworks/js/napi/netstats/src/net_stats_service.cpp @@ -1387,30 +1387,6 @@ void NetStatsService::UpdateCurActiviteSimChanged(int32_t simId, uint64_t ifInde } } -bool NetStatsService::IsSameStateInTwoMap(int32_t simId) -{ - auto ifIndexItem = simIdToIfIndexMap_.find(simId); - auto settingsItem = settingsTrafficMap_.find(simId); - if (ifIndexItem == simIdToIfIndexMap_.end() && - settingsItem == settingsTrafficMap_.end()) { - return true; - } - if (ifIndexItem != simIdToIfIndexMap_.end() && - settingsItem != settingsTrafficMap_.end()) { - return true; - } - return false; -} - -void NetStatsService::DeleteSimIdInTwoMap(int32_t simId) -{ - if (simIdToIfIndexMap_.find(simId) != simIdToIfIndexMap_.end() && - settingsTrafficMap_.find(simId) != settingsTrafficMap_.end()) { - simIdToIfIndexMap_.erase(simId); - settingsTrafficMap_.erase(simId); - } -} - void NetStatsService::AddSimIdInTwoMap(int32_t simId, uint64_t ifIndex) { NETMGR_LOG_I("AddSimIdInTwoMap. simId:%{public}d, ifIndex:%{public}" PRIu64, simId, ifIndex); diff --git a/services/netmanagernative/bpf/src/netsys.c b/services/netmanagernative/bpf/src/netsys.c index 49951b16b33da80b06572b7db70d1cd79f7cbace..b2e517d09bc06023480845dbbe45471c5ab7b782 100644 --- a/services/netmanagernative/bpf/src/netsys.c +++ b/services/netmanagernative/bpf/src/netsys.c @@ -300,20 +300,6 @@ static void process_traffic_notify(struct __sk_buff *skb, uint64_t ifindex) } } -static uint8_t is_need_discard(void) -{ - uint8_t wifi_type = 0; - uint8_t cellular_type = 1; - uint8_t *wifi_status = bpf_map_lookup_elem(&net_status_map, &wifi_type); - uint8_t *cellular_status = bpf_map_lookup_elem(&net_status_map, &cellular_type); - - if (wifi_status != NULL && *wifi_status == 0 && - cellular_status != NULL && *cellular_status == 0) { - return 1; - } - return 0; -} - SEC("socket/iface/stats") int socket_iface_stats(struct __sk_buff *skb) { @@ -325,10 +311,6 @@ int socket_iface_stats(struct __sk_buff *skb) return 1; } - if (is_need_discard() == 1) { - return 1; - } - uint64_t ifindex = skb->ifindex; iface_stats_value *value_if = bpf_map_lookup_elem(&iface_stats_map, &ifindex); if (value_if == NULL) { diff --git a/services/netstatsmanager/include/net_stats_service.h b/services/netstatsmanager/include/net_stats_service.h index 5310cdc384328d80e6a5cf7e94ba92ab80e9e836..61f7057e5225a1cd347fdd9956281759dc0e1e04 100644 --- a/services/netstatsmanager/include/net_stats_service.h +++ b/services/netstatsmanager/include/net_stats_service.h @@ -150,8 +150,6 @@ private: uint64_t &monthlyMarkAvailable, uint64_t &dailyMarkAvailable); int32_t UpdataSettingsdataFfrt(int32_t simId, uint8_t flag, uint64_t value); void ClearTrafficMapBySlotId(int32_t slotId, uint64_t ifIndex); - bool IsSameStateInTwoMap(int32_t simId); - void DeleteSimIdInTwoMap(int32_t simId); void AddSimIdInTwoMap(int32_t simId, uint64_t ifIndex); void PrintTrafficBpfMapInfo(int32_t slotId); void PrintTrafficSettingsMapInfo(int32_t simId);