Changeset 740 for vendor/current/source3/client/dnsbrowse.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/client/dnsbrowse.c (modified) (5 diffs)

vendor/current/source3/client/dnsbrowse.c

@@ -24 +24 @@
 
 #include <dns_sd.h>
+#include "system/select.h"
 
 /* Holds service instances found during DNS browse */
@@ -61 +62 @@
         int fdsetsz;
         int ret;
-        fd_set *fdset = NULL;
         struct timeval tv;
         DNSServiceErrorType err;
@@ -78 +78 @@
         mdnsfd = DNSServiceRefSockFD(mdns_conn_sdref);
         for (;;)  {
-                if (fdset != NULL) {
-                        TALLOC_FREE(fdset);
-                }
-
-                if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
-                        errno = EBADF;
-                        break;
-                }
-
-                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;
-
-                /* Wait until response received from mDNS daemon */
-                ret = sys_select(mdnsfd + 1, fdset, NULL, NULL, &tv);
+                int revents;
+
+                ret = poll_one_fd(mdnsfd, POLLIN|POLLHUP, 1000, &revents);
                 if (ret <= 0 && errno != EINTR) {
                         break;
                 }
 
-                if (FD_ISSET(mdnsfd, fdset)) {
+                if (revents & (POLLIN|POLLHUP|POLLERR)) {
                         /* Invoke callback function */
                         DNSServiceProcessResult(mdns_conn_sdref);
@@ -161 +146 @@
         int fdsetsz;
         int ret;
-        fd_set *fdset = NULL;
         struct mdns_browse_state bstate;
         struct mdns_smbsrv_result *resptr;
@@ -183 +167 @@
         mdnsfd = DNSServiceRefSockFD(mdns_conn_sdref);
         for (;;)  {
-                if (fdset != NULL) {
-                        TALLOC_FREE(fdset);
-                }
-
-                if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
-                        errno = EBADF;
-                        TALLOC_FREE(ctx);
-                        return 1;
-                }
-
-                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;
-
-                /* Wait until response received from mDNS daemon */
-                ret = sys_select(mdnsfd + 1, fdset, NULL, NULL, &tv);
+                int revents;
+
+                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)) {