dnsmasq: Add EDNS0 Upstream support

[schuettecarsten]

Forward client mac address and subnet on dns queries. Pi-hole and Adguard use this feature to send the originators ip address/subnet so it can be logged and not just the nat address of the router. This feature has been added since version 2.56 of dnsmasq and would be nice to expose this feature in openwrt.

This replaces #14349 which is not updated by the original author.

Supported options:

addmac - already supported and unchanged
stripmac (bool) - will add --strip_mac
addsubnet - will add --add-subnet=<value>
stripsubnet (bool) - will add --strip_subnet

Patch for luci is openwrt/luci#7198

[schuettecarsten]

@systemcrash We had have a discussion on the previous PR, please review the new PR. Thank you.

[rany2]

You also need to squash your commits and reword the commit to have a commit message body. You can use your PR description.

[schuettecarsten]

You also need to squash your commits and reword the commit to have a commit message body. You can use your PR description.

Thank you, I missed that. Updated again.

[systemcrash]

How about..... this?

	config_get add_mac "$cfg" add_mac
	[ -n "$add_mac" ] && xappend "--add-mac${add_mac:+=$add_mac}"

[rany2]

Drop add-mac, it's already supported:

openwrt/package/network/services/dnsmasq/files/dnsmasq.init

Lines 1116 to 1120 in 55df023

	config_get addmac "$cfg" addmac 0
	[ "$addmac" != "0" ] && {
	[ "$addmac" = "1" ] && addmac=
	xappend "--add-mac${addmac:+="$addmac"}"
	}

[systemcrash]

Absolutely right.

[schuettecarsten]

Drop add-mac, it's already supported:

Interesting. As it's written addmac there and my parameter is add_mac and the others are drop_mac, add_subnet, drop_subnet, should I rename my new options to addsubnet, dropmac and dropsubnet?

[systemcrash]

If you're first, you get to call dibs. But following some accepted convention is generally appreciated and makes for greater consistency.

[schuettecarsten]

This PR and the Luci PR updated.

[rany2]

You also need to squash your commits and reword the commit to have a commit message body. You can use your PR description.

BTW this is still not addressed, you need to add a commit message for the test to pass.

[schuettecarsten]

Any idea what I can do to get this merged?

[systemcrash]

Keep making noise, I guess.

Seek reviews from those with commit perms also helps.

[schuettecarsten]

@hauke @robimarko @jow- @Ansuel
Can you please review this PR and the associates Luci PR? It would be great if this could be merged.

[robimarko]

@schuettecarsten I cant review this as I have no idea about dnsmasq internals

[wehagy]

Works for me.

I implemented EDNS0 on my dns server recently, using the addmac option that already exists and confdir pointing to a file with the line add-subnet=32,128, I thought about adding these native options in openwrt and opening a PR, but to my surprise someone already did it, and it works correctly for me.

My repo with my automated build can be see here:

• https://github.com/wehagy/openwrt-builder

And my artifacts here:

• https://github.com/wehagy/openwrt-builder/actions/runs/10521133554

[castillofrancodamian]

Would this feature allow AdGuardHome and Pi-Hole to receive the IP and hostname and not have OpenWrt act as an intermediary?

[wehagy]

Would this feature allow AdGuardHome and Pi-Hole to receive the IP and hostname and not have OpenWrt act as an intermediary?

Yes, but receive IP and/or MAC, the hostname you need to set manually or have AdGuardHome/Pi-Hole ask your router

[robimarko]

Thanks! Rebased on top of main and merged!