From: Volker Lendecke <vl@samba.org>
Date: Mon, 7 Feb 2011 16:17:26 +0000 (+0100)
Subject: s3: Eliminate sys_select from do_smb_browse() -- untested
X-Git-Tag: tevent-0.9.11~246
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=b28a2e519a0f36da800b0fdab295c1875401ac84;p=samba.git

s3: Eliminate sys_select from do_smb_browse() -- untested
---

diff --git a/source3/client/dnsbrowse.c b/source3/client/dnsbrowse.c
index 5e3a4de9cff..c62f27beeaa 100644
--- a/source3/client/dnsbrowse.c
+++ b/source3/client/dnsbrowse.c
@@ -23,6 +23,7 @@
 #ifdef WITH_DNSSD_SUPPORT
 
 #include <dns_sd.h>
+#include "system/select.h"
 
 /* Holds service instances found during DNS browse */
 struct mdns_smbsrv_result
@@ -155,7 +156,6 @@ int do_smb_browse(void)
 	int mdnsfd;
 	int fdsetsz;
 	int ret;
-	fd_set *fdset = NULL;
 	struct mdns_browse_state bstate;
 	struct mdns_smbsrv_result *resptr;
 	struct timeval tv;
@@ -177,24 +177,14 @@ int do_smb_browse(void)
 
 	mdnsfd = DNSServiceRefSockFD(mdns_conn_sdref);
 	for (;;)  {
-		if (fdset != NULL) {
-			TALLOC_FREE(fdset);
-		}
-
-		fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
-		fdset = TALLOC_ZERO(ctx, fdsetsz);
-		FD_SET(mdnsfd, fdset);
-
-		tv.tv_sec = 1;
-		tv.tv_usec = 0;
+		int revents;
 
-		/* Wait until response received from mDNS daemon */
-		ret = sys_select(mdnsfd + 1, fdset, NULL, NULL, &tv);
+		ret = poll_one_fd(mdnsfd, POLLIN|POLLHUP, &revents, 1000);
 		if (ret <= 0 && errno != EINTR) {
 			break;
 		}
 
-		if (FD_ISSET(mdnsfd, fdset)) {
+		if (revents & (POLLIN|POLLHUP|POLLERR)) {
 			/* Invoke callback function */
 			if (DNSServiceProcessResult(mdns_conn_sdref)) {
 				break;