Merge pull request #282 from edk0/propagate-oper

[solanum.git] / include / class.h

diff --git a/include/class.h b/include/class.h
index 058a0d69975730d97a8345a5224337d7899ca441..9a1ab251129d9dcac95632c6f8ba83bf8612e3f9 100644 (file)
--- a/include/class.h
+++ b/include/class.h
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: class.h 6 2005-09-10 01:02:21Z nenolod $
  */
 
 #ifndef INCLUDED_class_h
@@ -44,7 +42,8 @@ struct Class
        int ping_freq;
        int total;
        rb_patricia_tree_t *ip_limits;
-       int cidr_bitlen;
+       int cidr_ipv4_bitlen;
+       int cidr_ipv6_bitlen;
        int cidr_amount;
 
 };
@@ -62,7 +61,8 @@ extern struct Class *default_class;
 #define MaxSendq(x)     ((x)->max_sendq)
 #define CurrUsers(x)    ((x)->total)
 #define IpLimits(x)     ((x)->ip_limits)
-#define CidrBitlen(x)   ((x)->cidr_bitlen)
+#define CidrIpv4Bitlen(x)   ((x)->cidr_ipv4_bitlen)
+#define CidrIpv6Bitlen(x)   ((x)->cidr_ipv6_bitlen)
 #define CidrAmount(x)  ((x)->cidr_amount)
 #define ClassPtr(x)      ((x)->c_class)
 
@@ -77,7 +77,8 @@ extern struct Class *default_class;
 #define ConfCurrUsers(x) (ClassPtr(x)->total)
 #define ConfIpLimits(x) (ClassPtr(x)->ip_limits)
 #define ConfCidrAmount(x) (ClassPtr(x)->cidr_amount)
-#define ConfCidrBitlen(x) (ClassPtr(x)->cidr_bitlen)
+#define ConfCidrIpv4Bitlen(x) (ClassPtr(x)->cidr_ipv4_bitlen)
+#define ConfCidrIpv6Bitlen(x) (ClassPtr(x)->cidr_ipv6_bitlen)
 
 void add_class(struct Class *);