[Dnsmasq-discuss] [PATCH v2 0/3] ipset: Add Netfilter IPSet Support to DNSMasq

Jason A. Donenfeld Jason at zx2c4.com
Sun Feb 17 22:16:38 GMT 2013


From: "Jason A. Donenfeld" <Jason at zx2c4.com>

This version 2 of the ipset patchset makes a few important changes:

    - No HAVE_OLD_IPSET anymore. HAVE_IPSET will enable both, and the
      correct code will then be called depending on the running kernel.

    - libmnl is no longer used. All this code was replaced with
      something even more lightweight that should build on old systems.

    - The netfilter socket is reused between ipset insertions. Note
      that other netlink sockets used in dnsmasq cannot be reused
      because they're part of a different netlink class, but we're
      smart about reusing the one we do allocate.

    - HAVE_IPV6 is now respected, so new code paths won't break on non-
      ipv6 systems.

    - compile_opts and various other small fixes

Jason A. Donenfeld (3):
  ipset: Integrate ipset.c into build system.
  ipset: Parse new --ipset option and match domains in forward.c
  ipset: Update man page and example config to reflect new option.

 Makefile             |   2 +-
 dnsmasq.conf.example |   4 +
 man/dnsmasq.8        |   6 ++
 src/config.h         |  14 +++-
 src/dnsmasq.h        |  15 +++-
 src/forward.c        |  20 ++++-
 src/ipset.c          | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/option.c         |  64 +++++++++++++++
 src/rfc1035.c        |  24 +++++-
 9 files changed, 364 insertions(+), 5 deletions(-)
 create mode 100644 src/ipset.c

-- 
1.8.1.2




More information about the Dnsmasq-discuss mailing list