ACCOUNT: tweak base ctl number for setsockopts

IPT_BASE_CTL+3 is already used IPT_SO_GET_REVISION_TARGET and
therefore must not be used by extensions.

diff --git a/extensions/xt_ACCOUNT.h b/extensions/xt_ACCOUNT.h
index 07bdcdfa7a742cd2b1e7dc7dad5a3b2626c295fb..65ff4ab4e33bd9f62735cc9005b240bbb46e2cec 100644 (file)
--- a/extensions/xt_ACCOUNT.h
+++ b/extensions/xt_ACCOUNT.h
@@ -11,15 +11,22 @@
 #ifndef _IPT_ACCOUNT_H
 #define _IPT_ACCOUNT_H
 
-#define IPT_SO_SET_ACCOUNT_HANDLE_FREE (IPT_BASE_CTL + 3)
-#define IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL (IPT_BASE_CTL + 4)
+/*
+ * Socket option interface shared between kernel (xt_ACCOUNT) and userspace
+ * library (libxt_ACCOUNT_cl). Hopefully we are unique at least within our
+ * kernel & xtables-addons space.
+ */
+#define SO_ACCOUNT_BASE_CTL 90
+
+#define IPT_SO_SET_ACCOUNT_HANDLE_FREE (SO_ACCOUNT_BASE_CTL + 1)
+#define IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL (SO_ACCOUNT_BASE_CTL + 2)
 #define IPT_SO_SET_ACCOUNT_MAX          IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL
 
-#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 4)
-#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 5)
-#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 6)
-#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 7)
-#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 8)
+#define IPT_SO_GET_ACCOUNT_PREPARE_READ (SO_ACCOUNT_BASE_CTL + 4)
+#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (SO_ACCOUNT_BASE_CTL + 5)
+#define IPT_SO_GET_ACCOUNT_GET_DATA (SO_ACCOUNT_BASE_CTL + 6)
+#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (SO_ACCOUNT_BASE_CTL + 7)
+#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (SO_ACCOUNT_BASE_CTL + 8)
 #define IPT_SO_GET_ACCOUNT_MAX   IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES
 
 #define ACCOUNT_MAX_TABLES 128