commit 01cc5490175b29e2adeb24dd5aefd089b7e1abf9
author Joel Scherpelz <jscherpelz@google.com> Fri Jun 16 10:45:14 2017 +0900
committer Joel Scherpelz <jscherpelz@google.com> Mon Jun 26 10:33:34 2017 +0900
tree 4a6fb7caf94d8119b06b6f0a5b5467cb0271aa13
parent c0cf343bb83230a7874518ac18b2ecbff4fc4f7a

Add unit test for shared/unshared interface quotas

Test: as follows
    - built
    - flashed
    - booted
    - "runtest -x .../netd_unit_test.cpp" passes
Bug: 28362720
Bug: 38143143

Change-Id: I0b962898f9e3d7e86d5c0d0d01b79b3e3543b5ee

server/BandwidthController.cpp

diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp
index 9aace9d..69addb3 100644
--- a/server/BandwidthController.cpp
+++ b/server/BandwidthController.cpp
@@ -22,15 +22,14 @@
  * If they ever were to allow it, then netd/ would need some tweaking.
  */
 
-#include <string>
-#include <vector>
-
+#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <string>
+#include <vector>
 
 #define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
@@ -51,9 +50,10 @@
 #include <cutils/properties.h>
 #include <logwrap/logwrap.h>
 
-#include "NetdConstants.h"
+#include <netdutils/Syscalls.h>
 #include "BandwidthController.h"
-#include "NatController.h"  /* For LOCAL_TETHER_COUNTERS_CHAIN */
+#include "NatController.h" /* For LOCAL_TETHER_COUNTERS_CHAIN */
+#include "NetdConstants.h"
 #include "ResponseCode.h"
 
 /* Alphabetical */
@@ -70,6 +70,8 @@
 
 using android::base::StringAppendF;
 using android::base::StringPrintf;
+using android::netdutils::StatusOr;
+using android::netdutils::UniqueFile;
 
 namespace {
 
@@ -625,21 +627,23 @@
 }
 
 int BandwidthController::getInterfaceQuota(const std::string& iface, int64_t* bytes) {
-    FILE *fp;
+    const auto& sys = android::netdutils::sSyscalls.get();
     const std::string fname = "/proc/net/xt_quota/" + iface;
-    int scanRes;
 
     if (!isIfaceName(iface)) return -1;
 
-    fp = fopen(fname.c_str(), "re");
-    if (!fp) {
-        ALOGE("Reading quota %s failed (%s)", iface.c_str(), strerror(errno));
+    StatusOr<UniqueFile> file = sys.fopen(fname, "re");
+    if (!isOk(file)) {
+        ALOGE("Reading quota %s failed (%s)", iface.c_str(), toString(file).c_str());
         return -1;
     }
-    scanRes = fscanf(fp, "%" SCNd64, bytes);
-    ALOGV("Read quota res=%d bytes=%" PRId64, scanRes, *bytes);
-    fclose(fp);
-    return scanRes == 1 ? 0 : -1;
+    auto rv = sys.fscanf(file.value().get(), "%" SCNd64, bytes);
+    if (!isOk(rv)) {
+        ALOGE("Reading quota %s failed (%s)", iface.c_str(), toString(rv).c_str());
+        return -1;
+    }
+    ALOGV("Read quota res=%d bytes=%" PRId64, rv.value(), *bytes);
+    return rv.value() == 1 ? 0 : -1;
 }
 
 int BandwidthController::removeInterfaceQuota(const std::string& iface) {
@@ -668,23 +672,20 @@
 }
 
 int BandwidthController::updateQuota(const std::string& quotaName, int64_t bytes) {
-    FILE *fp;
-    char *fname;
+    const auto& sys = android::netdutils::sSyscalls.get();
+    const std::string fname = "/proc/net/xt_quota/" + quotaName;
 
     if (!isIfaceName(quotaName)) {
         ALOGE("updateQuota: Invalid quotaName \"%s\"", quotaName.c_str());
         return -1;
     }
 
-    asprintf(&fname, "/proc/net/xt_quota/%s", quotaName.c_str());
-    fp = fopen(fname, "we");
-    free(fname);
-    if (!fp) {
-        ALOGE("Updating quota %s failed (%s)", quotaName.c_str(), strerror(errno));
+    StatusOr<UniqueFile> file = sys.fopen(fname, "we");
+    if (!isOk(file)) {
+        ALOGE("Updating quota %s failed (%s)", quotaName.c_str(), toString(file).c_str());
         return -1;
     }
-    fprintf(fp, "%" PRId64"\n", bytes);
-    fclose(fp);
+    sys.fprintf(file.value().get(), "%" PRId64 "\n", bytes);
     return 0;
 }