X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=source3%2Flib%2Futil_sock.c;h=f5d56eb0d4f2f646556ed2cf582cc70f89be27e3;hp=da7522887074cd486a5d83aa8248d874a1037739;hb=ac03889168cc5b97651ee5e4300ce50210de8800;hpb=bc8f74f9883c164f5802f66126960c5dc2216c68 diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index da752288707..f5d56eb0d4f 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -631,40 +631,6 @@ BOOL receive_smb(int fd,char *buffer, unsigned int timeout) return(True); } -/**************************************************************************** - read an smb from a fd ignoring all keepalive packets. Note that the buffer - *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN. - The timeout is in milliseconds - - This is exactly the same as receive_smb except that it never returns - a session keepalive packet (just as receive_smb used to do). - receive_smb was changed to return keepalives as the oplock processing means this call - should never go into a blocking read. -****************************************************************************/ - -BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout) -{ - BOOL ret; - - for(;;) - { - ret = receive_smb(fd, buffer, timeout); - - if (!ret) - { - DEBUG(10,("client_receive_smb failed\n")); - show_msg(buffer); - return ret; - } - - /* Ignore session keepalive packets. */ - if(CVAL(buffer,0) != SMBkeepalive) - break; - } - show_msg(buffer); - return ret; -} - /**************************************************************************** send an smb to a fd ****************************************************************************/