first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[kai/samba.git] / source3 / include / client.h

diff --git a/source3/include/client.h b/source3/include/client.h
index 25f8436079c7f14a4193ee49185736a103f5517f..15ba66e3e12416412529f762536254fd7e3955dc 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -27,7 +27,7 @@
 /* the client asks for a smaller buffer to save ram and also to get more
    overlap on the wire. This size gives us a nice read/write size, which
    will be a multiple of the page size on almost any system */
-#define CLI_BUFFER_SIZE (0x4400)
+#define CLI_BUFFER_SIZE (0xFFFF)
 
 /*
  * These definitions depend on smb.h
@@ -72,6 +72,7 @@ struct pwd_info
 };
 
 struct cli_state {
+       int port;
        int fd;
        uint16 cnum;
        uint16 pid;
@@ -80,7 +81,7 @@ struct cli_state {
        int protocol;
        int sec_mode;
        int rap_error;
-       int privilages;
+       int privileges;
 
        fstring eff_name;
        fstring desthost;
@@ -110,7 +111,7 @@ struct cli_state {
        uint32 servertime;
        int readbraw_supported;
        int writebraw_supported;
-       int timeout;
+       int timeout; /* in milliseconds. */
        int max_xmit;
        int max_mux;
        char *outbuf;
@@ -125,6 +126,7 @@ struct cli_state {
         */
 
        uint32 nt_error;                   /* NT RPC error code. */
+       uint16 nt_pipe_fnum;               /* Pipe handle. */
        unsigned char sess_key[16];        /* Current session key. */
        unsigned char ntlmssp_hash[258];   /* ntlmssp data. */
        uint32 ntlmssp_cli_flgs;           /* ntlmssp client flags */
@@ -136,6 +138,8 @@ struct cli_state {
        fstring clnt_name_slash;           /* \\local client. */
        uint16 max_xmit_frag;
        uint16 max_recv_frag;
+
+       BOOL use_oplocks; /* should we use oplocks? */
 };
 
 #endif /* _CLIENT_H */