summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set the non-debug compiling the defaultJozsef Kadlecsik2011-01-182-4/+10
| | | | | Compiling with debugging can be enabled with the "--enable-debug" option of the configure script.
* Testsuite fix of ospf replaced with vrrp.Jozsef Kadlecsik2011-01-181-1/+1
| | | | | The testsuite failed incorrectly, because the order of the elements changed.
* Fix build with NDEBUG definedJozsef Kadlecsik2011-01-183-8/+19
| | | | | | | | | | | | | | | | The usage of the gcc option -Wunused-parameter interferes badly with the assert() macros. In case -DNDEBUG is specified build fails with: cc1: warnings being treated as errors print.c: In function 'ipset_print_family': print.c:92: error: unused parameter 'opt' print.c: In function 'ipset_print_port': print.c:413: error: unused parameter 'opt' print.c: In function 'ipset_print_proto': Fix it by taking into accout NDEBUG in the function arguments. Bug reported by Holger Eitzenberger.
* Do session initialization onceHolger Eitzenberger2011-01-181-8/+6
| | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
* Make IPv4 and IPv6 address handling similarJozsef Kadlecsik2011-01-181-1/+10
| | | | | | | | | | | | | | | | While the following works for AF_INET: ipset add foo 192.168.1.1/32 this does not work for AF_INET6: ipset add foo6 20a1:1:2:3:4:5:6:7/128 ipset v5.2: Syntax error: plain IP address must be supplied: 20a1:1:2:3:4:5:6:7/128 Bug reported by Holger Eitzenberger. The complete fix is to handle the special host prefixes in the general IP address parser function.
* Show correct line numbers in restore output for parser errorsJozsef Kadlecsik2011-01-183-0/+17
| | | | | | | | | | | | | | | | | Parser errors are reported by a wrong lineno at restore, bug reported by Holger Eitzenberger: create foo6 hash:ip hashsize 64 family inet6 add foo6 20a1:1234:5678::/64 add foo6 20a1:1234:5679::/64 you get: ipset v5.2: Error in line 1: Syntax error: plain IP address must be supplied: 20a1:1234:5678::/64 Should be line 2 though. The solution is to set the session lineno before parsing.
* There is no need to call synchronize_net() at swapping.Jozsef Kadlecsik2011-01-141-4/+0
| | | | | | Ongoing add/del can happen to referenced sets and delete can be issued to unreferenced sets. So the bogus call to synchronize_net() can safely be removed.
* Replace strncpy with strlcpy at creating a set.Jozsef Kadlecsik2011-01-141-1/+1
| | | | Better add more safety nets against user input.
* Update copyright date and some style changes.Jozsef Kadlecsik2011-01-1414-16/+16
|
* Use jhash.h accepted in kernel, with backward compatibility.Jozsef Kadlecsik2011-01-139-9/+9
|
* Separate prefixlens from ip_set core.Jozsef Kadlecsik2011-01-1313-297/+314
| | | | | | Separate prefixlens from ip_set core for better readibility and honoring the independence. Also, comment that prefixlens were borrowed from Jan Engelhardt.
* Replace ospf with vrrp in the testsuiteJozsef Kadlecsik2011-01-132-5/+5
| | | | Some systems do not contain ospf in /etc/protocols but ospfigp only.
* Merge branch 'master' of git://dev.medozas.de/ipsetJozsef Kadlecsik2011-01-121-6/+5
|\ | | | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
| * kernel: remove unused ctnl parameter from call_adJan Engelhardt2011-01-031-6/+5
|/ | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* Merge branch 'master' of git://dev.medozas.de/ipsetJozsef Kadlecsik2011-01-033-902/+2
|\ | | | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
| * build: remove autogenerated filesJan Engelhardt2010-12-312-900/+0
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * build: use only AC_CANONICAL_HOSTJan Engelhardt2010-12-311-2/+2
|/ | | | | | | Calculating AC_CANONICAL_TARGET is superfluous, because ipset is not a code generator. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* Comment the possible return values of the add/del/test type-functionsJozsef Kadlecsik2010-12-231-2/+8
|
* ipset 5.2 releasedv5.2Jozsef Kadlecsik2010-12-233-1/+11
|
* Handle internal printing errorsJozsef Kadlecsik2010-12-231-10/+25
| | | | Internal printing errors were not reported, handle them by setjmp/longjmp.
* Use cast to void * instead of memcpy as Sparc workaround at sockaddr_XXX.Jozsef Kadlecsik2010-12-231-8/+6
| | | | | | Direct cast results "cast increases required alignment of target type" on Sparc: use indirect cast to void * instead of memcpy, as Jan Engelhardt suggested.
* Listing/saving of large sets could produce broken listing, fixed.Jozsef Kadlecsik2010-12-232-9/+16
| | | | | The wrapper around getnameinfo was not snprintf-compatible and that could cause broken listing/saving for large sets.
* Kernel version check at minimal supported version is mistyped, now fixed.Jozsef Kadlecsik2010-12-221-2/+2
|
* Support libtool < 2.2Jozsef Kadlecsik2010-12-221-1/+1
| | | | LT_INIT is not present before libtool 2.2. Revert to use AC_PROG_LIBTOOL.
* ipset 5.1 releasedv5.1Jozsef Kadlecsik2010-12-223-1/+33
|
* Test cases for IPv6 restore and more complex restore sessions added.Jozsef Kadlecsik2010-12-226-0/+65
|
* Restore mode did not work for IPv6 (reported by Elie Rosenblum)Jozsef Kadlecsik2010-12-222-21/+30
| | | | | | The set cache stored the default family (INET) instead of the set family, therefore restore mode for IPv6 did not work. The set cache fixed and message aggregation reworked.
* Kernel version compatibility: support from 2.6.34Jozsef Kadlecsik2010-12-218-53/+48
| | | | | The basic kernel compatibility issues are verified back to 2.6.24. The minimal supported kernel version had to be bumped from 2.6.31 to 2.6.34.
* Merge branch 'master' of git://dev.medozas.de/ipset into ipset-5Jozsef Kadlecsik2010-12-2023-225/+214
|\ | | | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
| * libipset: static annotationsJan Engelhardt2010-12-191-4/+4
| |
| * libipset: const annotationsJan Engelhardt2010-12-195-8/+8
| |
| * libipset: remove redundant castsJan Engelhardt2010-12-193-10/+10
| |
| * libipset: remove redundant indirection via union nameJan Engelhardt2010-12-191-41/+41
| | | | | | | | | | There are no uses of C99 static initializers, so let's make the union anonymous and reduce accessor lengths.
| * libipset: ipset_strncpy is really a strlcpy-type operationJan Engelhardt2010-12-193-12/+12
| |
| * kernel: use EXPORT_SYMBOL_GPLJan Engelhardt2010-12-191-13/+13
| |
| * kernel: const annotationsJan Engelhardt2010-12-1913-71/+71
| |
| * kernel: use __read_mostly for registration-type structuresJan Engelhardt2010-12-199-10/+10
| | | | | | | | Here is where __read_mostly goes :-)
| * kernel: do not mix const and __read_mostlyJan Engelhardt2010-12-1914-51/+40
| | | | | | | | | | It makes no sense to mix these two. Either it is writable-plus-read-mostly, or it is constant.
| * xt_set: avoid user types in exported kernel headersJan Engelhardt2010-12-191-6/+6
| | | | | | | | Within isolated code it would be ok, but not so in exported headers.
| * build: enable parallel buildingJan Engelhardt2010-12-191-3/+3
|/ | | | | | | | | | | | | | $ make modules -j8 cd kernel; make -C /lib/modules/`uname -r`/build M=`pwd` V=0 \ IP_SET_MAX=256 \ NETLINK_DUMP_CONST=const \ NFNL_CB_CONST=const modules make[1]: Entering directory "/usr/src/linux-2.6.36-rc8-34-obj/x86_64/default" make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. The "fix" here is that we have to use ${MAKE} instead of make. (NB: The extra cd is redundant and can be appended to M=.)
* Prevent calling Makefile directly in the kernel/ subdirectoryJozsef Kadlecsik2010-12-191-0/+4
|
* Put back the Sparc specific workaround at getaddrinfo.Jozsef Kadlecsik2010-12-191-4/+8
|
* Should have gone to sleep: fix check_allowed. Really.Jozsef Kadlecsik2010-12-191-11/+11
| | | | | | | It's not as nice as I'd like to be: IPSET_CREATE_FLAGS and IPSET_ADT_FLAGS are required elsewhere, but to make life simpler, some flags (like IPSET_OPT_TYPENAME) are *not* added to the types full[] flags. So those must be excluded here.
* Check old system kernel header filesJozsef Kadlecsik2010-12-181-0/+6
|
* Check from `configure` that the kernel source is patched with netlink.patchJozsef Kadlecsik2010-12-181-0/+5
|
* Use configure to detect compiler warning flagsJozsef Kadlecsik2010-12-185-52/+262
| | | | | By checking the supported compiler warning flags, different gcc releases are supported without the crude --disable-extra-flags option.
* The fix of incorrect comparison in check_allowed completed.Jozsef Kadlecsik2010-12-181-22/+25
| | | | | There was still some other incorrect usage of 'enum ipset_cmd' and 'enum ipset_adt' - corrected.
* Try to solve PKG_CHECK_MODULES issueJozsef Kadlecsik2010-12-181-0/+1
| | | | | | | | | | Rob Sterenborg reported, that on CentOs configure can fail with ./configure: line 11510: syntax error near unexpected token `[libmnl],' ./configure: line 11510: `PKG_CHECK_MODULES([libmnl], [libmnl >= 1])' Therefore I added 'aclocal -I m4' to autogen.sh, hoping that it solves the issue.
* Fix incorrect comparison in check_allowedJozsef Kadlecsik2010-12-181-1/+1
| | | | Wrong enum type was used in the comparison, reported by Jan Engelhardt.
* Fix Kbuild for me to delete backup filesJozsef Kadlecsik2010-12-171-1/+1
|