Use nfq_set_verdict2 instead of nfq_set_verdict_mark, like the libnetfilter_queue documentation says to do.

mattfox · mattfox · commit 2960dc340124 · 2016-06-27T21:27:12.000-07:00
diff --git a/README.rst b/README.rst
@@ -203,11 +203,6 @@ More details coming soon...
       arrived on or is leaving on
     * Probably other stuff is omitted too
     
-* When a packet has been marked, we use nfq_set_verdict_mark rather than
-  nfq_set_verdict2. Apparently nfq_set_verdict_mark is 
-  `broken <http://netfilter.org/projects/libnetfilter_queue/doxygen/group__Queue.html#ga1986d6387c5aa2a837c02e87ae3b45ff>`_,
-  although it works for me.
-
 Source
 ======
 
diff --git a/netfilterqueue.c b/netfilterqueue.c
diff --git a/netfilterqueue.pxd b/netfilterqueue.pxd
@@ -129,7 +129,7 @@ cdef extern from "libnetfilter_queue/libnetfilter_queue.h":
                           u_int32_t data_len,
                           unsigned char *buf) nogil
 
-    int nfq_set_verdict_mark(nfq_q_handle *qh,
+    int nfq_set_verdict2(nfq_q_handle *qh,
                             u_int32_t id,
                             u_int32_t verdict,
                             u_int32_t mark,
diff --git a/netfilterqueue.pyx b/netfilterqueue.pyx
@@ -80,7 +80,7 @@ cdef class Packet:
             modified_payload_len = len(self._given_payload)
             modified_payload = self._given_payload
         if self._mark_is_set:
-            nfq_set_verdict_mark(
+            nfq_set_verdict2(
                 self._qh,
                 self.id,
                 verdict,
