Commit Graph

68 Commits

Author SHA1 Message Date
Matt Fox ec2ae29066
Merge pull request #47 from yangyinqi/nfq-dev
Adapt to new cython
2018-12-13 14:52:30 -08:00
yangyinqi 2600a1bf8e Adapt to new cython 2018-12-04 00:04:09 +08:00
Matt Fox 3fa8a3860b Update CHANGES 2017-01-30 23:44:23 -08:00
Matt Fox db750b7212 Merge pull request #26 from kti/25-Crash-in-iptables-OUTPUT-chain
25 crash in iptables output chain
2017-01-30 23:41:46 -08:00
Matt Fox 496694a502 Update version to 0.8.1 2017-01-30 23:40:48 -08:00
Matt Fox 1a9815fdfd To fix #25, only parse self._hw.hw_addr if self._hw is not NULL 2017-01-30 23:36:46 -08:00
Matt Fox 24e6ab5d5a Installation instructions- replace wget with git clone 2017-01-30 21:51:07 -08:00
Matt Fox 6218f3ba50 Update README with 0.8 download source and add get_hw() documentation. 2016-12-15 01:41:55 -08:00
Matt Fox 27cd73f7ca Update to 0.8 2016-12-15 01:34:19 -08:00
Matt Fox a4b3a44b08 Add simple example script from existing documentation. Regenerate netfilterqueue.c with Cython 0.25.2. 2016-12-15 01:26:35 -08:00
Matt Fox 2758696f6d Merge pull request #20 from yiannist/feature-expose-hw-addr
Expose packet's HW addr
2016-12-15 01:16:59 -08:00
Matt Fox 88808265d0 Merge pull request #19 from no2a/master
Remove unnecessary conversion of byte order for set_mark
2016-12-15 01:15:10 -08:00
Yiannis Tsiouris b55344e288 Expose packet's HW addr 2016-11-08 13:14:40 +02:00
Arata Notsu b0ccf8d2c8 Remove unnecessary conversion of byte order for set_mark
As nfq_set_verdict2 coverts byte order of "mark" (unlike
nfq_set_verdict_mark), we have not to do it on our own.
Otherwise, for example, Packet.set_mark(0x1234) results in
0x34120000 on little-endian machines.
2016-10-30 01:24:52 +09:00
Matt Fox adb254540b Merge pull request #18 from WGH-/master
use self.payload[:self.payload_len] for getting python string
2016-10-27 21:05:18 -07:00
WGH 949f894256 use self.payload[:self.payload_len] for getting python string
This is more Cythonic way, documented here
http://cython.readthedocs.io/en/latest/src/tutorial/strings.html#passing-byte-strings

It compiles to
    __Pyx_PyBytes_FromStringAndSize(
        __pyx_v_self->payload + 0,
        __pyx_v_self->payload_len - 0)

Which is the Cython macro wrapper which handles both Python 2 and
Python3.

Fixes #17
2016-10-28 00:16:56 +03:00
Matt Fox 9c74558250 Update pypi download URL for 0.7 2016-06-28 00:27:27 -07:00
Matt Fox a8efde1ab5 Version update reminder in setup.py 2016-06-28 00:19:08 -07:00
Matt Fox 9329a05fcb Update VERSION in netfilterqueue.pyx to 0.7 2016-06-28 00:18:39 -07:00
Matt Fox 4637adbba7 Handle ENOBUFS in run_socket. 2016-06-28 00:13:40 -07:00
Matt Fox a2f2feec63 Bump version to 0.7 2016-06-28 00:03:15 -07:00
Matt Fox f425c49eac Change setup.py classifier from beta to stable. Aww yeah. 2016-06-27 23:57:58 -07:00
Matt Fox a6d0e8d57f Update license in setup.py to match LICENSE.txt, which was updated 5 years ago. ¯\_(ツ)_/¯ 2016-06-27 23:56:35 -07:00
Matt Fox 7e2c4df98f Update author email. 2016-06-27 23:52:50 -07:00
Matt Fox ccb353011a Add run_socket, which uses socket.recv so that gevent can monkeypatch it. Fixes #5 2016-06-27 23:48:53 -07:00
Matt Fox 2960dc3401 Use nfq_set_verdict2 instead of nfq_set_verdict_mark, like the libnetfilter_queue documentation says to do. 2016-06-27 21:27:12 -07:00
Matt Fox 405747fe36 Fix run() documentation omission. 2016-06-27 21:18:34 -07:00
Matt Fox 673060efc6 Update README docs with new functions and arguments. 2016-06-27 21:16:33 -07:00
Matt Fox 4d5c866ab3 Make COPY* constants zero-indexed. Fixes #6. 2016-06-27 20:52:13 -07:00
Matt Fox 8302b4ed0d Merge branch 'brian-goldman-master' 2016-06-27 20:46:58 -07:00
Matt Fox 30b7a99140 Merge branch 'master' of git://github.com/brian-goldman/python-netfilterqueue into brian-goldman-master
Conflicts:
	netfilterqueue.c
	netfilterqueue.pxd
	netfilterqueue.pyx
2016-06-27 20:46:50 -07:00
Matt Fox cde0af67d3 Merge branch 'dave2492-master' 2016-06-27 20:36:29 -07:00
Matt Fox c88de1ec51 Merge branch 'master' of git://github.com/dave2492/python-netfilterqueue into dave2492-master
Conflicts:
	netfilterqueue.c
	netfilterqueue.pxd
	netfilterqueue.pyx
2016-06-27 20:36:00 -07:00
Matt Fox 61cfb3d342 Merge branch 'lilydjwg-master' 2016-06-27 20:10:43 -07:00
Matt Fox e4e8516d45 Merge branch 'master' of git://github.com/lilydjwg/python-netfilterqueue into lilydjwg-master
Conflicts:
	netfilterqueue.c
2016-06-27 20:10:26 -07:00
Matt Fox 5fd8e932ac Add unbind() to README example 2016-06-27 20:03:55 -07:00
Matt Fox a43e8ad410 Merge branch 'remleduff-patch-1' 2016-06-27 20:03:32 -07:00
Matt Fox c7ef78bcf8 Merge branch 'patch-1' of git://github.com/remleduff/python-netfilterqueue into remleduff-patch-1 2016-06-27 20:02:35 -07:00
Matt Fox 75c9f56469 Bring README up to date with 0.6.0 2016-06-27 19:59:57 -07:00
Brian Goldman b14fa6484d Support asynchronous packet handling. 2016-03-18 16:54:36 -07:00
Dave Benson f4e3f0936d Added recv skip of ENOBUFS, also set of rcv socklen 2015-08-06 16:26:40 -04:00
remleduff 7db2fd300f Prevent double-destroy of queue in __dealloc__
If the user calls unbind, the queue is destroyed.

When the GC then runs again the queue is destroyed incorrectly in __dealloc__
2015-07-16 17:35:23 -04:00
wimkerkhoff 53a55fd588 Merge pull request #1 from fqrouter/master
set_payload has been implemented
2015-06-01 09:26:37 -07:00
lilydjwg a31c9a67db cleanup trailing whitespace 2015-05-16 15:26:41 +08:00
lilydjwg a008498677 compatible with Python 3 2015-05-16 15:26:11 +08:00
Matthew Fox 093a129e42 Update setup.py author email 2014-04-04 16:57:25 -07:00
Fen Qin 6b8be8a5ec add get_mark 2013-04-15 11:30:35 +08:00
Fen Qin 26ff0e7844 add repeat to packet; release 0.5 2013-04-03 19:55:51 +08:00
Fen Qin 3b62cd55ad release the forked 0.4 version 2012-12-24 11:24:23 +08:00
Fen Qin d379e7a57f implement set_payload 2012-12-24 11:17:54 +08:00