diff options
| author | Volker Lendecke <vl@samba.org> | 2011-05-17 17:23:26 +0200 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-05-17 19:00:20 +0200 |
| commit | fc79169ca407c33ba78043b00f16c375fd0e92bc (patch) | |
| tree | efe7058531fa828d447925176c91f66b16480769 | |
| parent | 00922404011769e4b981ca1cc2c2404c022770a0 (diff) | |
| download | samba-fc79169ca407c33ba78043b00f16c375fd0e92bc.tar.gz samba-fc79169ca407c33ba78043b00f16c375fd0e92bc.tar.bz2 samba-fc79169ca407c33ba78043b00f16c375fd0e92bc.zip | |
s3: conn->sconn in smbd_server_connection_read/write_handler
"struct smbd_server_connection" is called sconn elsewhere, avoid confusion
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue May 17 19:00:20 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/smbd/process.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index d4aadc9ee6..d58baeb930 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -2246,13 +2246,14 @@ static bool fd_is_readable(int fd) } -static void smbd_server_connection_write_handler(struct smbd_server_connection *conn) +static void smbd_server_connection_write_handler( + struct smbd_server_connection *sconn) { /* TODO: make write nonblocking */ } static void smbd_server_connection_read_handler( - struct smbd_server_connection *conn, int fd) + struct smbd_server_connection *sconn, int fd) { uint8_t *inbuf = NULL; size_t inbuf_len = 0; @@ -2262,29 +2263,29 @@ static void smbd_server_connection_read_handler( NTSTATUS status; uint32_t seqnum; - bool from_client = (conn->sock == fd); + bool from_client = (sconn->sock == fd); if (from_client) { - smbd_lock_socket(conn); + smbd_lock_socket(sconn); if (lp_async_smb_echo_handler() && !fd_is_readable(fd)) { DEBUG(10,("the echo listener was faster\n")); - smbd_unlock_socket(conn); + smbd_unlock_socket(sconn); return; } /* TODO: make this completely nonblocking */ - status = receive_smb_talloc(mem_ctx, conn, fd, + status = receive_smb_talloc(mem_ctx, sconn, fd, (char **)(void *)&inbuf, 0, /* timeout */ &unread_bytes, &encrypted, &inbuf_len, &seqnum, false /* trusted channel */); - smbd_unlock_socket(conn); + smbd_unlock_socket(sconn); } else { /* TODO: make this completely nonblocking */ - status = receive_smb_talloc(mem_ctx, conn, fd, + status = receive_smb_talloc(mem_ctx, sconn, fd, (char **)(void *)&inbuf, 0, /* timeout */ &unread_bytes, @@ -2304,7 +2305,7 @@ static void smbd_server_connection_read_handler( } process: - process_smb(conn, inbuf, inbuf_len, unread_bytes, + process_smb(sconn, inbuf, inbuf_len, unread_bytes, seqnum, encrypted, NULL); } |