[Dnsmasq-discuss] Patches: Extend --bridge-interface aliasing to DHCPv6 and Router Advertisements

Neil Jerram Neil.Jerram at metaswitch.com
Wed Jun 10 10:57:27 BST 2015


On 10/06/15 10:47, Neil Jerram wrote:
> On 10/06/15 10:15, Neil Jerram wrote:
>> On 09/06/15 22:11, Simon Kelley wrote:
>>> A couple of (very small quibbles)
>>>
>>> -                    /* The source interface can only appear in at most
>>> -                       one --bridge-interfaces. */
>>> +                    /* The source interface! can only appear in at most
>>> +                       one --bridge-interface. */
>>>
>>> Why does the interface get an exclamation mark? That's a typo? (I
>>> probably only saw this because it's at the end)
>>>
>>> second, the DHCPv4 code for the bridging  looks like this.
>>>
>>>   for (bridge = daemon->bridges; bridge; bridge = bridge->next)
>>>      {
>>>        for (alias = bridge->alias; alias; alias = alias->next)
>>>          if (wildcard_matchn(alias->iface, ifr.ifr_name, IF_NAMESIZE))
>>>            {
>>>              if (!(iface_index = if_nametoindex(bridge->iface)))
>>>                {
>>>                  my_syslog(LOG_WARNING, _("unknown interface %s in
>>> bridge-interface"), ifr.ifr_name);
>>>                  return;
>>>                }
>>>              else
>>>                {
>>>                  strncpy(ifr.ifr_name,  bridge->iface, IF_NAMESIZE);
>>>                  break;
>>>                }
>>>            }
>>>
>>>        if (alias)
>>>          break;
>>>
>>>
>>>
>>> which is wrong: the log message should be logging bridge->iface, not
>>> ifr.ifr_name, but at least it does warn you when you do
>>>
>>> --bridge-interface = somenonexistinginterface, alias
>>>
>>> and therefore it's throwing away you DHCP packets.
>>>
>>> The DHCPv6 code should implement that warning too.
>>>
>>> I've been threatening a 2.73 release for so long that people have
>>> stopped believing me, but the ducks do seem to be almost in a row, so
>>> getting this finished soon would be good, if it's to go in.
>>
>> Many thanks, Simon, I'll work on these remaining points immediately.
>> Would you prefer the deltas for them to be as additional patches, or to
>> have the patch set regenerated with the required deltas incorporated at
>> the appropriate places?
>
> Here are the deltas to address those points.

Alternatively, here is the whole patch set again, regenerated so as to 
incorporate those deltas at the appropriate places.

Many thanks for your time looking at these enhancements.

Regards,
	Neil


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-dhcp.c-Log-correct-bridge-interface-name-when-if_nam.patch
Type: text/x-patch
Size: 783 bytes
Desc: not available
URL: <http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/attachments/20150610/b0820021/attachment-0007.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-dhcp.c-Add-MS_DHCP-to-log-about-unrecognized-bridge-.patch
Type: text/x-patch
Size: 802 bytes
Desc: not available
URL: <http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/attachments/20150610/b0820021/attachment-0008.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Implement-aliasing-idea-per-bridge-interfaces-for-DH.patch
Type: text/x-patch
Size: 2213 bytes
Desc: not available
URL: <http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/attachments/20150610/b0820021/attachment-0009.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-Allow-configuration-of-on-link-L-bit-in-Router-Adver.patch
Type: text/x-patch
Size: 3228 bytes
Desc: not available
URL: <http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/attachments/20150610/b0820021/attachment-0010.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-Implement-aliasing-idea-per-bridge-interfaces-for-so.patch
Type: text/x-patch
Size: 4169 bytes
Desc: not available
URL: <http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/attachments/20150610/b0820021/attachment-0011.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0006-Implement-aliasing-for-unsolicited-router-advertisem.patch
Type: text/x-patch
Size: 5103 bytes
Desc: not available
URL: <http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/attachments/20150610/b0820021/attachment-0012.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0007-Documentation-for-IPv6-enhancements.patch
Type: text/x-patch
Size: 8404 bytes
Desc: not available
URL: <http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/attachments/20150610/b0820021/attachment-0013.bin>


More information about the Dnsmasq-discuss mailing list