s3: Eliminate sys_select from do_smb_browse() -- untested
authorVolker Lendecke <vl@samba.org>
Mon, 7 Feb 2011 16:17:26 +0000 (17:17 +0100)
committerVolker Lendecke <vlendec@samba.org>
Mon, 28 Feb 2011 15:40:19 +0000 (16:40 +0100)
source3/client/dnsbrowse.c

index 5e3a4de9cff03afb16397a8a6ee03d0579d87326..c62f27beeaa622da6461ee592e0257996a9a1bb4 100644 (file)
@@ -23,6 +23,7 @@
 #ifdef WITH_DNSSD_SUPPORT
 
 #include <dns_sd.h>
 #ifdef WITH_DNSSD_SUPPORT
 
 #include <dns_sd.h>
+#include "system/select.h"
 
 /* Holds service instances found during DNS browse */
 struct mdns_smbsrv_result
 
 /* 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;
        int mdnsfd;
        int fdsetsz;
        int ret;
-       fd_set *fdset = NULL;
        struct mdns_browse_state bstate;
        struct mdns_smbsrv_result *resptr;
        struct timeval tv;
        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 (;;)  {
 
        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 (ret <= 0 && errno != EINTR) {
                        break;
                }
 
-               if (FD_ISSET(mdnsfd, fdset)) {
+               if (revents & (POLLIN|POLLHUP|POLLERR)) {
                        /* Invoke callback function */
                        if (DNSServiceProcessResult(mdns_conn_sdref)) {
                                break;
                        /* Invoke callback function */
                        if (DNSServiceProcessResult(mdns_conn_sdref)) {
                                break;