diff options
| author | Jeremy Allison <jra@samba.org> | 1997-09-25 00:25:44 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-09-25 00:25:44 +0000 |
| commit | 6dd6b1383c0ed10c0897dea44f247befc15b03cc (patch) | |
| tree | 15bbb7c529c166770de49c11590bf0f5dc8975f2 /source3/include | |
| parent | 81eb442e88e8231b8e9c556c1ee393e99269af78 (diff) | |
| download | samba-6dd6b1383c0ed10c0897dea44f247befc15b03cc.tar.gz samba-6dd6b1383c0ed10c0897dea44f247befc15b03cc.tar.bz2 samba-6dd6b1383c0ed10c0897dea44f247befc15b03cc.zip | |
Makefile: Removed earlier errors.
includes.h: Added INADDR_LOOPBACK define.
locking.c: More code to support oplocks.
proto.h: Updated.
server.c: More code to support oplocks. Moved processing of an SMB out of
process() into a separate function so it is easier to call from an oplock
break.
smb.h: Added oplock fields.
Jeremy (jallison@whistle.com)
(This used to be commit f46dbaf08eb8e06a7545d2c19dce9e2dda9dcc78)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/include/smb.h | 16 |
3 files changed, 18 insertions, 6 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index e66ceb2d70..2329553d23 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1194,6 +1194,10 @@ it works and getting lots of bug reports */ #define QSORT_CAST (int (*)()) #endif +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK 0x7f000001 +#endif /* INADDR_LOOPBACK */ + /* this is a rough check to see if this machine has a lstat() call. it is not guaranteed to work */ #if !(defined(S_ISLNK) || defined(S_IFLNK)) diff --git a/source3/include/proto.h b/source3/include/proto.h index 9c6cccb370..46a96a8bef 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -299,13 +299,13 @@ BOOL unlock_share_entry(int cnum, uint32 dev, uint32 inode, share_lock_token tok int get_share_modes(int cnum, share_lock_token token, uint32 dev, uint32 inode, min_share_mode_entry **old_shares); void del_share_mode(share_lock_token token, int fnum); -BOOL set_share_mode(share_lock_token token, int fnum); +BOOL set_share_mode(share_lock_token token, int fnum, uint16 port); BOOL lock_share_entry(int cnum, uint32 dev, uint32 inode, share_lock_token *ptok); BOOL unlock_share_entry(int cnum, uint32 dev, uint32 inode, share_lock_token token); int get_share_modes(int cnum, share_lock_token token, uint32 dev, uint32 inode, min_share_mode_entry **old_shares); void del_share_mode(share_lock_token token, int fnum); -BOOL set_share_mode(share_lock_token token,int fnum); +BOOL set_share_mode(share_lock_token token,int fnum, uint16 port); /*The following definitions come from mangle.c */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 05f73f7f45..a67b3c02c9 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -433,9 +433,6 @@ struct interface struct in_addr ip; struct in_addr bcast; struct in_addr nmask; - char *name; - size_t mtu; /* may be useful in future... */ - short flags; }; /* share mode record pointed to in shared memory hash bucket */ @@ -455,6 +452,9 @@ typedef struct { smb_shm_offset_t next_share_mode_entry; int pid; +#ifdef USE_OPLOCKS + uint16 op_port; +#endif /* USE_OPLOCKS */ int share_mode; struct timeval time; } share_mode_entry; @@ -463,6 +463,9 @@ typedef struct typedef struct { int pid; +#ifdef USE_OPLOCKS + uint16 op_port; +#endif /* USE_OPLOCKS */ int share_mode; struct timeval time; } min_share_mode_entry; @@ -487,8 +490,13 @@ struct connect_record time_t start; }; - +#ifndef LOCKING_VERSION +#ifdef USE_OPLOCKS +#define LOCKING_VERSION 4 +#else /* USE_OPLOCKS */ #define LOCKING_VERSION 3 +#endif /* USE_OPLOCKS */ +#endif /* LOCKING_VERSION */ /* these are useful macros for checking validity of handles */ #define VALID_FNUM(fnum) (((fnum) >= 0) && ((fnum) < MAX_OPEN_FILES)) |