system/netd: bandwidth management initial support (uid+tag stats)
This is a minimalistic version to get accounting of data going
through tagged socket per uid.
When netd starts up the BandwidthController, it will look at the
properties for
persist.bandwidth.enable=1
and enabled it.
It needs the kernel with the xt_qtaguid + iptables/netfilter goodness.
stlport is ok to use.
The "owner" netfilter module used is actually our xt_qtaguid that acts as it
(just until we get around to talking directly the to kernel).
Once
"ndc bandwidth enable"
is invoked all traffic is counted against the UIDs receiving/sending it.
This allows BlockGuard.java to "tag" sockets and see stats for the tags.
Data shows up in
/proc/net/xt_qtaguid/stats
/proc/net/xt_qtaguid/iface_stat/<iface>/
rx_packets_tcp
rx_bytes_tcp
...
There is no <uid>/...
Supported commands:
- "ndc bandwidth enable"
will setup the needed iptable entries to track tag/uid.
- "ndc bandwidth disable"
will remove the iptable entries.
- "ndc bandwidth setquota <iface> <value>"
will set a quota on the iface.
Once quota is reached, packets are rejected.
With the correct kernel, rejects are turned in socket errors.
TODO
----
* make bandwidth controller cooperate with tethering.
- they both manipulate the iptables.
Change-Id: Ieb9e7c60ef8c974e99828f7833065d59b2922bf3
diff --git a/Android.mk b/Android.mk
index a75c5ff..c4748d2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,27 +10,32 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- main.cpp \
+ BandwidthController.cpp \
CommandListener.cpp \
DnsProxyListener.cpp \
- NetdCommand.cpp \
- NetlinkManager.cpp \
- NetlinkHandler.cpp \
- logwrapper.c \
- TetherController.cpp \
NatController.cpp \
- PppController.cpp \
+ NetdCommand.cpp \
+ NetlinkHandler.cpp \
+ NetlinkManager.cpp \
PanController.cpp \
+ PppController.cpp \
SoftapController.cpp \
+ TetherController.cpp \
+ ThrottleController.cpp \
UsbController.cpp \
- ThrottleController.cpp
+ logwrapper.c \
+ main.cpp \
+
+
LOCAL_MODULE:= netd
LOCAL_C_INCLUDES := $(KERNEL_HEADERS) \
$(LOCAL_PATH)/../bluetooth/bluedroid/include \
$(LOCAL_PATH)/../bluetooth/bluez-clean-headers \
- external/openssl/include
+ external/openssl/include \
+ external/stlport/stlport \
+ bionic
LOCAL_CFLAGS :=
ifdef WIFI_DRIVER_FW_STA_PATH
@@ -40,7 +45,7 @@
LOCAL_CFLAGS += -DWIFI_DRIVER_FW_AP_PATH=\"$(WIFI_DRIVER_FW_AP_PATH)\"
endif
-LOCAL_SHARED_LIBRARIES := libsysutils libcutils libnetutils libcrypto
+LOCAL_SHARED_LIBRARIES := libstlport libsysutils libcutils libnetutils libcrypto
ifeq ($(BOARD_HAVE_BLUETOOTH),true)
LOCAL_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) libbluedroid