summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* build: remove unused LIBTOOL_DEPSJan Engelhardt2010-12-301-2/+0
| | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* doc: fix wrong documentation on NFQNL_COPY_NONEPablo Neira Ayuso2010-12-071-1/+1
| | | | | | NFQNL_COPY_NONE means noop and should not be used. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* utils: document ENOBUFS in nfqnl_test.cAlessandro Vesely2010-11-071-3/+20
| | | | | | | | | | | | | This patch documents the ENOBUFS error in the example file, that is a common problem is that question over and over again in the mailing list. I (Pablo) have mangled this patch with some comestic cleanups. BTW, Mistick Levi sent a similar patch in the same timeline (amazing how sometimes the same works can clash). Signed-off-by: Alessandro Vesely <vesely@tana.it> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* Merge branch 'master' of git://dev.medozas.de/libnetfilter_queuePablo Neira Ayuso2010-11-071-1/+4
|\
| * build: use AC_OUTPUTJan Engelhardt2010-10-311-1/+3
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: default to not building static librariesJan Engelhardt2010-10-311-0/+1
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* | doc: document some performance tweaks for libnetfilter_queuePablo Neira Ayuso2010-11-031-1/+22
| | | | | | | | | | | | | | This patch documents some performance tweaks for libnetfilter_queue applications. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* | Merge branch 'master' of git://dev.medozas.de/libnetfilter_queuePablo Neira Ayuso2010-11-018-55/+32
|\|
| * Update .gitignoreJan Engelhardt2010-10-302-15/+19
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: remove -fPIC flagJan Engelhardt2010-10-301-1/+1
| | | | | | | | | | | | libtool automatically adds PIC flags as needed. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: remove statements without effectJan Engelhardt2010-10-301-4/+0
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: set Libs.private for pkgconfig fileJan Engelhardt2010-10-301-0/+1
| | | | | | | | | | | | | | Similar to the commit in iptables, add Libs.private to tell about dependencies for static linking. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: no need for error message in PKG_CHECK_MODULESJan Engelhardt2010-10-302-11/+3
| | | | | | | | | | | | | | | | | | | | PKG_CHECK_MODULES already produces its own (and more verbose) messsage when a module cannot be found. Mucking around with CFLAGS and LIBS is also not needed since pkgconfig takes care of providing variables, so let's use them in Makefile.am. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: run AC_CANONICAL_HOST onlyJan Engelhardt2010-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | There is no need to call AC_CANONICAL_SYSTEM when only AC_CANONICAL_HOST is needed. Also, checking for $target is factually incorrect, since we do not produce object code like a compiler. Use $host, which specifies the triple/quadrople where the compiled program is supposed to run. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: use simpler autoreconf in autogenJan Engelhardt2010-10-301-17/+3
| | | | | | | | | | | | | | | | | | Note: the use of -i seems required, otherwise autoreconf barfs about missing tools (depcomp, etc.). Since they are provided in the tarballs as files anyway rather than like previously as symlinks, I do not see a problem using -i. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: avoid use of deprecated INCLUDESJan Engelhardt2010-10-302-2/+2
| | | | | | | | | | | | | | | | Makefile.am: "INCLUDES" is the old name for "AM_CPPFLAGS" (or "*_CPPFLAGS") And remove unused $(all_includes) Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKEJan Engelhardt2010-10-302-4/+2
| | | | | | | | | | | | | | automake options also need to definitely go into configure.ac, otherwise they only apply to a single directory. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: build: use autoconf-suggested naming of filesJan Engelhardt2010-10-301-0/+0
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* | license: upgrade to GPLv2+Pablo Neira Ayuso2010-10-291-1/+1
|/ | | | | | | | | | | | This patch upgrades the license to GPLv2+. I have received an explicit ACK via email from contributors that are: * Harald Welte <laforge@netfilter.org>. * Holger Freyther <zecke@selfish.org> * Alessandro Vesely <vesely@tana.it> * Bart Schuymer <bdschuym@pandora.be> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: fix redundant LIBVERSION definitionPablo Neira Ayuso2010-07-152-23/+19
| | | | | | | | I accidentally inserted LIBVERSION to Makefile.am but the one used is in src/Makefile.am. This patch removes the previous definition. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: add myself to the copyright noticePablo Neira Ayuso2010-07-151-0/+1
| | | | | | | This patch adds myself to the copyright notice according to my contributions in the git repository. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: add missing documentation on nfq_snprintf_xml()Pablo Neira Ayuso2010-07-151-0/+32
| | | | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: bump version to 1.0.0libnetfilter_queue-1.0.0Pablo Neira Ayuso2010-07-112-1/+23
| | | | | | | This patch bumps the library version to 1.0. I have also introduced LIBVERSION for the API versioning. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* build: add libtool m4 supportPablo Neira Ayuso2010-07-113-0/+5
| | | | | | | | libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.in and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: remove libipq.hPablo Neira Ayuso2010-07-112-97/+1
| | | | | | | | | In 224df57de4479d65d4fec3eeaa8b1a4d63b8213f, we forgot to remove libipq.h that was introduced to add backward compatibility for libipq (which was never completed and now everybody should be using libnetfilter_queue instead). Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: remove `0x' from HW protocol in output of nfq_snprintf_xml()Pablo Neira Ayuso2010-07-111-2/+2
| | | | | | This patch removes the prefix `0x' of the HW protocol. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: fix HW address output in nfq_snprintf_xml()Pablo Neira Ayuso2010-07-111-3/+3
| | | | | | | | | | | | This patch fixes the output of the HW address in XML files: <src>800:800:800:800:800:</src> now it looks fine: <src>0019a917a400</src> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: consistent nfq_snprintf_xml() return value with snprintf()Pablo Neira Ayuso2010-07-111-58/+61
| | | | | | | | | | With this patch, nfq_snprintf_xml() returns the number of characters printed. If the output was truncated, then the return value is the number of characters that would have been written if enough space had been available. This makes nfq_snprintf_xml() consistent with the behaviour of snprintf(). Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: fix compilation warning in nfq_snprintf_xml()Pablo Neira Ayuso2010-07-111-1/+1
| | | | | | | In 21fd1834b5ce0a1f5b590f7e1ad23bba64fbafdf, we changed nfq_get_payload() to take an unsigned char * instead of signed char *. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* add nfq_snprintf_xml() to output a packet in XML formatPablo Neira Ayuso2010-06-132-0/+163
| | | | | | This patch adds a new function to output the packet in XML format. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* added .gitignore for base directoryDavid Fabro2010-06-101-0/+17
| | | | | Signed-off-by: David Favro <netfilter@meta-dynamic.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* payload buffer datatypes are consistentDavid Fabro2010-06-103-3/+3
| | | | | | | | | | | | | | The 'data' parameter to nfq_get_payload() returns pointer to unsigned char (rather than signed char) to make it consistent with the 'buf' parameter of nfq_set_verdict(), nfq_set_verdict2(), and nfq_set_verdict_mark(), all of which refer to the same data. Either signed or unsigned is fine, but they should be consistent as the output of nfq_get_payload() may be passed back into nfq_set_verdict*(); in that case, this change eliminates the need for typecasting in the calling code when using compilers that enforce strict typecasting. Signed-off-by: David Favro <netfilter@meta-dynamic.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* non-modified payload arguments are pointer-to-constDavid Fabro2010-06-102-8/+9
| | | | | | | | | | | | | | The payload parameters to nfq_set_verdict(), nfq_set_verdict2(), and nfq_set_verdict_mark() are not modified by those functions, and therefore should have datatype pointer-to-const. This both causes the source-code to more effectively represent what is the purpose of the parameter, and eliminates the need to cast away const-ness when calling the functions with compilers that enforce strict casting. All existing calling code should not need modification as pointer-to-X automatically converts to pointer-to-const-X. Signed-off-by: David Favro <netfilter@meta-dynamic.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* doc: remove references to deprecated nfq_set_verdict_mark()Pablo Neira Ayuso2010-05-101-2/+2
| | | | | | Now, we refer to nfq_set_verdict2() instead. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* doc: document possible verdicts on packets and minor change in exampleAlessandro Vesely2010-05-101-2/+11
| | | | | Signed-off-by: Alessandro Vessely <vesely@tana.it> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* doc: enhancementsDavid Favro2010-05-101-14/+17
| | | | | | | | | | * Several parameters are clarified. * Several previously undocumented return-values are documented. * nfq_set_verdict_mark() [now deprecated]: notes that mark is in network byte order. Signed-off-by: David Favro <netfilter@meta-dynamic.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: deprecate nfq_set_verdict_mark() in favour of nfq_set_verdict2()Pablo Neira Ayuso2010-05-092-6/+33
| | | | | | | | | | | | This patch deprecates nfq_set_verdict_mark() in favour of nfq_set_verdict2() which does exactly the same but it also convert the mark value from host-byte order to network-byte order as expected by nfnetlink_queue. I know, this is hackish, but I prefer adding new functions instead of API versioning which is also ugly. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* doc: make doxygen.cfg.in work with doxygen 1.6.1Holger Hans Peter Freyther2009-12-271-2/+1
| | | | | | | | | | | | * DETAILS_AT_TOP is deprecated and newer versions of doxygens are warning about this. Remove this option. * Empty HTML_HEADER as newer versions of doxygen check if the file exists and fail if it doesn't. Looking at the history of this project the file never existed. * This continues to work with doxygen 1.5.6. Signed-off-by: Holger Hans Peter Freyther <zecke@selfish.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* remove libipq_compatPatrick McHardy2009-09-172-254/+1
| | | | | | | | It has never been finished and nowadays people should be using libnfnetlink_queue directly anyways. In case someone wants to finish it, it can easily be restored from the history. Signed-off-by: Patrick McHardy <kaber@trash.net>
* nfq: add minor comment in the documentation to warn about privilegesPablo Neira Ayuso2009-07-161-0/+4
| | | | | | | | This patch adds a minor notice to warn developers that its application needs CAP_NET_ADMIN in order to send to and receive packets from kernel-space. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* build: bump version to 0.0.17libnetfilter_queue-0.0.17Pablo Neira Ayuso2009-03-061-1/+1
| | | | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfq: replace nfnl_talk by nfnl_query and disable sequence trackingPablo Neira Ayuso2009-02-172-4/+7
| | | | | | | | | | This patch replaces the nfnl_talk() calls by the newer nfnl_query(). This patch also disables netlink sequence tracking by default. Spurious race conditions in the sequence tracking may occur while creating queues and receiving high load of packets at the same time. Reported-by: Anton Vazir <anton.vazir@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfqnl_test: add hw src address, physindev and physoutdev supportBart De Schuymer2009-01-261-3/+21
| | | | | | | | This adds the hardware source address, physindev and physoutdev support to nfqnl_test Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: Patrick McHardy <kaber@trash.net>
* doc: put doxygen configuration file into dietPablo Neira Ayuso2009-01-061-1171/+0
| | | | | | | | | This patch puts the doxygen config file into diet since it was bloated with tons of comments. If we need help, we can go look for the official documentation instead of consuming ~50KB. With this patch, the file results in ~5KB. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* Add doxygen config file.Eric Leblond2008-12-222-1/+1357
| | | | | This patch adds a doxygen configuration file which is generated by the configure script.
* Switch documentation style to doxygen.Eric Leblond2008-12-191-125/+307
| | | | | | | This patch modifies the documentation format to switch to doxygen format. This leads to a interesting and useful output. An example can be found at the following url: http://www.nufw.org/doc/libnetfilter_queue/
* Suppress double call of nfnl_subsys_close()Eric Leblond2008-12-191-1/+0
| | | | | | | | nfnl_close() is calling nfnl_subsys_close() for all available subsys. Thus it is not necessary to call it in the nfq_close() function. Signed-off-by: Eric Leblond <eric@inl.fr>
* Use nfq_fd function instead of call to nfnetlink function.Eric Leblond2008-12-191-2/+1
| | | | | | | This patch modifies the example program to use nfq_fd function instead of call to nfnetlink function. Signed-off-by: Eric Leblond <eric@inl.fr>
* Change variable name to have an homogeneous namingEric Leblond2008-12-191-2/+2
| | | | | | | This patch modifies a function to have through the file. Data length variable was named data_len everywhere but in this function. Signed-off-by: Eric Leblond <eric@inl.fr>
* doc: complete missing function documentationEric Leblond2008-10-261-15/+98
| | | | | | | | | This patch adds documentation for functions that were not existing when the documentation was initially made. It also fixes some minor typos. Signed-off-by: Eric Leblond <eric@inl.fr> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>