Moved acl_tos and acl_nfmark to ip/qos/QosConfig.h

diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h
index a5ff90b80bd486510c1cb812aa104988d237a140..2e277ef4902fdc9cce1d0bd090e8191bc881f52a 100644 (file)
--- a/src/ip/QosConfig.h
+++ b/src/ip/QosConfig.h
@@ -17,9 +17,27 @@
 #include <limits>
 #endif
 
-// Forward-declaration
+class ACLList;
 class fde;
 
+// TODO: move to new ACL framework
+// POD
+class acl_tos {
+public:
+    acl_tos *next;
+    ACLList *aclList;
+    tos_t tos;
+};
+// TODO: move to new ACL framework
+// POD
+class acl_nfmark {
+public:
+    acl_nfmark *next;
+    ACLList *aclList;
+    nfmark_t nfmark;
+};
+
+
 namespace Ip
 {
 

diff --git a/src/structs.h b/src/structs.h
index 7b3011e45a32834423bceddfdca771a4af7b4311..762927367c0689d6d249acd664b8afd0fe942b3b 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -34,18 +34,6 @@
 
 class ACLList;
 
-struct acl_tos {
-    acl_tos *next;
-    ACLList *aclList;
-    tos_t tos;
-};
-
-struct acl_nfmark {
-    acl_nfmark *next;
-    ACLList *aclList;
-    nfmark_t nfmark;
-};
-
 struct acl_size_t {
     acl_size_t *next;
     ACLList *aclList;