Commit Graph

166 Commits (6c07afd38f37d4a1650eb180f84cfacc9de6056d)

Author SHA1 Message Date
Jo-Philipp Wich 258ae14fcc dnsmasq: configure dnsmasq via flat config file and not command-line args
Sometimes it's useful to compare the generated config file from UCI config with a hand-edited dnsmasq config file, especially if you're migrating to an OpenWRT router from something else (such as Astlinux).

Putting the generated config makes it easier to capture and diff, etc.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31182 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-02 22:31:21 +00:00
Jo-Philipp Wich b8c0d088cf [package] dnsmasq: add missing config_get, localize variables, bump package revision
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31058 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-03-23 11:26:47 +00:00
Jo-Philipp Wich be9f571e9a dnsmasq: add mx record support
Adding the following syntax support:

config mxhost
	option domain mydomain.com
	option relay svr10.ironport.com
	option pref 50

and this will generate an MX record for mydomain.com pointing at the relay with a given preference.

Redux: default the preference to 0 if absent.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31057 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-03-23 11:19:58 +00:00
Jo-Philipp Wich 6a9ca25f30 dnsmasq: add keywords for SRV RR class/weight
The SRV record also requires the class and weight fields... Currently you can overload the "port" keyword as:

	option port xxxx,class,weight

but this is counter-intuitive. Here we fix this.

Redux: make the port required.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31056 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-03-23 11:19:56 +00:00
Jo-Philipp Wich 77ef1563a0 [package] dnsmasq: if CONFIG_IPV6 is off, compile with -DNO_IPV6 - solves unresolved refs to in6addr_any when building with external CodeSourcery toolchain
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29777 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-01-18 19:00:53 +00:00
Jo-Philipp Wich 54e798d85b [package] dnsmasq: automatically add host entry for own hostname and ptr record for lan ip address
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29375 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-12-01 21:34:45 +00:00
Nicolas Thill 27ff6f2ed6 package/dnsmasq: update to 2.59 (thanks to Raphael Huck)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29329 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-25 00:53:13 +00:00
Nicolas Thill a13b6db678 package/dnsmasq: use new service wrapper
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28837 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-07 22:58:45 +00:00
Travis Kemen c0b0967f03 add cname section
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28493 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-20 12:12:26 +00:00
Florian Fainelli 2744a70c55 [package] dnsmasq: update to 2.58
patch by Raphael Huck.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28333 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-09-30 12:55:23 +00:00
Jo-Philipp Wich 71f990ccfb [PATCH] dnsmasq: allow hostname assignment without static lease
The attached patch for dnsmasq.init allows to assign a hostname to a
particular mac-address. It's useful to override the client supplied
hostname, especially if the client does not supply a hostname at all.

It corresponds to the following example in dnsmasq.conf.example:

	# Always set the name of the host with hardware address
	# 11:22:33:44:55:66 to be "fred"
	#dhcp-host=11:22:33:44:55:66,fred
			
Regards
Mathias


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26983 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-05-24 09:12:50 +00:00
Felix Fietkau dc08d4eafc dnsmasq: use -ffunction-sections, -fdata-sections and --gc-sections, saves 8k uncompressed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25827 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-02 12:47:57 +00:00
Imre Kaloz 8dfd4cba5f [package/dnsmasq]: upgrade to 2.57
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25576 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-02-19 08:50:15 +00:00
Felix Fietkau 65da314b7d dnsmasq: fix logic for creating missing files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25540 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-02-14 19:42:53 +00:00
Jo-Philipp Wich c7f406065d package/dnsmasq: use service_kill in initscript
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25537 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-02-14 17:02:48 +00:00
Vasilis Tsiligiannis 2476d23edc [package] dnsmasq: add support for option "--dhcp-script" (thanks Bastian Bittorf)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25137 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-27 10:14:09 +00:00
Felix Fietkau 9303cd1210 dnsmasq: Fix parameter 'limit'
'limit' is actually the number of IP addresses to serve. See the use of ipcalc.sh.
For getting the expected number of IP addresses served, we have to decrement
limit by one.

Patch from: kentarou matsuyama <matsuyama@thinktube.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25100 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-26 11:33:33 +00:00
Jo-Philipp Wich 1918a94f1d [PATCH] Package dnsmasq init-file
If an already running DHCP-server is found on
the configured interface, the init-script refuses
to start, but does not give a hint why. It took us
some days to track down this behavior in our MANET,
where every wifi/adhoc-node runs it own DHCP-server.
Now syslog is more verbose on this.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24051 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-11-21 13:53:27 +00:00
Jo-Philipp Wich bee3f2b4c0 [package] dnsmasq: remove a useless subshell invocation from the init script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23272 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-06 13:23:56 +00:00
Jo-Philipp Wich 06364b3360 [package] dnsmasq: allow 127.0.0.1/8 upstream DNS responses by default, resolves issues with Netflix and other services
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23270 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-06 13:10:15 +00:00
Nicolas Thill 9d8ace68e3 package/dnsmasq: add support for bogus-nxdomain (thanks to Mickey Knox), bump release number
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22592 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-11 10:37:33 +00:00
Vasilis Tsiligiannis 3a4b11a5ef [package] dnsmasq: Squelch a 'touch' error when no dhcp leases file is defined in config, thanks stsp (#7720)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22528 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-08 10:53:28 +00:00
Jo-Philipp Wich 9acb6f5994 [package] dnsmasq: add -c or --cache-size option to dnsmasq via cachesize UCI option (#7625)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22490 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-04 17:16:46 +00:00
Jo-Philipp Wich 05cf9e7cb5 [PATCH] Allow UCI interface names in /etc/config/dhcp
Signed-off-by: Gabriel Kerneis <kerneis@pps.jussieu.fr>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22487 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-04 17:09:31 +00:00
Nicolas Thill 3770e0e7fa dnsmasq: initscript: fix bool options handling, bump release number
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22251 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-17 13:36:13 +00:00
Jo-Philipp Wich d5e9eb6971 [package] dnsmasq: add and enable DNS rebind protections
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22222 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-16 00:06:59 +00:00
Alexandros C. Couloumbis 7600086eb4 package/dnsmasq: update dnsmasq to 2.55
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21871 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-06-22 07:09:16 +00:00
Nicolas Thill 2f63f3737b package/dnsmasq: bump release number (missed from r21400)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21523 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-21 15:08:27 +00:00
Peter Denison c33f877830 Add support for SRV records to dnsmasq config parsing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21400 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-08 12:35:29 +00:00
Jo-Philipp Wich 20711d0723 [package] dnsmasq:
- when processing domain entries, append searchdomain to host entries if they are not fully qualified
	- create only one reverse record for address entries with multiple names


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21109 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-23 13:40:50 +00:00
Jo-Philipp Wich 9ab8828d63 [package] dnsmasq: don't append search domain to custom host entries
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20935 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-16 19:09:05 +00:00
Jo-Philipp Wich 67d446094f [package] dnsmasq: allow multiple hostnames per domain section
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20656 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-02 22:56:22 +00:00
Travis Kemen 98e306995f fix limit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20275 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-18 15:50:05 +00:00
Travis Kemen 5ecf73fb50 remove +1 as it isn't needed since 16619
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20259 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-18 01:39:02 +00:00
Travis Kemen 29b352391e if readethers is set to true make sure /etc/ethers exists, closes #6740
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20220 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-14 21:33:02 +00:00
Jo-Philipp Wich f1eed05155 [package] dnsmasq: remove redundant code introduced with r20074
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20079 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-09 01:41:06 +00:00
Jo-Philipp Wich 7fc98fcb86 [package] dnsmasq: allow multiple macs per static lease address (#6205)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20074 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-08 23:28:55 +00:00
Jo-Philipp Wich 1be2c3d1fa [package] dnsmasq: prevent bad command line error when a dhcp pool has ignore set and the corresponding iface has only whitespace as value
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20048 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-08 03:52:04 +00:00
Vasilis Tsiligiannis 7050ec7ba0 [package] dnsmasq: Remove deprecated HAVE_ISC_READER=1 flag (#6757)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19942 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-01 21:19:05 +00:00
Hauke Mehrtens f54859afb6 [dnsmasq] Update to version 2.52
Patch 103-ipv6_fix.patch is removed, because the problem the patch was fixing is now fixed in mainline.

Thank you Raphaël HUCK for your patch.
This fixes #6568.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19392 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-01-29 23:15:44 +00:00
Jo-Philipp Wich 1aa812b844 [package] dnsmasq: only write search directive if domain is actually set
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19090 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-01-10 15:31:58 +00:00
Jo-Philipp Wich 773bcdd671 [package] dnsmasq: add local domain as search directive to /tmp/resolv.conf
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19086 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-01-09 21:03:48 +00:00
Jo-Philipp Wich 4cbf5257ab [PATCH] dnsmasq: Fix setting the network-id for config host sections
This renames name to networkid where applicable, and re-adds the name option for hosts.
Signed-off-by: Stefan Bethke <stb@lassitu.de>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19069 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-01-08 00:03:08 +00:00
Jo-Philipp Wich 6a19e3eb17 [package] dnsmasq:
While trying to document the dhcp UCI config, I noticed that the name config option is applied wrongly when adding static addresses. Cf. the dnsmasq man page.
Signed-off-by: Stefan Bethke <stb@lassitu.de>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18934 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-12-26 00:23:35 +00:00
Markus Wigge 5e3b96115c new upstream release 2.51 with some fixes, see
http://www.thekelleys.org.uk/dnsmasq/CHANGELOG
refreshed patches for new release


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18541 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-11-26 10:58:01 +00:00
Jo-Philipp Wich e13c38658f [package] dnsmasq: Set a list of addnhosts files.
e.g.
	list 'addnhosts' '/var/etc/hosts.olsr'
	list 'addnhosts' '/var/etc/hosts.olsrv6'
hosts.olsr for ipv4 and hosts.olsrv6 for ipv6 addresses.
Signed-off-by: Patrick Grimm <patrick@lunatiki.de>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18470 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-11-22 11:52:08 +00:00
Jo-Philipp Wich b26913c381 [package] dnsmasq:
- make "name" option in "host" sections optional and append it to -G if set,
   allows specifying hostnames for static leases without resorting to /etc/hosts
 - implement "domain" sections, allows defining arbitary host names and associated
   ptr records from uci
 - bump package revision


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17897 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-10-05 16:58:06 +00:00
Felix Fietkau 0f1c6d60f1 update dnsmasq to 2.50 (#5784)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17711 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-09-24 21:42:36 +00:00
Felix Fietkau 2432093f50 Add default /etc/dnsmasq.conf
dnsmasq allows adding of arbitrary SRV/PTR/TXT/CNAME records.
However, those options sometimes can not be passed as
command-line arguments due to excess length.  This patch tries to
solve this problem:

1. Provide /etc/dnsmasq.conf file with comments about adding
   SRV/PTR/TXT/CNAME records.
2. Add this file to conffiles list so it is preserver during
   backup/restore or system upgrade.

If someone needs a lot of custom records, default configuration
file can be edited.  Since manual pages and documentation is not
installed, provided comments should be enough to figure out
option syntax.

Signed-off-by: Alexey I. Froloff <raorn@altlinux.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17663 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-09-21 13:25:11 +00:00
Felix Fietkau 22210c9a87 dnsmasq startup script update: add notinterface parameter
This tiny patch makes the dnsmasq init.d script listen to a parameter called "notinterface", which tells dnsmasq to not listen on a defined set of interfaces.

By default dnsmasq *always* listens on the loopback interface, even if you tell it to specifically listen on a certain other interface. Sometimes this is not desirable behaviour, so you might want to turn it off. This is useful when, for example, you want to have your own DNS server listening on the loopback interface.

Signed-off-by: Johnny Halfmoon <jhalfmoon at milksnot.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17599 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-09-16 18:15:31 +00:00