Changeset 135 for branches/samba-3.0/source/lib/util_sock.c

Timestamp:

May 29, 2008, 11:30:31 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.30

File:

• branches/samba-3.0/source/lib/util_sock.c (modified) (4 diffs)

branches/samba-3.0/source/lib/util_sock.c

@@ -697 +697 @@
 
 /****************************************************************************
- Read an smb from a fd. Note that the buffer *MUST* be of size
- BUFFER_SIZE+SAFETY_MARGIN.
+ Read an smb from a fd. 
  The timeout is in milliseconds. 
  This function will return on receipt of a session keepalive packet.
@@ -704 +703 @@
 ****************************************************************************/
 
-BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
+BOOL receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout)
 {
         ssize_t len,ret;
@@ -725 +724 @@
         }
 
-        /*
-         * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes
-         * of header. Don't print the error if this fits.... JRA.
-         */
-
-        if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
+        if (len > buflen) {
                 DEBUG(0,("Invalid packet length! (%lu bytes).\n",(unsigned long)len));
-                if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
-
-                        /*
-                         * Correct fix. smb_read_error may have already been
-                         * set. Only set it here if not already set. Global
-                         * variables still suck :-). JRA.
-                         */
-
-                        if (smb_read_error == 0)
-                                smb_read_error = READ_ERROR;
-                        return False;
-                }
+
+                /*
+                 * smb_read_error may have already been
+                 * set. Only set it here if not already set. Global
+                 * variables still suck :-). JRA.
+                 */
+
+                if (smb_read_error == 0)
+                        smb_read_error = READ_ERROR;
+                return False;
         }
 
@@ -773 +765 @@
 ****************************************************************************/
 
-BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
-{
-        if (!receive_smb_raw(fd, buffer, timeout)) {
+BOOL receive_smb(int fd, char *buffer, size_t buflen, unsigned int timeout)
+{
+        if (!receive_smb_raw(fd, buffer, buflen, timeout)) {
                 return False;
         }