Attachment 628247 Details for Bug 867054 – remove uncessary tests

[patch] remove uncessary tests

dnsmasq-gc-dhcp6fix-1.1.patch (text/plain), 2.06 KB, created by Gene Czarcinski on 2012-10-16 16:06:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gene Czarcinski

Created: 2012-10-16 16:06:42 UTC

Size: 2.06 KB

patch

obsolete

>diff -urp dnsmasq-2.63.orig-2/src/dhcp6.c dnsmasq-2.63/src/dhcp6.c
>--- dnsmasq-2.63.orig-2/src/dhcp6.c	2012-10-16 09:42:58.967321301 -0400
>+++ dnsmasq-2.63/src/dhcp6.c	2012-10-16 10:00:09.433627022 -0400
>@@ -122,15 +122,38 @@ void dhcp6_packet(time_t now)
> 
>   if (!indextoname(daemon->dhcp6fd, if_index, ifr.ifr_name))
>     return;
>-    
>-  if (!iface_check(AF_INET6, (struct all_addr *)&dest, ifr.ifr_name))
>+  {
>+    char buf[256];
>+    inet_ntop(AF_INET6, &dest.addr.addr6, buf, 255);
>+    my_syslog(LOG_INFO, _("dhcp6 packet: name = %s, addr is %s"), 
>+                          ifr.ifr_name, buf);
>+  }
>+
>+  /* first let's check to see if this device is excluded for dhcp6 service */ 
>+  if (strcmp(ifr.ifr_name, "lo")==0)
>     return;
>-  
>+ 
>   for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
>     if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
>       return;
>- 
>-  /* unlinked contexts are marked by context->current == context */
>+
>+  for (tmp = daemon->if_except; tmp; tmp = tmp->next)
>+    if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
>+      return;
>+
>+  /* we really do not care if a specified device name or a
>+   * listen-address values match ... only that this
>+   * device is not excluded and there is a dhcp-range
>+   * specified which is on the current device
>+   */
>+
>+  /* next, is this device specified as one we are interested in? */
>+  /* why is this needed? */
>+  for (tmp = daemon->if_names; tmp; tmp = tmp->next)
>+    if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
>+      tmp->used = 1;
>+
>+  /* all contexts are marked unlinked by context->current == context */
>   for (context = daemon->dhcp6; context; context = context->next)
>     {
>       context->current = context;
>@@ -142,8 +165,10 @@ void dhcp6_packet(time_t now)
>   memset(&parm.fallback, 0, IN6ADDRSZ);
>   
>   if (!iface_enumerate(AF_INET6, &parm, complete_context6))
>-    return;
>-  
>+    return; /* not ours */
>+
>+  /* this is ours, do the reply */
>+
>   lease_prune(NULL, now); /* lose any expired leases */
> 
>   port = dhcp6_reply(parm.current, if_index, ifr.ifr_name, &parm.fallback,

Actions: View | Diff

Attachments on bug 867054: 628246 | 628247 | 637482 | 637483 | 640770