diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-09-20 12:31:07 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:54 -0500 |
commit | 7d06a06584e5163b69f712e38dc46afc2668389c (patch) | |
tree | 7b15e5c67ad99a2a576fac13ecf04287fdacbc61 /source4/smbd/process_thread.c | |
parent | e8d244251732cd744c2c69e3e7bd7a875e704a60 (diff) | |
download | samba-7d06a06584e5163b69f712e38dc46afc2668389c.tar.gz samba-7d06a06584e5163b69f712e38dc46afc2668389c.tar.bz2 samba-7d06a06584e5163b69f712e38dc46afc2668389c.zip |
r2447: let the server code use the new lib/socket/ stuff
metze
(This used to be commit 2fd577d2417e117a7e8c1a56feb147eae805df34)
Diffstat (limited to 'source4/smbd/process_thread.c')
-rw-r--r-- | source4/smbd/process_thread.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index ced07d5d76..ef4d53e188 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -49,19 +49,19 @@ static int thread_get_id(struct smbsrv_request *req) static void thread_accept_connection(struct event_context *ev, struct fd_event *srv_fde, time_t t, uint16_t flags) { - int accepted_fd, rc; - struct sockaddr addr; - socklen_t in_addrlen = sizeof(addr); + NTSTATUS status; + struct socket_context *sock; + int rc; pthread_t thread_id; pthread_attr_t thread_attr; struct server_socket *server_socket = srv_fde->private; struct server_connection *conn; /* accept an incoming connection. */ - accepted_fd = accept(srv_fde->fd,&addr,&in_addrlen); - if (accepted_fd == -1) { - DEBUG(0,("standard_accept_connection: accept: %s\n", - strerror(errno))); + status = socket_accept(server_socket->socket, &sock, 0); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0,("accept_connection_single: accept: %s\n", + nt_errstr(status))); return; } @@ -72,16 +72,18 @@ static void thread_accept_connection(struct event_context *ev, struct fd_event * main event_context is continued. */ - ev = event_context_init(); if (!ev) { DEBUG(0,("thread_accept_connection: failed to create event_context!\n")); + socket_destroy(sock); return; } - conn = server_setup_connection(ev, server_socket, accepted_fd, t); + conn = server_setup_connection(ev, server_socket, sock, t); if (!conn) { - DEBUG(0,("server_setup_connection(ev, server_socket, accepted_fd) failed\n")); + DEBUG(0,("server_setup_connection(ev, server_socket, sock, t) failed\n")); + event_context_destroy(ev); + socket_destroy(sock); return; } @@ -98,9 +100,12 @@ static void thread_accept_connection(struct event_context *ev, struct fd_event * pthread_attr_destroy(&thread_attr); if (rc == 0) { DEBUG(4,("accept_connection_thread: created thread_id=%lu for fd=%d\n", - (unsigned long int)thread_id, accepted_fd)); + (unsigned long int)thread_id, socket_get_fd(sock))); } else { - DEBUG(0,("accept_connection_thread: thread create failed for fd=%d, rc=%d\n", accepted_fd, rc)); + DEBUG(0,("accept_connection_thread: thread create failed for fd=%d, rc=%d\n", socket_get_fd(sock), rc)); + event_context_destroy(ev); + socket_destroy(sock); + return; } } |