sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

s3: nmbd: Add a talloc_stackframe().

Browse Source 
We will use this to create real tevent timer and fd
events.

This will allow us to eventually remove source3/lib/events.c
dependency and make nmbd purely tevent based.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12283
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Jeremy Allison 2016-09-23 12:22:53 -07:00 committed by Volker Lendecke
parent cca25c8f75
commit 36b67729a6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/nmbd/nmbd_packets.c
View File

@ -1917,10 +1917,12 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
int dns_pollidx = -1; int dns_pollidx = -1;
#endif #endif
struct processed_packet *processed_packet_list = NULL; struct processed_packet *processed_packet_list = NULL;
TALLOC_CTX *frame = talloc_stackframe();
if ((fds == NULL) || rescan_listen_set) { if ((fds == NULL) || rescan_listen_set) {
if (create_listen_pollfds(&fds, &attrs, &listen_number)) { if (create_listen_pollfds(&fds, &attrs, &listen_number)) {
DEBUG(0,("listen_for_packets: Fatal error. unable to create listen set. Exiting.\n")); DEBUG(0,("listen_for_packets: Fatal error. unable to create listen set. Exiting.\n"));
TALLOC_FREE(frame);
return True; return True;
} }
rescan_listen_set = False; rescan_listen_set = False;
@ -1934,6 +1936,7 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
fds = talloc_realloc(NULL, fds, struct pollfd, listen_number); fds = talloc_realloc(NULL, fds, struct pollfd, listen_number);
if (fds == NULL) { if (fds == NULL) {
TALLOC_FREE(frame);
return true; return true;
} }
num_sockets = listen_number; num_sockets = listen_number;
@ -1943,6 +1946,7 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
if (dns_fd != -1) { if (dns_fd != -1) {
fds = talloc_realloc(NULL, fds, struct pollfd, num_sockets+1); fds = talloc_realloc(NULL, fds, struct pollfd, num_sockets+1);
if (fds == NULL) { if (fds == NULL) {
TALLOC_FREE(frame);
return true; return true;
} }
attrs = talloc_realloc(NULL, attrs = talloc_realloc(NULL,
@ -1951,6 +1955,7 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
num_sockets + 1); num_sockets + 1);
if (attrs == NULL) { if (attrs == NULL) {
TALLOC_FREE(fds); TALLOC_FREE(fds);
TALLOC_FREE(frame);
return true; return true;
} }
dns_pollidx = num_sockets; dns_pollidx = num_sockets;
@ -1972,6 +1977,7 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
/* Process a signal and timer events now... */ /* Process a signal and timer events now... */
if (run_events_poll(nmbd_event_context(), 0, NULL, 0)) { if (run_events_poll(nmbd_event_context(), 0, NULL, 0)) {
TALLOC_FREE(frame);
return False; return False;
} }
@ -1991,10 +1997,12 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
pollrtn = poll(fds, num_sockets, timeout); pollrtn = poll(fds, num_sockets, timeout);
if (run_events_poll(nmbd_event_context(), pollrtn, fds, num_sockets)) { if (run_events_poll(nmbd_event_context(), pollrtn, fds, num_sockets)) {
TALLOC_FREE(frame);
return False; return False;
} }
if (pollrtn == -1) { if (pollrtn == -1) {
TALLOC_FREE(frame);
return False; return False;
} }
@ -2089,6 +2097,7 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
} }
free_processed_packet_list(&processed_packet_list); free_processed_packet_list(&processed_packet_list);
TALLOC_FREE(frame);
return False; return False;
} }