diff options
| author | Andrew Tridgell <tridge@samba.org> | 1996-07-30 15:47:30 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1996-07-30 15:47:30 +0000 |
| commit | 2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87 (patch) | |
| tree | 179251b54f35c910b512338d2b420bcd7fcd3763 /source3/include | |
| parent | a7ed8cd8ac3e1c0f8cd68bed654ae21cb3acde12 (diff) | |
| download | samba-2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87.tar.gz samba-2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87.tar.bz2 samba-2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87.zip | |
fix a bug that we've had for a long time where we don't handle EOF
properly from clients, and end up looping like mad.
At least I _hope_ this is fixed.
(This used to be commit a7c7d7afe2ef81f4a74584ce9b71e54442f7e484)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 5 | ||||
| -rw-r--r-- | source3/include/smb.h | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index faddbc6a49..60b8eed59a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -636,7 +636,7 @@ BOOL check_file_sharing(int cnum,char *fname); void open_file_shared(int fnum,int cnum,char *fname,int share_mode,int ofun, int mode,int *Access,int *action); int seek_file(int fnum,int pos); -int read_file(int fnum,char *data,int pos,int mincnt,int maxcnt,int timeout,BOOL exact); +int read_file(int fnum,char *data,int pos,int n); int write_file(int fnum,char *data,int n); BOOL become_service(int cnum,BOOL do_chdir); int find_service(char *service); @@ -819,8 +819,7 @@ void make_dir_struct(char *buf,char *mask,char *fname,unsigned int size,int mode void close_low_fds(void); int write_socket(int fd,char *buf,int len); int read_udp_socket(int fd,char *buf,int len); -int set_blocking(int fd, BOOL set); -int read_with_timeout(int fd,char *buf,int mincnt,int maxcnt,long time_out,BOOL exact); +int read_with_timeout(int fd,char *buf,int mincnt,int maxcnt,long time_out); int read_max_udp(int fd,char *buffer,int bufsize,int maxtime); int TvalDiff(struct timeval *tvalold,struct timeval *tvalnew); BOOL send_keepalive(int client); diff --git a/source3/include/smb.h b/source3/include/smb.h index 05924de35e..317f31b19e 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -111,11 +111,10 @@ EXTERN int syslog_level; #define DEBUG(level,body) ((DEBUGLEVEL>=(level))? (syslog_level = (level), Debug1 body):0) #endif -/* this defines the error codes that receive_smb can put in smberrcode */ -#define SMBERR_OK 0 -#define SMBERR_TIMEOUT 1 -#define SMBERR_EOF 2 -#define SMBERR_ERROR 3 +/* this defines the error codes that receive_smb can put in smb_read_error */ +#define READ_TIMEOUT 1 +#define READ_EOF 2 +#define READ_ERROR 3 #define DIR_STRUCT_SIZE 43 |