1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-17 01:38:06 +02:00
Commit Graph

85 Commits

Author SHA1 Message Date
jow
a11747db11 package/dnsmasq: allow /etc/config/dhcp to specify --address arguments
Add a config list to the 'config dnsmasq' section to specify fixed DNS
addresses.

For example:

  config dnsmasq:
	[snip]
	list address '/example.com/192.168.0.1'

will result in the argument '-A /example.com/192.168.0.1' to the dnsmasq
options. This configures dnsmasq to return the specified IP for any
queries to '*.example.com' names.

Useful for overriding lookups to a range of DNS names.

[jow: "append args" -> "xappend", "-A" -> "--address"]

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32624 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-07-05 17:54:14 +00:00
jow
119481db57 Add local TTL option to dnsmasq
-T, --local-ttl=<time>
    When replying with information from /etc/hosts or the DHCP leases
file dnsmasq by default sets the time-to-live field to zero, meaning
that the requestor should not itself cache the information. This is
the correct thing to do in almost all situations. This option allows a
time-to-live (in seconds) to be given for these replies. This will
reduce the load on the server at the expense of clients using stale
data under some circumstances.

[jow: change -T to --local--ttl to conform with the other options]

Signed-off-by: Andrew Byrne <openwrt@andy.id.au>

openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32623 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-07-05 17:46:32 +00:00
jow
8b203dc527 [package] dnsmasq: introduce "add_local_hostname" and "add_local_domain" options
- add_local_domain defaults to 1 and controls whether the local domain is written as search directive to the local resolv.conf
 - add_local_hostname defaults to 1 and controls whether A and PTR records are created automatically for the local hostname
These change supersedes http://patchwork.openwrt.org/patch/2207/ and http://patchwork.openwrt.org/patch/2208/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32570 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-07-01 11:32:46 +00:00
jow
3a1e1be03a package/dnsmasq: permit UCI configuration of --dhcp-fqdn option
This adds a new boolean option, fqdn, to the "config dnsmasq" section of
/etc/config/dhcp. The default is off. When set on, it enables the dhcp-fqdn
option to dnsmasq. dhcp-fqdn causes dnsmasq's DNS server to not resolve
unqualifed local hostnames. The "domain" option is required when using "fqdn".
Local hostnames will remain available for lookup using fully-qualified names.

Signed-off-by: Mark Mentovai <mark@moxienet.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32569 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-07-01 11:32:45 +00:00
jow
2caf3c66a2 [PATCH 1/4] package/dnsmasq: permit dhcp_option in global dnsmasq config section
dnsmasq currently permits dhcp_options to be specified only in "config dhcp"
sections of /etc/config/dhcp. When dnsmasq is providing DHCP service for
multiple subnets and there are multiple "config dhcp" sections without "option
ignore", it makes sense to allow dhcp_options that should apply globally in
the "config dnsmasq" section of /etc/config/dhcp. dhcp_option is a list option.

[jow: rework patch to apply after dhcp-option-force handling got introduced]

Signed-off-by: Mark Mentovai <mark@moxienet.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32568 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-07-01 11:32:29 +00:00
jow
323f8e06f6 dnsmasq: allow forcing options
The option 'force' when set to '1' will transform a dhcp-option to dhcp-option-force instead in the config.

This is useful for forcing options to be sent back to a client (even options it didn't ask for).

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31816 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-19 20:17:56 +00:00
jow
be8007e076 dnsmasq: add support for set: and tag: pairs
On my network, I have a variety of machines and appliances, some of which need different configuration issues than the default options.

For example:

config host
	option name 'client'
	option mac '00:01:02:03:04:05'
	option ip '192.168.1.20'
	option tag 'acme'

config tag acme
	option force '1'
	list dhcp_option 'option:router,192.168.1.253'
	list dhcp_option 'option:domain-name,acme.com'
	list dhcp_option 'option:domain-search,acme.com,redfish-solutions.com'

which allows me to override the default router for my client's host, as well as its domain-name, and its domain-search.

this causes the following config lines:

dhcp-host=00:01:02:03:04:05,set:acme,192.168.1.20,client
dhcp-option-force=tag:acme,option:router,192.168.1.253
dhcp-option-force=tag:acme,option:domain-name,acme.com
dhcp-option-force=tag:acme,option:domain-search:acme.com,redfish-solutions.com

This could be useful elsewhere, for instance, if you have an IP CCTV that you don't want to have a default-route, etc.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31815 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-19 20:17:54 +00:00
jow
ba344a5eae [package] dnsmasq: fix parsing of mx record options (#11365)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31814 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-19 20:17:19 +00:00
jow
1018d3d279 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
jow
322039038f [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
jow
a727e68c1f 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
jow
a3026e2fae 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
jow
a19c8df6f7 [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
nico
4097f52f4c 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
thepeople
0f5bb7640c 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
jow
2a521b9016 [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
nbd
15fba44a5b 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
jow
f51d8a8dcb 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
acinonyx
22020afec8 [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
nbd
5e1086da2d 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
jow
9e660acd6b [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
jow
f2f016ef99 [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
nico
b66f4d463b 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
acinonyx
d9deabc7be [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
jow
07f6449545 [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
jow
8b5fd9705c [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
nico
6da348ee27 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
jow
70f06b0258 [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
noz
e6d4343455 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
jow
da949dac34 [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
jow
9563033de3 [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
jow
ddaa3d81f2 [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
thepeople
78b9f1dc6f 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
thepeople
3243b6b119 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
thepeople
1f2f21c1d0 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
jow
1deca27073 [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
jow
c4afa41a73 [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
jow
55b521b406 [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
jow
06c76b2102 [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
jow
c05762dd88 [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
jow
a143751bb5 [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
jow
8494bd7c5a [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
jow
91312f560f [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
jow
ad7c749604 [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
nbd
5949fd8b7c 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
jow
33def2ea04 [package] dnsmasq: add option to specify dhcp-hostsfile (#5079)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15747 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-09 22:34:04 +00:00
markus
c66b290e54 fixed dnsmasq init for "ignore" option
dnsmasq.init tried to set range options even when ignore was
set to "1". Now the functions stops processing after evaluating
the "ignore" option when the result is > 0


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15618 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-05 11:00:00 +00:00
markus
1ea23f0d51 changed "option" to "list" for binding interfaces
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15613 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-05 09:33:56 +00:00
jow
43e3feff80 [package] dnsmasq: add more options for interface binding (#4900)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15172 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-04-09 14:51:15 +00:00
jow
64b2ab7e62 [package] make "name" parameter optional in dnsmasq "boot" config sections
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14557 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-02-18 22:00:36 +00:00