Skip to content

Commit

Permalink
dnssd should not use plug as NonOlsrIf; it should only use one iface …
Browse files Browse the repository at this point in the history 
…for this option: ap or secAp.

This should fix the dnssd bug we saw at AMC, which causes massive instability with wireless mesh links.

For testing, the nodes at LTS should be reflashed with this change, and tested in a configuration similar to AMC MagicNet, with both wired and wireless mesh links.
  • Loading branch information
Dan Staples committed Jul 6, 2013
1 parent 111c8cc commit 902f78a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions default-files/etc/hotplug.d/iface/20-olsrd
View file
Expand Up @@ -324,19 +324,16 @@ case "$(commotion state "$DEVICE" type)" in
eval `ipcalc.sh "$(uci_get_state network "$INTERFACE" ipaddr)" "$(uci_get_state network "$INTERFACE" netmask)"`
$DEBUG unset_olsrd_if $INTERFACE
$DEBUG set_olsrd_hna4 $NETWORK $NETMASK $INTERFACE
$DEBUG set_olsrd_dnssd $INTERFACE
;;
0)
$DEBUG unset_olsrd_hna4 $INTERFACE
$DEBUG unset_olsrd_dnssd $INTERFACE
$DEBUG set_olsrd_if $INTERFACE
;;
esac
;;
ifdown)
$DEBUG unset_olsrd_if $INTERFACE
$DEBUG unset_olsrd_hna4 $INTERFACE
$DEBUG unset_olsrd_dnssd $INTERFACE
;;
esac

Expand Down

3 comments on commit 902f78a

@hawkinswnaf
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked this patch and it seems to apply. However, I don't get exactly what it's doing. It does not seem to fix the case where we are selectively trying to ignore multiple NonOlsrIf's in /etc/config/olsrd, which is what I thought this was going to help with.

I did test this by doing 'ifdown plug && ifup plug' and it seems to "ignore" the plug when reconfiguring the plugin upon notification by the hotplugs. This is good!

Thanks, as always, for doing this work, Dan!

@dismantl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Be default, both plug and ap/secAp are added as NonOlsrIf's in /etc/config/olsrd. The point of this patch is to not add plug to NonOlsrIf, so that only ap/secAp will be listed as NonOlsrIf. Does that make sense? Of course, if this patch is added to a node that already has plug listed in NonOlsrIf, this won't change it. But it also won't add it by default for a newly flashed node.

Does that make sense?

@hawkinswnaf
Copy link
Collaborator

@hawkinswnaf hawkinswnaf commented on 902f78a Jul 9, 2013 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.