Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 536a0363 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski
Browse files

remove qtaguid parsing 



This removes the legacy (and untested) xt_qtaguid
non-ebpf code path (ie. dead code).

Test: git grep 'QTAGUID_IFACE_STATS|QTAGUID_UID_STATS|parseIfaceStats|parseUidStats'
  finds nothing
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Change-Id: I922910238474f2cfb74eba19b219bc792ce4abc3
parent 98f0a11a

services/core/jni/com_android_server_net_NetworkStatsService.cpp

+3 −106
Original line number Original line Diff line number Diff line
@@ -38,9 +38,6 @@ using android::bpf::bpfGetIfaceStats; 




namespace android {

namespace android {





static const char* QTAGUID_IFACE_STATS = "/proc/net/xt_qtaguid/iface_stat_fmt";

static const char* QTAGUID_UID_STATS = "/proc/net/xt_qtaguid/stats";



// NOTE: keep these in sync with TrafficStats.java

// NOTE: keep these in sync with TrafficStats.java

static const uint64_t UNKNOWN = -1;

static const uint64_t UNKNOWN = -1;
@@ -72,86 +69,9 @@ static uint64_t getStatsType(Stats* stats, StatsType type) { 
    }

    }

}

}





static int parseIfaceStats(const char* iface, Stats* stats) {

    FILE *fp = fopen(QTAGUID_IFACE_STATS, "r");

    if (fp == NULL) {

        return -1;

    }



    char buffer[384];

    char cur_iface[32];

    bool foundTcp = false;

    uint64_t rxBytes, rxPackets, txBytes, txPackets, tcpRxPackets, tcpTxPackets;



    while (fgets(buffer, sizeof(buffer), fp) != NULL) {

        int matched = sscanf(buffer, "%31s %" SCNu64 " %" SCNu64 " %" SCNu64

                " %" SCNu64 " " "%*u %" SCNu64 " %*u %*u %*u %*u "

                "%*u %" SCNu64 " %*u %*u %*u %*u", cur_iface, &rxBytes,

                &rxPackets, &txBytes, &txPackets, &tcpRxPackets, &tcpTxPackets);

        if (matched >= 5) {

            if (matched == 7) {

                foundTcp = true;

            }

            if (!iface || !strcmp(iface, cur_iface)) {

                stats->rxBytes += rxBytes;

                stats->rxPackets += rxPackets;

                stats->txBytes += txBytes;

                stats->txPackets += txPackets;

                if (matched == 7) {

                    stats->tcpRxPackets += tcpRxPackets;

                    stats->tcpTxPackets += tcpTxPackets;

                }

            }

        }

    }



    if (!foundTcp) {

        stats->tcpRxPackets = UNKNOWN;

        stats->tcpTxPackets = UNKNOWN;

    }



    if (fclose(fp) != 0) {

        return -1;

    }

    return 0;

}



static int parseUidStats(const uint32_t uid, Stats* stats) {

    FILE *fp = fopen(QTAGUID_UID_STATS, "r");

    if (fp == NULL) {

        return -1;

    }



    char buffer[384];

    char iface[32];

    uint32_t idx, cur_uid, set;

    uint64_t tag, rxBytes, rxPackets, txBytes, txPackets;



    while (fgets(buffer, sizeof(buffer), fp) != NULL) {

        if (sscanf(buffer,

                "%" SCNu32 " %31s 0x%" SCNx64 " %u %u %" SCNu64 " %" SCNu64

                " %" SCNu64 " %" SCNu64 "",

                &idx, iface, &tag, &cur_uid, &set, &rxBytes, &rxPackets,

                &txBytes, &txPackets) == 9) {

            if (uid == cur_uid && tag == 0L) {

                stats->rxBytes += rxBytes;

                stats->rxPackets += rxPackets;

                stats->txBytes += txBytes;

                stats->txPackets += txPackets;

            }

        }

    }



    if (fclose(fp) != 0) {

        return -1;

    }

    return 0;

}



static jlong getTotalStat(JNIEnv* env, jclass clazz, jint type, jboolean useBpfStats) {

static jlong getTotalStat(JNIEnv* env, jclass clazz, jint type, jboolean useBpfStats) {

    Stats stats = {};

    Stats stats = {};





    if (useBpfStats) {

    if (bpfGetIfaceStats(NULL, &stats) == 0) {

    if (bpfGetIfaceStats(NULL, &stats) == 0) {

        return getStatsType(&stats, (StatsType) type);

        return getStatsType(&stats, (StatsType) type);

    } else {

    } else {
@@ -159,13 +79,6 @@ static jlong getTotalStat(JNIEnv* env, jclass clazz, jint type, jboolean useBpfS 
    }

    }

}

}





    if (parseIfaceStats(NULL, &stats) == 0) {

        return getStatsType(&stats, (StatsType) type);

    } else {

        return UNKNOWN;

    }

}



static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type,

static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type,

                          jboolean useBpfStats) {

                          jboolean useBpfStats) {

    ScopedUtfChars iface8(env, iface);

    ScopedUtfChars iface8(env, iface);
@@ -175,7 +88,6 @@ static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type, 




    Stats stats = {};

    Stats stats = {};





    if (useBpfStats) {

    if (bpfGetIfaceStats(iface8.c_str(), &stats) == 0) {

    if (bpfGetIfaceStats(iface8.c_str(), &stats) == 0) {

        return getStatsType(&stats, (StatsType) type);

        return getStatsType(&stats, (StatsType) type);

    } else {

    } else {
@@ -183,17 +95,9 @@ static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type, 
    }

    }

}

}





    if (parseIfaceStats(iface8.c_str(), &stats) == 0) {

        return getStatsType(&stats, (StatsType) type);

    } else {

        return UNKNOWN;

    }

}



static jlong getUidStat(JNIEnv* env, jclass clazz, jint uid, jint type, jboolean useBpfStats) {

static jlong getUidStat(JNIEnv* env, jclass clazz, jint uid, jint type, jboolean useBpfStats) {

    Stats stats = {};

    Stats stats = {};





    if (useBpfStats) {

    if (bpfGetUidStats(uid, &stats) == 0) {

    if (bpfGetUidStats(uid, &stats) == 0) {

        return getStatsType(&stats, (StatsType) type);

        return getStatsType(&stats, (StatsType) type);

    } else {

    } else {
@@ -201,13 +105,6 @@ static jlong getUidStat(JNIEnv* env, jclass clazz, jint uid, jint type, jboolean 
    }

    }

}

}





    if (parseUidStats(uid, &stats) == 0) {

        return getStatsType(&stats, (StatsType) type);

    } else {

        return UNKNOWN;

    }

}



static const JNINativeMethod gMethods[] = {

static const JNINativeMethod gMethods[] = {

    {"nativeGetTotalStat", "(IZ)J", (void*) getTotalStat},

    {"nativeGetTotalStat", "(IZ)J", (void*) getTotalStat},

    {"nativeGetIfaceStat", "(Ljava/lang/String;IZ)J", (void*) getIfaceStat},

    {"nativeGetIfaceStat", "(Ljava/lang/String;IZ)J", (void*) getIfaceStat},