Attachment 592634 Details for Bug 833033 – Use SO_BINDTODEVICE in make_sock()

[patch] Use SO_BINDTODEVICE in make_sock()

dnsmasq-bindtodevice.patch (text/plain), 3.04 KB, created by David Woodhouse on 2012-06-18 12:59:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2012-06-18 12:59:10 UTC

Size: 3.04 KB

patch

obsolete

>--- dnsmasq-2.59/src/network.c~	2011-10-08 16:06:46.000000000 +0100
>+++ dnsmasq-2.59/src/network.c	2012-06-18 13:52:33.018098066 +0100
>@@ -360,7 +360,7 @@ int fix_fd(int fd)
>   return 1;
> }
> 
>-static int make_sock(union mysockaddr *addr, int type, int dienow)
>+static int make_sock(union mysockaddr *addr, int type, int dienow, const char *bind_if)
> {
>   int family = addr->sa.sa_family;
>   int fd, rc, opt = 1;
>@@ -388,6 +388,10 @@ static int make_sock(union mysockaddr *a
>       return -1;
>     }	
> 
>+  if (bind_if &&
>+      setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, bind_if, strlen(bind_if)) == -1)
>+	  goto err;
>+
>   if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || !fix_fd(fd))
>     goto err;
>   
>@@ -449,15 +453,15 @@ static int make_sock(union mysockaddr *a
>   return fd;
> }
>       
>-static struct listener *create_listeners(union mysockaddr *addr, int do_tftp, int dienow)
>+static struct listener *create_listeners(union mysockaddr *addr, int do_tftp, int dienow, const char *bind_if)
> {
>   struct listener *l = NULL;
>   int fd = -1, tcpfd = -1, tftpfd = -1;
> 
>   if (daemon->port != 0)
>     {
>-      fd = make_sock(addr, SOCK_DGRAM, dienow);
>-      tcpfd = make_sock(addr, SOCK_STREAM, dienow);
>+      fd = make_sock(addr, SOCK_DGRAM, dienow, bind_if);
>+      tcpfd = make_sock(addr, SOCK_STREAM, dienow, bind_if);
>     }
>   
> #ifdef HAVE_TFTP
>@@ -468,7 +472,7 @@ static struct listener *create_listeners
> 	  /* port must be restored to DNS port for TCP code */
> 	  short save = addr->in.sin_port;
> 	  addr->in.sin_port = htons(TFTP_PORT);
>-	  tftpfd = make_sock(addr, SOCK_DGRAM, dienow);
>+	  tftpfd = make_sock(addr, SOCK_DGRAM, dienow, bind_if);
> 	  addr->in.sin_port = save;
> 	}
> #  ifdef HAVE_IPV6
>@@ -476,7 +480,7 @@ static struct listener *create_listeners
> 	{
> 	  short save = addr->in6.sin6_port;
> 	  addr->in6.sin6_port = htons(TFTP_PORT);
>-	  tftpfd = make_sock(addr, SOCK_DGRAM, dienow);
>+	  tftpfd = make_sock(addr, SOCK_DGRAM, dienow, bind_if);
> 	  addr->in6.sin6_port = save;
> 	}  
> #  endif
>@@ -510,7 +514,7 @@ void create_wildcard_listeners(void)
>   addr.in.sin_addr.s_addr = INADDR_ANY;
>   addr.in.sin_port = htons(daemon->port);
> 
>-  l = create_listeners(&addr, tftp_enabled, 1);
>+  l = create_listeners(&addr, tftp_enabled, 1, NULL);
> 
> #ifdef HAVE_IPV6
>   memset(&addr, 0, sizeof(addr));
>@@ -522,9 +526,9 @@ void create_wildcard_listeners(void)
>   addr.in6.sin6_port = htons(daemon->port);
>   
>   if (l) 
>-    l->next = create_listeners(&addr, tftp_enabled, 1);
>+    l->next = create_listeners(&addr, tftp_enabled, 1, NULL);
>   else 
>-    l = create_listeners(&addr, tftp_enabled, 1);
>+    l = create_listeners(&addr, tftp_enabled, 1, NULL);
> #endif
> 
>   daemon->listeners = l;
>@@ -537,7 +541,7 @@ void create_bound_listeners(int dienow)
> 
>   for (iface = daemon->interfaces; iface; iface = iface->next)
>     if (!iface->done && !iface->dad && 
>-	(new = create_listeners(&iface->addr, iface->tftp_ok, dienow)))
>+	(new = create_listeners(&iface->addr, iface->tftp_ok, dienow, iface->name)))
>       {
> 	new->iface = iface;
> 	new->next = daemon->listeners;

Actions: View | Diff

Attachments on bug 833033: 592634 | 640706