smbd: Move read_packet_remainder to smb2_process.c

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index c6001b7eca9290b72495460f94d6673e430651d9..ac7d509d0dc27ee0fe4f247cb0582d22ec70905a 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -310,26 +310,6 @@ static bool valid_packet_size(size_t len)
        return true;
 }
 
-static NTSTATUS read_packet_remainder(int fd, char *buffer,
-                                     unsigned int timeout, ssize_t len)
-{
-       NTSTATUS status;
-
-       if (len <= 0) {
-               return NT_STATUS_OK;
-       }
-
-       status = read_fd_with_timeout(fd, buffer, len, len, timeout, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               char addr[INET6_ADDRSTRLEN];
-               DEBUG(0, ("read_fd_with_timeout failed for client %s read "
-                         "error = %s.\n",
-                         get_peer_addr(fd, addr, sizeof(addr)),
-                         nt_errstr(status)));
-       }
-       return status;
-}
-
 /****************************************************************************
  Attempt a zerocopy writeX read. We know here that len > smb_size-4
 ****************************************************************************/

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 2181c1fcd98a847dee5a5246fe48dc9bf2577845..0a49391bcd7c1d59b8ab6b850d690691c419832f 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -900,6 +900,8 @@ size_t srv_set_message(char *buf,
                       size_t num_words,
                       size_t num_bytes,
                       bool zero);
+NTSTATUS read_packet_remainder(int fd, char *buffer,
+                              unsigned int timeout, ssize_t len);
 
 /* The following definitions come from smbd/quotas.c  */
 

diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index 0207c60267d9e18019d64493aa1788815a03bdc2..a0601821e53f933b3d41e971e01ac5cf68c5058e 100644 (file)
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -125,3 +125,23 @@ size_t srv_set_message(char *buf,
        smb_setlen(buf,(smb_size + num_words*2 + num_bytes - 4));
        return (smb_size + num_words*2 + num_bytes);
 }
+
+NTSTATUS read_packet_remainder(int fd, char *buffer,
+                              unsigned int timeout, ssize_t len)
+{
+       NTSTATUS status;
+
+       if (len <= 0) {
+               return NT_STATUS_OK;
+       }
+
+       status = read_fd_with_timeout(fd, buffer, len, len, timeout, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               char addr[INET6_ADDRSTRLEN];
+               DEBUG(0, ("read_fd_with_timeout failed for client %s read "
+                         "error = %s.\n",
+                         get_peer_addr(fd, addr, sizeof(addr)),
+                         nt_errstr(status)));
+       }
+       return status;
+}