Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev

[android-x86/system-netd.git] / server / NetlinkManager.h

diff --git a/server/NetlinkManager.h b/server/NetlinkManager.h
index b7f011e..40a5722 100644 (file)
--- a/server/NetlinkManager.h
+++ b/server/NetlinkManager.h
@@ -32,10 +32,11 @@ private:
     NetlinkHandler       *mUeventHandler;
     NetlinkHandler       *mRouteHandler;
     NetlinkHandler       *mQuotaHandler;
-    NetlinkHandler       *mIfaceIdleTimerHandler;
+    NetlinkHandler       *mStrictHandler;
     int                  mUeventSock;
     int                  mRouteSock;
     int                  mQuotaSock;
+    int                  mStrictSock;
 
 public:
     virtual ~NetlinkManager();
@@ -48,15 +49,14 @@ public:
 
     static NetlinkManager *Instance();
 
-    /* This is the nflog group arg that the xt_quota2 neftiler will use. */
+    /* Group used by xt_quota2 */
     static const int NFLOG_QUOTA_GROUP;
-
-    /* This is the group that the xt_IDLETIMER netfilter will use. */
-    static const int IDLETIMER_GROUP;
+    /* Group used by StrictController rules */
+    static const int NETFILTER_STRICT_GROUP;
 
 private:
     NetlinkManager();
     NetlinkHandler* setupSocket(int *sock, int netlinkFamily, int groups,
-        int format);
+        int format, bool configNflog);
 };
 #endif