dnsmasq: Fix issues observed while toggling tethering

- When an instantaneous tether and untether command are issued,
  the dnsmasq operation of tether happens after the interface
  has been brought down by the untether command and hence
  tethering goes into bad state. The fix is to leave dnsmasq
  running so that it can be killed later by the untether command.
- dnsmasq does not update its list of listeners with the new
  interface object whenver an interface goes up/down and hence
  when we free the old interface objects, the interface info in
  dnsmasq listeners is lost. This fix makes sure the listeners
  are updated with the new interface object

CRs-fixed: 665103
Change-Id: I0322619edc12146c67fa7a308769e3b9f0779654

1 files changed, 16 insertions, 1 deletions

diff --git a/src/network.c b/src/network.c
index f2ccf34..6a8a433 100755..100644
--- a/src/network.c
+++ b/src/network.c
@@ -961,7 +961,7 @@ void set_interfaces(const char *interfaces)
 
     for (if_tmp = daemon->if_names; if_tmp; if_tmp = if_tmp->next) {
         if (if_tmp->name && !if_tmp->used) {
-            die(_("unknown interface given %s in set_interfaces: %s"), if_tmp->name, EC_BADNET);
+            my_syslog(LOG_DEBUG, _("unknown interface given %s in set_interfaces"), if_tmp->name);
         }
     }
     /* success! - setup to free the old */
@@ -986,6 +986,21 @@ void set_interfaces(const char *interfaces)
 
         close_bound_listener(old_iface);
       }
+      else
+      {
+        struct listener **l, *listener;
+        for (l = &(daemon->listeners); *l; l = &((*l)->next)) {
+          struct irec *listener_iface = (*l)->iface;
+          if (listener_iface && new_iface) {
+            if (sockaddr_isequal(&listener_iface->addr, &new_iface->addr)) {
+              break;
+            }
+          }
+        }
+        listener = *l;
+        if ( listener )
+          listener->iface = new_iface;
+      }
     }
 
     /* remove wildchar listeners */