[Dnsmasq-discuss] dnsmasq 2.64rc2

[Simon Kelley]

On 02/12/12 01:12, Roy Marples wrote:
> Hi Simon
>
> On 01/12/2012 21:25, Simon Kelley wrote:
>> I've pushed dnsmasq-2.64rc2 at
>>
>>
>> http://www.thekelleys.org.uk/dnsmasq/release-candidates/dnsmasq-2.64rc2.tar.gz
>>
>>
>> This adds an extra check on which interfaces router advertisements go
>> out on, and the SetDomainServers DBus method. This will become 2.64
>> final very soon unless any problems are reported.
>
> This is how my original patch worked
>
> roy at uberpc:~/src/dnsmasq-2.64rc2$ sudo resolvconf -u
> + dbus-send --system --dest=uk.org.thekelleys.dnsmasq
> /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetDomainServers
> array:string:/marples.name/10.73.0.1/2a01:348:31:2:209:5bff:fe84:887d/fe80::82ee:73ff:fe04:74ce%eth0
>
> + set +x
> roy at uberpc:~/src/dnsmasq-2.64rc2$ sudo tail /var/log/syslog
> Dec 1 23:34:41 uberpc dhcpcd-dbus: event on interface eth0 (RENEW6)
> Dec 1 23:35:01 uberpc dhcpcd-dbus: event on interface eth0 (ROUTERADVERT)
> Dec 1 23:35:10 uberpc dnsmasq[28398]: read /etc/hosts - 7 addresses
> Dec 1 23:35:10 uberpc dnsmasq[28398]: setting upstream servers from DBus
> Dec 1 23:35:10 uberpc dnsmasq[28398]: using nameserver
> fe80::82ee:73ff:fe04:74ce%eth0#53 for domain
> 2a01:348:31:2:209:5bff:fe84:887d
> Dec 1 23:35:10 uberpc dnsmasq[28398]: using nameserver
> fe80::82ee:73ff:fe04:74ce%eth0#53 for domain 10.73.0.1
> Dec 1 23:35:10 uberpc dnsmasq[28398]: using nameserver
> fe80::82ee:73ff:fe04:74ce%eth0#53 for domain marples.name
> Dec 1 23:35:10 uberpc dnsmasq[28398]: using nameserver 10.73.0.1#53
> Dec 1 23:35:10 uberpc dnsmasq[28398]: using nameserver
> 2a01:348:31:2:209:5bff:fe84:887d#53
> Dec 1 23:35:10 uberpc dnsmasq[28398]: using nameserver
> fe80::82ee:73ff:fe04:74ce%eth0#53
>
> As you can see, the result now isn't what is expected.
> Soooo, I looked at the patch
>
> roy at uberpc:~/src/dnsmasq-2.64rc2$ sudo resolvconf -u
> + dbus-send --system --dest=uk.org.thekelleys.dnsmasq
> /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetDomainServers
> array:string:/marples.name/10.73.0.1,/marples.name/2a01:348:31:2:209:5bff:fe84:887d,/marples.name/fe80::82ee:73ff:fe04:74ce%eth0
>
> + set +x
> roy at uberpc:~/src/dnsmasq-2.64rc2$ sudo tail /var/log/syslog
> Dec 1 23:49:29 uberpc dhcpcd[4078]: eth0: leased 10.73.0.30 for 300 seconds
> Dec 1 23:49:29 uberpc dhcpcd-dbus: event on interface eth0 (RENEW)
> Dec 1 23:49:50 uberpc dnsmasq[28791]: read /etc/hosts - 7 addresses
> Dec 1 23:49:50 uberpc dnsmasq[28791]: setting upstream servers from DBus
> Dec 1 23:49:50 uberpc dnsmasq[28791]: using nameserver
> fe80::82ee:73ff:fe04:74ce%eth0#53
> Dec 1 23:49:50 uberpc dnsmasq[28791]: using nameserver
> 2a01:348:31:2:209:5bff:fe84:887d#53
> Dec 1 23:49:50 uberpc dnsmasq[28791]: using nameserver 10.73.0.1#53
> Dec 1 23:49:50 uberpc dnsmasq[28791]: using nameserver 10.73.0.1#53 for
> domain marples.name
> Dec 1 23:49:50 uberpc dnsmasq[28791]: using nameserver
> 2a01:348:31:2:209:5bff:fe84:887d#53 for domain marples.name
> Dec 1 23:49:50 uberpc dnsmasq[28791]: using nameserver
> fe80::82ee:73ff:fe04:74ce%eth0#53 for domain marples.name
> roy at uberpc:~/src/dnsmasq-2.64rc2$
>
> At little more convoluted, but at least it works now, thanks.

Either makes sense, but since my choice matches the existing 
config-file, I think that's better. I have to confess I hadn't realised 
I was changing the semantics of your patch; it's easier for me to write 
string-banging code in C from scratch than understand existing code (my 
own or someone else's) and I just assumed you'd do it the way I did when 
I generalised the SetDomainEx code.  I even documented the new method!


>
> I find it a little odd that every resolver configuration I know of
> configures a domain with resolvers, but this interface expects a
> resolver with a list of domains.
> But heh ho I just want this to work.
>
> I'll push out an updated openresolv once your dnsmasq is out of rc.
>
Good stuff.


Cheers,

Simon.