Attachment 296084 Details for Bug 435131 – Change logic for detecting tap devices

[patch] Change logic for detecting tap devices

xenner-mac.patch (text/plain), 1.22 KB, created by Daniel Berrangé on 2008-02-27 16:09:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2008-02-27 16:09:29 UTC

Size: 1.22 KB

patch

obsolete

>diff -rup xenner-0.25.orig/xenner.c xenner-0.25.new/xenner.c
>--- xenner-0.25.orig/xenner.c	2008-02-01 10:59:37.000000000 -0500
>+++ xenner-0.25.new/xenner.c	2008-02-26 22:28:28.000000000 -0500
>@@ -209,7 +209,7 @@ static int tap_fd_to_name(int fd, char *
>     sock = socket(PF_INET, SOCK_STREAM, 0);
>     if (sock < 0)
> 	goto out;
>-    for (ifn = 0; ifn < 65536; ifn++) {
>+    for (ifn = 0; ifn < 65536 && ! match; ifn++) {
> 	memset(&sys, 0, sizeof(sys));
> 	sys.ifr_ifindex = ifn;
> 	if (ioctl(sock, SIOCGIFNAME, &sys) < 0) {
>@@ -220,16 +220,19 @@ static int tap_fd_to_name(int fd, char *
> 	if (ioctl(sock, SIOCGIFHWADDR, &sys) < 0)
> 	    goto out;
> 	if (0 != memcmp(tun.ifr_hwaddr.sa_data, sys.ifr_hwaddr.sa_data, 6))	    continue;
>+
>+	/* We may match on a bridge device first, so
>+	 * TUNSETPERSIST is useful sanity check to let
>+	 * us distinguish the tap device from a bridge
>+	 * even though they MAC  have same mac
>+	 */
>+	if (ioctl(fd, TUNSETPERSIST, 1) < 0)
>+	    continue;
>+
> 	/* matched */
> 	strncpy(buf, sys.ifr_name, len);
>-	match++;
>-    }
>-
>-    if (match) {
>-	/* make persist and close, so netbackd can open it by name */
>-	ioctl(fd, TUNSETPERSIST, 1);
> 	close(fd);
>-	goto out;
>+	match = 1;
>     }
> 
> out:
>Only in xenner-0.25.new: xenner.c~

Actions: View | Diff

Attachments on bug 435131: 296084