s3: Move read_smb_length() to smbd/reply.c

1 files changed, 42 insertions, 0 deletions

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 18d198fe0f..437d4d86dc 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3797,6 +3797,48 @@ void error_to_writebrawerr(struct smb_request *req)
 }
 
 /****************************************************************************
+ Read 4 bytes of a smb packet and return the smb length of the packet.
+ Store the result in the buffer. This version of the function will
+ never return a session keepalive (length of zero).
+ Timeout is in milliseconds.
+****************************************************************************/
+
+static NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout,
+				size_t *len)
+{
+	uint8_t msgtype = SMBkeepalive;
+
+	while (msgtype == SMBkeepalive) {
+		NTSTATUS status;
+
+		status = read_smb_length_return_keepalive(fd, inbuf, timeout,
+							  len);
+		if (!NT_STATUS_IS_OK(status)) {
+			if (fd == smbd_server_fd()) {
+				char addr[INET6_ADDRSTRLEN];
+				/* Try and give an error message
+				 * saying what client failed. */
+				DEBUG(0, ("read_fd_with_timeout failed for "
+					  "client %s read error = %s.\n",
+					  get_peer_addr(fd,addr,sizeof(addr)),
+					  nt_errstr(status)));
+			} else {
+				DEBUG(0, ("read_fd_with_timeout failed, read "
+					  "error = %s.\n", nt_errstr(status)));
+			}
+			return status;
+		}
+
+		msgtype = CVAL(inbuf, 0);
+	}
+
+	DEBUG(10,("read_smb_length: got smb length of %lu\n",
+		  (unsigned long)len));
+
+	return NT_STATUS_OK;
+}
+
+/****************************************************************************
  Reply to a writebraw (core+ or LANMAN1.0 protocol).
 ****************************************************************************/