Commit Graph

32 Commits (2dfb3a4f2a41a936f1f2b58e63388c48fc890355)

Author SHA1 Message Date
John Crispin 93a958ff11 dnsmasq: Make the --dhcp-host logic easier to understand
Use an if/else statement to cover the two different syntaxes.  Add
comments explaining what the end results should look like.

This patch should not change the script's output.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42320 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-28 06:27:57 +00:00
John Crispin 2abc3f33e5 dnsmasq: Fix hosts file format when MAC address is not specified
An entry like this in /etc/config/dhcp:

    config 'host'
        option 'name' 'pc2'
        option 'ip' '192.168.100.56'
        option 'dns' '1'

results in a /tmp/hosts/dhcp entry that looks like this:

    192.168.100.56 .lan

Obviously it should say "pc2.lan".

This happens because $name is set to "" in order to support the MAC-less
syntax: "--dhcp-host=lap,192.168.0.199".  Fix this by reordering the
operations.  Also, refuse to add a DNS entry if the hostname or IP is
missing.

Fixes #17683

Reported-by: Kostas Papadopoulos <kpapad75@travelguide.gr>
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42319 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-28 06:27:53 +00:00
John Crispin 299986df60 dnsmasq: Create rDNS records for LuCI "Hostnames"
LuCI creates "domain" UCI config sections, which the dnsmasq init file
then, currently, translates into "address" config lines. This is not
the correct usage of "address" (see r36943), and also causes rDNS
records to not be created. This patches dnsmasq.init to utilize the
additional hosts file introduced in r40799 for such domain names,
resolving both issues.

Signed-off-by: Tyler Fenby <tylerf@securecominc.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42318 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-28 06:27:49 +00:00
Steven Barth 5401347fda dnsmasq: fix a race condition possibly leading to lockup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42225 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-20 09:52:29 +00:00
Steven Barth bb96082ca0 dnsmasq: respect option dhcpv4 disabled in dhcp-config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42216 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-19 05:58:44 +00:00
Steven Barth 3b59de8bc7 dnsmasq: use config_get_bool for dnsmasq
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41302 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-22 15:34:36 +00:00
Steven Barth 5691e7e3ec dnsmasq: set procd respawn
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41297 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-22 09:08:14 +00:00
Steven Barth f439aef6cd dnsmasq: removing nettle 3.0 support due to nettle downgrade
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41264 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 17:06:37 +00:00
Steven Barth 12b41b0c5f dnsmasq: compatibility with nettle 3.0
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41249 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:47 +00:00
Steven Barth 3d5f483474 dnsmasq: various house-keeping updates
* Add Authoritative DNS and IPSET to full variant
* Remove some bloat from IPSET support
* Reintroduce "DHCP no address warning"-patch

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41246 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:34 +00:00
Steven Barth 15646b2175 dnsmasq: add UCI DNSSEC runtime support
Ship keys for the root zone and add two uci options to enable
DNSSEC checks:

Option 'dnssec': Activate DNSSEC validation
Option 'dnsseccheckunsigned': Ensure answers without DNSSEC are in
unsigned zones.

Signed-off-by: Andre Heider <a.heider@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41245 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:29 +00:00
Steven Barth 10cb433539 dnsmasq: Add a full variant
This variant includes support for DHCPv6 and DNSSEC.
DNSSEC adds a dependency on libnettle.

Signed-off-by: Andre Heider <a.heider@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41244 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:25 +00:00
Steven Barth 01a531434d dnsmasq: add upstream patch to build against libnettle-mini
Signed-off-by: Andre Heider <a.heider@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41243 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:21 +00:00
Steven Barth 251afc0c34 dnsmasq: respect target's LDFLAGS
Append local flags, don't overwrite.

Signed-off-by: Andre Heider <a.heider@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41242 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:17 +00:00
Steven Barth 06e56f40f6 dnsmasq: use COPTS for compile time options
As documented in config.h.
Doing otherwise will break dnsmasq's pkg-wrapper script to find its
libs to link to.

Signed-off-by: Andre Heider <a.heider@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41241 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:02 +00:00
Steven Barth bc66a52c45 dnsmasq: bump to 2.71
dnsmasq: bump to 2.71

this is a bugfix-release, see
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2014q2/008538.html

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40803 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-20 11:44:33 +00:00
Florian Fainelli e99cb3cbf6 dnsmasq: Allow creating static DNS entries from static lease entries
DHCP entries in /etc/config/dhcp will not automatically create A or PTR
records.  Add an "option dns" directive which appends an entry to
/tmp/hosts/dhcp to facilitate forward and reverse DNS lookups.  For
instance, this item:

    config host
            option ip       '192.168.0.10'
            option mac      '00:13:57:9b:df:02'
            option name     'winpc'
            option dns      '1'

will add a corresponding entry to /tmp/hosts/dhcp:

    192.168.0.10 winpc.lan

This keeps the hostname/IP/MAC in a single place, for easy maintenance.

Related: ticket #13854 reports an regression involving missing PTR
records when using "config domain" to define static DNS entries for
individual hosts.  However, per Simon Kelley[1], the --address feature
used by "config domain" was never intended to generate DNS A records for
hosts.  It would probably be better for the reporter to apply this patch,
and then use "config host" sections instead of "config domain" sections.

[1] http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2008q4/002498.html

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40799 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-20 05:00:28 +00:00
Steven Barth bfaa1ec952 dnsmasq: bump to 2.7.0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40759 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-14 07:02:17 +00:00
Steven Barth 39ecf08d2d dnsmasq: add dnsmasq.d config folder & improve odhcpd coexistence
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39312 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-17 14:00:09 +00:00
Jo-Philipp Wich da833133d3 dnsmasq: rework init procedure
- cache udhcp check results to speed up subsequent reloads
	- enable procd file tracking for /var/etc/dnsmasq.conf to only reload service if needed
	- implement reload action to only restart dnsmasq if /var/etc/dnsmasq.conf actually changed
	- launch dnsmasq from interface hotplug to avoid race conditions with network bringup

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39152 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-21 13:31:28 +00:00
Jo-Philipp Wich 0005aadc83 dnsmasq: switch to /lib/functions/network.sh
This commit changes the dnsmasq init script to use the interface
status exposed by netifd. The old references to scan_interfaces()
and (indirect) accesses to uci state variables are removed and
replaced with corresponding network_*() calls.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39101 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-16 16:47:41 +00:00
Jo-Philipp Wich a193e1c1eb dnsmasq: fix backward compatibility with existing configs
Changeset r36943 ("dnsmasq: use host-record instead of address") removed
the automatic domain expansion for config domain sections, this breaks
existing setups and alters the old behaviour in unexpected ways, therfore
restore behaviour of the current stable release.

Additionally handle fully qualified hostnames properly when setting up the
own hostrecord by stripping the local domain part form the given name
instead of unconditionally appending it, so that "example.lan" results
in "example example.lan" and not "example.lan example.lan.lan".

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38648 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-04 22:40:56 +00:00
Jo-Philipp Wich c081113e44 dnsmasq: add option broadcast to host sections
There are certain consumer devices which are outliers in protocol conformance.
An example is Samsung bluray players, which require broadcast DHCP responses
(on Ethernet only, strangely not on Wifi).

By specifying:

config host
	...
	option broadcast 1

this will enable the response to be sent as an Ethernet broadcast and not as
a unicast.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-11 18:33:15 +00:00
Luka Perkov cebf051302 [package] fix various init scripts
Changes include:

* removing unused variables
* replacing spaces with tabs where appropriate
* more consistency with variable declarations

Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38142 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-23 21:58:36 +00:00
John Crispin d330d9fac4 procd: convert various packages to procd style init.d scripts
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38023 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-17 21:45:30 +00:00
Jo-Philipp Wich bf4c0b1b8a dnsmasq: use host-record instead of address
Using "--address" for individual host A records is broken, use "--host-record" instead.
The following patch changes dnsmasq.init to build individual host records using "--host-record" instead of "--address".

Signed-off-by: Adam Gensler <openwrt at gnslr.us>

[jow: shorter description, simplified shell script code]

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36943 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-17 11:55:30 +00:00
Steven Barth b846672f60 dnsmasq: add directory for external hosts-files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36655 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-17 14:44:12 +00:00
Steven Barth 47fcfd999d add uci support for "proxy-dnssec" in dnsmasq
This patch simply adds support for the "--proxy-dnssec" command in dnsmasq into the init file so it can be used with /etc/config/dhcp.

Signed-off-by: Adam Gensler <openwrt@kristenandadam.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36570 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-07 07:19:51 +00:00
Steven Barth b97eb9b08e dnsmasq: update to 2.66
Thanks to Christoph König for patches.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36412 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-24 05:55:39 +00:00
Jo-Philipp Wich 64324ccfca dnsmasq: allow dhcp host entries without mac addresses (#11928)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34971 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-02 15:14:19 +00:00
Hamish Guthrie a81ef914e0 licensing: Add licensing metadata to many packages
Two new variables are introduces to many packages, namely PKG_LICENSE and
PKG_LICENSE_FILES - there may be more than one license applied to packages,
and these are listed in the PKG_LICENSE variable and separated by spaces.
All relevant license files are also added to the PKG_LICENSE_FILES variable,
also space separated.

The licensing metadata is put into the bin/<platform>/packages/Packages file
for later parsing. A script for that is on it's way!


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33861 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-19 15:34:28 +00:00
Felix Fietkau abe70b1494 packages: sort network related packages into package/network/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33688 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-10 12:32:29 +00:00