From a178f137f9ab96f79b9c676983036b0c2143b61e Mon Sep 17 00:00:00 2001 From: Bryse Flowers Date: Wed, 1 Jun 2016 13:00:12 -0700 Subject: Listen to xt_quota2 kobject event for quota Allow quota limit reached notification to originate from both qlog and xt_quota2 subsystem. On 3.18 Kernel, modify xt_quota2 module to broadcast the Netlink notification via kobject. Change-Id: Iaafe521e455d658ed8a2f95fb5114b029323d5ef CRs-Fixed: 1031033 --- server/NetlinkHandler.cpp | 2 +- server/NetlinkManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/NetlinkHandler.cpp b/server/NetlinkHandler.cpp index 97dc3e03..8038b613 100644 --- a/server/NetlinkHandler.cpp +++ b/server/NetlinkHandler.cpp @@ -104,7 +104,7 @@ void NetlinkHandler::onEvent(NetlinkEvent *evt) { } } - } else if (!strcmp(subsys, "qlog")) { + } else if (!strcmp(subsys, "qlog") || !strcmp(subsys, "xt_quota2")) { const char *alertName = evt->findParam("ALERT_NAME"); const char *iface = evt->findParam("INTERFACE"); notifyQuotaLimitReached(alertName, iface); diff --git a/server/NetlinkManager.cpp b/server/NetlinkManager.cpp index 76af46f6..769a80ae 100644 --- a/server/NetlinkManager.cpp +++ b/server/NetlinkManager.cpp @@ -142,7 +142,7 @@ int NetlinkManager::start() { if ((mQuotaHandler = setupSocket(&mQuotaSock, NETLINK_NFLOG, NFLOG_QUOTA_GROUP, NetlinkListener::NETLINK_FORMAT_BINARY, false)) == NULL) { - ALOGE("Unable to open quota socket"); + ALOGW("Unable to open qlog quota socket, check if xt_quota2 can send via UeventHandler"); // TODO: return -1 once the emulator gets a new kernel. } -- cgit v1.2.3