diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-07-19 12:56:51 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-07-20 15:55:08 +0200 |
commit | 1e3822115c3b466632044fe64c908b6f2de5803a (patch) | |
tree | bd8d064257576166fa50d3f3db324a81f3ac6df1 /source3/libsmb/clientgen.c | |
parent | 9fb7e228f5a6e39dd22e1c56733c61178ee0be49 (diff) | |
download | samba-1e3822115c3b466632044fe64c908b6f2de5803a.tar.gz samba-1e3822115c3b466632044fe64c908b6f2de5803a.tar.bz2 samba-1e3822115c3b466632044fe64c908b6f2de5803a.zip |
s3:libsmb: move cli->pid to cli->smb1.pid and hide it behind cli_[g|s]etpid()
metze
Diffstat (limited to 'source3/libsmb/clientgen.c')
-rw-r--r-- | source3/libsmb/clientgen.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index aac38df360..67e8e06d1a 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -68,7 +68,7 @@ void cli_setup_packet_buf(struct cli_state *cli, char *buf) uint16 flags2; cli->rap_error = 0; SIVAL(buf,smb_rcls,0); - SSVAL(buf,smb_pid,cli->pid); + SSVAL(buf,smb_pid,cli->smb1.pid); memset(buf+smb_pidhigh, 0, 12); SSVAL(buf,smb_uid,cli->vuid); SSVAL(buf,smb_mid,cli->smb1.mid); @@ -185,7 +185,6 @@ struct cli_state *cli_initialise_ex(int signing_state) cli->fd = -1; cli->raw_status = NT_STATUS_INTERNAL_ERROR; cli->cnum = -1; - cli->pid = (uint16)sys_getpid(); cli->vuid = UID_FIELD_INVALID; cli->protocol = PROTOCOL_NT1; cli->timeout = 20000; /* Timeout is in milliseconds. */ @@ -240,7 +239,8 @@ struct cli_state *cli_initialise_ex(int signing_state) cli->initialised = 1; cli->smb1.mid = 1; - cli->smb1.vc_num = cli->pid; + cli->smb1.pid = (uint16_t)sys_getpid(); + cli->smb1.vc_num = cli->smb1.pid; return cli; @@ -354,11 +354,16 @@ uint16_t cli_state_get_vc_num(struct cli_state *cli) uint16 cli_setpid(struct cli_state *cli, uint16 pid) { - uint16 ret = cli->pid; - cli->pid = pid; + uint16_t ret = cli->smb1.pid; + cli->smb1.pid = pid; return ret; } +uint16_t cli_getpid(struct cli_state *cli) +{ + return cli->smb1.pid; +} + /**************************************************************************** Set the case sensitivity flag on the packets. Returns old state. ****************************************************************************/ |