Changeset 989 for vendor/current/source3/nmbd

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/nmbd/nmbd_packets.c (modified) (20 diffs)

vendor/current/source3/nmbd/nmbd_packets.c

@@ -1684 +1684 @@
         enum packet_type type;
         bool broadcast;
+        int fd;
+        bool triggered;
 };
 
-static bool create_listen_pollfds(struct pollfd **pfds,
-                                  struct socket_attributes **pattrs,
+static bool create_listen_array(struct socket_attributes **pattrs,
                                   int *pnum_sockets)
 {
@@ -1693 +1694 @@
         int count = 0;
         int num = 0;
-        struct pollfd *fds;
         struct socket_attributes *attrs;
 
@@ -1717 +1717 @@
         }
 
-        fds = talloc_zero_array(NULL, struct pollfd, count);
-        if (fds == NULL) {
-                DEBUG(1, ("create_listen_pollfds: malloc fail for fds. "
+        attrs = talloc_zero_array(NULL, struct socket_attributes, count);
+        if (attrs == NULL) {
+                DEBUG(1, ("talloc fail for attrs. "
                           "size %d\n", count));
                 return true;
         }
 
-        attrs = talloc_array(NULL, struct socket_attributes, count);
-        if (fds == NULL) {
-                DEBUG(1, ("create_listen_pollfds: malloc fail for attrs. "
-                          "size %d\n", count));
-                TALLOC_FREE(fds);
-                return true;
-        }
-
         num = 0;
 
-        fds[num].fd = ClientNMB;
+        attrs[num].fd = ClientNMB;
         attrs[num].type = NMB_PACKET;
         attrs[num].broadcast = false;
         num += 1;
 
-        fds[num].fd = ClientDGRAM;
+        attrs[num].fd = ClientDGRAM;
         attrs[num].type = DGRAM_PACKET;
         attrs[num].broadcast = false;
@@ -1747 +1739 @@
 
                 if (subrec->nmb_sock != -1) {
-                        fds[num].fd = subrec->nmb_sock;
+                        attrs[num].fd = subrec->nmb_sock;
                         attrs[num].type = NMB_PACKET;
                         attrs[num].broadcast = false;
@@ -1754 +1746 @@
 
                 if (subrec->nmb_bcast != -1) {
-                        fds[num].fd = subrec->nmb_bcast;
+                        attrs[num].fd = subrec->nmb_bcast;
                         attrs[num].type = NMB_PACKET;
                         attrs[num].broadcast = true;
@@ -1761 +1753 @@
 
                 if (subrec->dgram_sock != -1) {
-                        fds[num].fd = subrec->dgram_sock;
+                        attrs[num].fd = subrec->dgram_sock;
                         attrs[num].type = DGRAM_PACKET;
                         attrs[num].broadcast = false;
@@ -1768 +1760 @@
 
                 if (subrec->dgram_bcast != -1) {
-                        fds[num].fd = subrec->dgram_bcast;
+                        attrs[num].fd = subrec->dgram_bcast;
                         attrs[num].type = DGRAM_PACKET;
                         attrs[num].broadcast = true;
@@ -1774 +1766 @@
                 }
         }
-
-        TALLOC_FREE(*pfds);
-        *pfds = fds;
 
         TALLOC_FREE(*pattrs);
@@ -1865 +1854 @@
 
 /****************************************************************************
+ Timeout callback - just notice we timed out.
+***************************************************************************/
+
+static void nmbd_timeout_handler(struct tevent_context *ev,
+                        struct tevent_timer *te,
+                        struct timeval current_time,
+                        void *private_data)
+{
+        bool *got_timeout = private_data;
+        *got_timeout = true;
+}
+
+/****************************************************************************
+ fd callback - remember the fd that triggered.
+***************************************************************************/
+
+static void nmbd_fd_handler(struct tevent_context *ev,
+                                struct tevent_fd *fde,
+                                uint16_t flags,
+                                void *private_data)
+{
+        struct socket_attributes *attr = private_data;
+        attr->triggered = true;
+}
+
+/****************************************************************************
   Listens for NMB or DGRAM packets, and queues them.
   return True if the socket is dead
@@ -1871 +1886 @@
 bool listen_for_packets(struct messaging_context *msg, bool run_election)
 {
-        static struct pollfd *fds = NULL;
         static struct socket_attributes *attrs = NULL;
         static int listen_number = 0;
         int num_sockets;
         int i;
-
-        int pollrtn;
-        int timeout;
+        int loop_rtn;
+        int timeout_secs;
+
 #ifndef SYNC_DNS
         int dns_fd;
@@ -1884 +1898 @@
 #endif
         struct processed_packet *processed_packet_list = NULL;
-
-        if ((fds == NULL) || rescan_listen_set) {
-                if (create_listen_pollfds(&fds, &attrs, &listen_number)) {
+        struct tevent_timer *te = NULL;
+        bool got_timeout = false;
+        TALLOC_CTX *frame = talloc_stackframe();
+
+        if ((attrs == NULL) || rescan_listen_set) {
+                if (create_listen_array(&attrs, &listen_number)) {
                         DEBUG(0,("listen_for_packets: Fatal error. unable to create listen set. Exiting.\n"));
+                        TALLOC_FREE(frame);
                         return True;
                 }
@@ -1893 +1911 @@
         }
 
-        /*
-         * "fds" can be enlarged by event_add_to_poll_args
-         * below. Shrink it again to what was given to us by
-         * create_listen_pollfds.
-         */
-
-        fds = talloc_realloc(NULL, fds, struct pollfd, listen_number);
-        if (fds == NULL) {
-                return true;
-        }
         num_sockets = listen_number;
 
@@ -1908 +1916 @@
         dns_fd = asyncdns_fd();
         if (dns_fd != -1) {
-                fds = talloc_realloc(NULL, fds, struct pollfd, num_sockets+1);
-                if (fds == NULL) {
+                attrs = talloc_realloc(NULL,
+                                        attrs,
+                                        struct socket_attributes,
+                                        num_sockets + 1);
+                if (attrs == NULL) {
+                        TALLOC_FREE(frame);
                         return true;
                 }
                 dns_pollidx = num_sockets;
-                fds[num_sockets].fd = dns_fd;
+                attrs[dns_pollidx].fd = dns_fd;
+                /*
+                 * dummy values, we only need
+                 * fd and triggered.
+                 */
+                attrs[dns_pollidx].type = NMB_PACKET;
+                attrs[dns_pollidx].broadcast = false;
                 num_sockets += 1;
         }
@@ -1919 +1937 @@
 
         for (i=0; i<num_sockets; i++) {
-                fds[i].events = POLLIN|POLLHUP;
-        }
-
-        /* Process a signal and timer events now... */
-        if (run_events_poll(nmbd_event_context(), 0, NULL, 0)) {
-                return False;
+                struct tevent_fd *tfd = tevent_add_fd(nmbd_event_context(),
+                                                        frame,
+                                                        attrs[i].fd,
+                                                        TEVENT_FD_READ,
+                                                        nmbd_fd_handler,
+                                                        &attrs[i]);
+                if (tfd == NULL) {
+                        TALLOC_FREE(frame);
+                        return true;
+                }
+                attrs[i].triggered = false;
         }
 
@@ -1934 +1957 @@
          */
 
-        timeout = ((run_election||num_response_packets)
-                   ? 1 : NMBD_SELECT_LOOP) * 1000;
-
-        event_add_to_poll_args(nmbd_event_context(), NULL,
-                               &fds, &num_sockets, &timeout);
-
-        pollrtn = poll(fds, num_sockets, timeout);
-
-        if (run_events_poll(nmbd_event_context(), pollrtn, fds, num_sockets)) {
-                return False;
-        }
-
-        if (pollrtn == -1) {
-                return False;
+        if (run_election||num_response_packets) {
+                timeout_secs = 1;
+        } else {
+                timeout_secs = NMBD_SELECT_LOOP;
+        }
+
+        te = tevent_add_timer(nmbd_event_context(),
+                                frame,
+                                tevent_timeval_current_ofs(timeout_secs, 0),
+                                nmbd_timeout_handler,
+                                &got_timeout);
+        if (te == NULL) {
+                TALLOC_FREE(frame);
+                return true;
+        }
+
+        loop_rtn = tevent_loop_once(nmbd_event_context());
+
+        if (loop_rtn == -1) {
+                TALLOC_FREE(frame);
+                return true;
+        }
+
+        if (got_timeout) {
+                TALLOC_FREE(frame);
+                return false;
         }
 
 #ifndef SYNC_DNS
         if ((dns_fd != -1) && (dns_pollidx != -1) &&
-            (fds[dns_pollidx].revents & (POLLIN|POLLHUP|POLLERR))) {
+            attrs[dns_pollidx].triggered){
                 run_dns_queue(msg);
+                TALLOC_FREE(frame);
+                return false;
         }
 #endif
@@ -1964 +2001 @@
                 int client_port;
 
-                if ((fds[i].revents & (POLLIN|POLLHUP|POLLERR)) == 0) {
+                if (!attrs[i].triggered) {
                         continue;
                 }
@@ -1982 +2019 @@
                 }
 
-                packet = read_packet(fds[i].fd, packet_type);
+                packet = read_packet(attrs[i].fd, packet_type);
                 if (!packet) {
                         continue;
@@ -1992 +2029 @@
                  */
                 if (lp_bind_interfaces_only() &&
-                    (fds[i].fd == client_fd) &&
+                    (attrs[i].fd == client_fd) &&
                     (!is_local_net_v4(packet->ip))) {
                         DEBUG(7,("discarding %s packet sent to broadcast socket from %s:%d\n",
@@ -2031 +2068 @@
                 if (attrs[i].broadcast) {
                         /* this is a broadcast socket */
-                        packet->send_fd = fds[i-1].fd;
+                        packet->send_fd = attrs[i-1].fd;
                 } else {
                         /* this is already a unicast socket */
-                        packet->send_fd = fds[i].fd;
+                        packet->send_fd = attrs[i].fd;
                 }
 
@@ -2041 +2078 @@
 
         free_processed_packet_list(&processed_packet_list);
+        TALLOC_FREE(frame);
         return False;
 }